@@ -4,7 +4,6 @@ CONFIG := none
44# CONFIG := gcc
55# CONFIG := afl-gcc
66# CONFIG := wasi
7- # CONFIG := mxe
87# CONFIG := msys2-32
98# CONFIG := msys2-64
109
@@ -302,18 +301,6 @@ LINK_ABC := 1
302301DISABLE_ABC_THREADS := 1
303302endif
304303
305- else ifeq ($(CONFIG),mxe)
306- PKG_CONFIG = /usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-pkg-config
307- CXX = /usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-g++
308- CXXFLAGS += -std=$(CXXSTD ) $(OPT_LEVEL ) -D_POSIX_SOURCE -Wno-attributes
309- CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS ) )
310- LINKFLAGS := $(filter-out -rdynamic,$(LINKFLAGS ) ) -s
311- LIBS := $(filter-out -lrt,$(LIBS ) )
312- ABCMKARGS += ARCHFLAGS="-DWIN32_NO_DLL -DHAVE_STRUCT_TIMESPEC -fpermissive -w"
313- # TODO: Try to solve pthread linking issue in more appropriate way
314- ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" LINKFLAGS="-Wl,--allow-multiple-definition" ABC_USE_NO_READLINE=1 CC="/usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-gcc"
315- EXE = .exe
316-
317304else ifeq ($(CONFIG),msys2-32)
318305CXX = i686-w64-mingw32-g++
319306CXXFLAGS += -std=$(CXXSTD ) $(OPT_LEVEL ) -D_POSIX_SOURCE -DYOSYS_WIN32_UNIX_DIR
@@ -340,7 +327,7 @@ ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H $(ABC_ARCHFLAGS)"
340327LTOFLAGS =
341328
342329else
343- $(error Invalid CONFIG setting '$(CONFIG ) '. Valid values : clang, gcc, mxe, msys2-32, msys2-64, none)
330+ $(error Invalid CONFIG setting '$(CONFIG ) '. Valid values : clang, gcc, msys2-32, msys2-64, none)
344331endif
345332
346333
@@ -392,9 +379,6 @@ ifeq ($(LINK_TERMCAP),1)
392379LIBS += -ltermcap
393380ABCMKARGS += "ABC_READLINE_LIBRARIES=-lreadline -ltermcap"
394381endif
395- ifeq ($(CONFIG ) ,mxe)
396- LIBS += -ltermcap
397- endif
398382else
399383ifeq ($(ENABLE_EDITLINE ) ,1)
400384CXXFLAGS += -DYOSYS_ENABLE_EDITLINE
@@ -443,17 +427,12 @@ TCL_INCLUDE ?= /usr/include/$(TCL_VERSION)
443427TCL_LIBS ?= -l$(TCL_VERSION )
444428endif
445429
446- ifeq ($(CONFIG ) ,mxe)
447- CXXFLAGS += -DYOSYS_ENABLE_TCL
448- LIBS += -ltcl86 -lwsock32 -lws2_32 -lnetapi32 -lz -luserenv
449- else
450430CXXFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH ) $(PKG_CONFIG ) --silence-errors --cflags tcl || echo -I$(TCL_INCLUDE ) ) -DYOSYS_ENABLE_TCL
451431LIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH ) $(PKG_CONFIG ) --silence-errors --libs tcl || echo $(TCL_LIBS ) )
452432ifneq (,$(findstring TCL_WITH_EXTERNAL_TOMMATH,$(CXXFLAGS ) ) )
453433LIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH ) $(PKG_CONFIG ) --silence-errors --libs libtommath || echo)
454434endif
455435endif
456- endif
457436
458437ifeq ($(ENABLE_GCOV ) ,1)
459438CXXFLAGS += --coverage
@@ -1101,19 +1080,6 @@ vcxsrc: $(GENFILES) $(EXTRA_TARGETS)
11011080 zip -r yosys-win32-vcxsrc-$(YOSYS_VER ) .zip yosys-win32-vcxsrc-$(YOSYS_VER ) /
11021081 rm -f srcfiles.txt kernel/version.cc
11031082
1104- ifeq ($(CONFIG ) ,mxe)
1105- mxebin : $(TARGETS ) $(EXTRA_TARGETS )
1106- rm -rf yosys-win32-mxebin-$(YOSYS_VER ) {,.zip}
1107- mkdir -p yosys-win32-mxebin-$(YOSYS_VER )
1108- cp -r $(PROGRAM_PREFIX ) yosys.exe share/ yosys-win32-mxebin-$(YOSYS_VER ) /
1109- ifeq ($(ENABLE_ABC ) ,1)
1110- cp -r $(PROGRAM_PREFIX)yosys-abc.exe abc/lib/x86/pthreadVC2.dll yosys-win32-mxebin-$(YOSYS_VER)/
1111- endif
1112- echo -en 'This is Yosys $(YOSYS_VER) for Win32.\r\n' > yosys-win32-mxebin-$(YOSYS_VER)/readme.txt
1113- echo -en 'Documentation at https://yosyshq.net/yosys/.\r\n' >> yosys-win32-mxebin-$(YOSYS_VER)/readme.txt
1114- zip -r yosys-win32-mxebin-$(YOSYS_VER).zip yosys-win32-mxebin-$(YOSYS_VER)/
1115- endif
1116-
11171083config-clean : clean
11181084 rm -f Makefile.conf
11191085
@@ -1140,10 +1106,6 @@ config-wasi: clean
11401106 echo ' ENABLE_READLINE := 0' >> Makefile.conf
11411107 echo ' ENABLE_ZLIB := 0' >> Makefile.conf
11421108
1143- config-mxe : clean
1144- echo ' CONFIG := mxe' > Makefile.conf
1145- echo ' ENABLE_PLUGINS := 0' >> Makefile.conf
1146-
11471109config-msys2-32 : clean
11481110 echo ' CONFIG := msys2-32' > Makefile.conf
11491111 echo " PREFIX := $( MINGW_PREFIX) " >> Makefile.conf
@@ -1183,5 +1145,5 @@ echo-cxx:
11831145-include kernel/*.d
11841146-include techlibs/*/*.d
11851147
1186- .PHONY : all top-all abc test install install-abc docs clean mrproper qtcreator coverage vcxsrc mxebin
1148+ .PHONY : all top-all abc test install install-abc docs clean mrproper qtcreator coverage vcxsrc
11871149.PHONY : config-clean config-clang config-gcc config-gcc-static config-afl-gcc config-gprof config-sudo
0 commit comments