update yosys_ghdl.diff

Author: umarcor

scripts/compile_yosys.sh

@@ -21,48 +21,42 @@ fi
 
 cd $BUILD_DIR/$dir_name
 
-MAKEFILE_CONF_GHDL=
-GHDL_LDLIBS=
-if [ $COMPILE_GHDL == "1" ]
-then
-    patch < $WORK_DIR/scripts/yosys_ghdl.diff
-
-    mkdir -p frontends/ghdl
-    cp -R ../$dir_name_gyp/src/* frontends/ghdl
-    MAKEFILE_CONF_GHDL=$'ENABLE_GHDL := 1\n'
-    MAKEFILE_CONF_GHDL+="GHDL_DIR := $PACKAGE_DIR/$NAME"
-
-    if [ $ARCH == "darwin" ]; then
-        GHDL_LDLIBS="$PACKAGE_DIR/$NAME/lib/libghdl.a $(tr -s '\n' ' ' < $PACKAGE_DIR/$NAME/lib/libghdl.link)"
-    elif [ ${ARCH:0:7} == "windows" ]; then
-        GHDL_LDLIBS="$(cygpath -m -a $PACKAGE_DIR/$NAME/lib/libghdl.a) $(cat $PACKAGE_DIR/$NAME/lib/libghdl.link | tr -s '\n' ' ' | tr -s '\\' '/' )"
-    else
-        GHDL_LDLIBS="$PACKAGE_DIR/$NAME/lib/libghdl.a $(tr -s '\n' ' ' < $PACKAGE_DIR/$NAME/lib/libghdl.link)"
+patch < $WORK_DIR/scripts/yosys.diff
+
+setup_ghdl-yosys-plugin() {
+    if [ $COMPILE_GHDL == "1" ]
+    then
+        mkdir -p frontends/ghdl
+        cp -R ../$dir_name_gyp/src/* frontends/ghdl
+
+        echo 'ENABLE_GHDL := 1' >> Makefile.conf
+        echo "GHDL_DIR := $PACKAGE_DIR/$NAME" >> Makefile.conf
+        echo "GHDL_PREFIX := $PACKAGE_DIR/$NAME" >> Makefile.conf
     fi
-fi
+}
 
 # -- Compile it
 if [ $ARCH == "darwin" ]; then
     OLDPATH=$PATH
     export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
     $MAKE config-clang
-    echo "$MAKEFILE_CONF_GHDL" >> Makefile.conf
+    setup_ghdl-yosys-plugin
     gsed -r -i 's/^(YOSYS_VER := [0-9]+\.[0-9]+\+[0-9]+).*$/\1 \(open-tool-forge build\)/;' Makefile
     sed -i "" "s/-Wall -Wextra -ggdb/-w/;" Makefile
     CXXFLAGS="-std=c++11 $CXXFLAGS" make \
             -j$J GIT_REV="${GIT_REV}" PRETTY=0 \
-            LDLIBS="-lm $GHDL_LDLIBS" \
+            LDLIBS="-lm" \
             ENABLE_TCL=0 ENABLE_PLUGINS=0 ENABLE_READLINE=0 ENABLE_COVER=0 ENABLE_ZLIB=0 ENABLE_ABC=1 \
             ABCMKARGS="CC=\"$CC\" CXX=\"$CXX\" OPTFLAGS=\"-O\" \
                        ARCHFLAGS=\"$ABC_ARCHFLAGS\" ABC_USE_NO_READLINE=1"
 
     export PATH=$OLDPATH
 elif [ ${ARCH:0:7} == "windows" ]; then
     $MAKE config-msys2-64
-    echo "$MAKEFILE_CONF_GHDL" >> Makefile.conf
+    setup_ghdl-yosys-plugin
     sed -r -i 's/^(YOSYS_VER := [0-9]+\.[0-9]+\+[0-9]+).*$/\1 \(open-tool-forge build\)/;' Makefile
     $MAKE -j$J GIT_REV="${GIT_REV}" PRETTY=0 \
-              LDLIBS="-static -lstdc++ -lm $GHDL_LDLIBS" \
+              LDLIBS="-static -lstdc++ -lm" \
               ABCMKARGS="CC=\"$CC\" CXX=\"$CXX\" LIBS=\"-static -lm\" OPTFLAGS=\"-O\" \
                          ARCHFLAGS=\"$ABC_ARCHFLAGS\" \
                          ABC_USE_NO_READLINE=1 \
@@ -74,14 +68,14 @@ elif [ ${ARCH:0:7} == "windows" ]; then
     test_bin yosys-smtbmc$EXE
 else
     $MAKE config-gcc
-    echo "$MAKEFILE_CONF_GHDL" >> Makefile.conf
+    setup_ghdl-yosys-plugin
     sed -i "s/-Wall -Wextra -ggdb/-w/;" Makefile
     sed -r -i 's/^(YOSYS_VER := [0-9]+\.[0-9]+\+[0-9]+).*$/\1 \(open-tool-forge build\)/;' Makefile
     # sed -i "s/LD = gcc$/LD = $CC/;" Makefile
     # sed -i "s/CXX = gcc$/CXX = $CC/;" Makefile
     # sed -i "s/LDFLAGS += -rdynamic/LDFLAGS +=/;" Makefile
     $MAKE -j$J GIT_REV="${GIT_REV}" PRETTY=0 \
-                LDLIBS="-static -lstdc++ -lm $GHDL_LDLIBS -ldl" \
+                LDLIBS="-static -lstdc++ -lm -ldl" \
                 ENABLE_TCL=0 ENABLE_PLUGINS=0 ENABLE_READLINE=0 ENABLE_COVER=0 ENABLE_ZLIB=0 ENABLE_ABC=1 \
                 ABCMKARGS="CC=\"$CC\" CXX=\"$CXX\" LIBS=\"-static -lm -ldl -pthread\" \
                            OPTFLAGS=\"-O\" \

scripts/yosys_ghdl.diff renamed to scripts/yosys.diff

@@ -2,53 +2,30 @@ diff --git a/Makefile b/Makefile
 index 45213c6f..f8393ea4 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -21,6 +21,7 @@ ENABLE_COVER := 1
- ENABLE_LIBYOSYS := 0
- ENABLE_PROTOBUF := 0
- ENABLE_ZLIB := 1
-+ENABLE_GHDL := 0
- 
- # python wrappers
- ENABLE_PYOSYS := 0
 @@ -82,7 +83,7 @@ all: top-all
  YOSYS_SRC := $(dir $(firstword $(MAKEFILE_LIST)))
  VPATH := $(YOSYS_SRC)
- 
+
 -CXXFLAGS := $(CXXFLAGS) -Wall -Wextra -ggdb -I. -I"$(YOSYS_SRC)" -MD -MP -D_YOSYS_ -fPIC -I$(PREFIX)/include
 +CXXFLAGS := $(CXXFLAGS) -w -I. -I"$(YOSYS_SRC)" -MD -MP -D_YOSYS_ -I$(PREFIX)/include
  LDLIBS := $(LDLIBS) -lstdc++ -lm
  PLUGIN_LDFLAGS :=
- 
+
 @@ -119,7 +120,7 @@ export PATH := $(PORT_PREFIX)/bin:$(PATH)
  endif
- 
+
  else
 -LDFLAGS += -rdynamic
 +LDFLAGS +=
  LDLIBS += -lrt
  endif
- 
+
 @@ -184,7 +185,7 @@ endif
  ifeq ($(CONFIG),clang)
  CXX = clang
  LD = clang++
 -CXXFLAGS += -std=c++11 -Os
 +CXXFLAGS += -std=c++11
  ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H"
- 
+
  ifneq ($(SANITIZER),)
-@@ -510,6 +511,14 @@ endif
- endif
- endif
- 
-+ifeq ($(ENABLE_GHDL),1)
-+GHDL_DIR ?= /usr/local/ghdl
-+GHDL_INCLUDE_DIR ?= $(GHDL_DIR)/include
-+GHDL_LIB_DIR ?= $(GHDL_DIR)/lib
-+CXXFLAGS += -I$(GHDL_INCLUDE_DIR) -DYOSYS_ENABLE_GHDL
-+LDLIBS += $(GHDL_LIB_DIR)/libghdl.a $(shell cat $(GHDL_LIB_DIR)/ghdl.link)
-+endif
-+
- ifeq ($(ENABLE_VERIFIC),1)
- VERIFIC_DIR ?= /usr/local/src/verific_lib
- VERIFIC_COMPONENTS ?= verilog vhdl database util containers hier_tree