diff options
| author | Catherine <whitequark@whitequark.org> | 2022-07-07 10:28:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-07 10:28:30 +0000 |
| commit | 933f110bf7758e5f09ad3f1bea36743c8beb33b6 (patch) | |
| tree | 725fab2c510b19d0e69f269fdbc91b26cef17aba | |
| parent | 09c6fc68c7538306f10794e6456c74815ec9e570 (diff) | |
| parent | 502b96fe53e82b5454fbbd032cbf6b13ad2dad6d (diff) | |
| download | yosys-933f110bf7758e5f09ad3f1bea36743c8beb33b6.tar.gz yosys-933f110bf7758e5f09ad3f1bea36743c8beb33b6.tar.bz2 yosys-933f110bf7758e5f09ad3f1bea36743c8beb33b6.zip | |
Merge pull request #3404 from YosysHQ/fix-build-after-pr-3399
Fix WASI and external-ABC build after PR#3399
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | passes/techmap/abc.cc | 6 | ||||
| -rw-r--r-- | passes/techmap/abc9_exe.cc | 6 |
3 files changed, 10 insertions, 6 deletions
@@ -153,7 +153,7 @@ bumpversion: # is just a symlink to your actual ABC working directory, as 'make mrproper' # will remove the 'abc' directory and you do not want to accidentally # delete your work on ABC.. -ABCREV = f159bef +ABCREV = 5f40c47 ABCPULL = 1 ABCURL ?= https://github.com/YosysHQ/abc ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q) @@ -314,7 +314,7 @@ CXXFLAGS := $(WASIFLAGS) -std=$(CXXSTD) -Os $(filter-out -fPIC,$(CXXFLAGS)) LDFLAGS := $(WASIFLAGS) -Wl,-z,stack-size=1048576 $(filter-out -rdynamic,$(LDFLAGS)) LDLIBS := $(filter-out -lrt,$(LDLIBS)) ABCMKARGS += AR="$(AR)" RANLIB="$(RANLIB)" -ABCMKARGS += ARCHFLAGS="$(WASIFLAGS) -DABC_USE_STDINT_H -DABC_NO_DYNAMIC_LINKING" +ABCMKARGS += ARCHFLAGS="$(WASIFLAGS) -DABC_USE_STDINT_H -DABC_NO_DYNAMIC_LINKING -Wno-c++11-narrowing" ABCMKARGS += OPTFLAGS="-Os" EXE = .wasm diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc index 61ee99ee7..0b9c327c0 100644 --- a/passes/techmap/abc.cc +++ b/passes/techmap/abc.cc @@ -65,7 +65,9 @@ #include "frontends/blif/blifparse.h" #ifdef YOSYS_LINK_ABC -extern "C" int Abc_RealMain(int argc, char *argv[]); +namespace abc { + int Abc_RealMain(int argc, char *argv[]); +} #endif USING_YOSYS_NAMESPACE @@ -1098,7 +1100,7 @@ void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::strin abc_argv[2] = strdup("-f"); abc_argv[3] = strdup(tmp_script_name.c_str()); abc_argv[4] = 0; - int ret = Abc_RealMain(4, abc_argv); + int ret = abc::Abc_RealMain(4, abc_argv); free(abc_argv[0]); free(abc_argv[1]); free(abc_argv[2]); diff --git a/passes/techmap/abc9_exe.cc b/passes/techmap/abc9_exe.cc index a66e95e21..7dc0a364b 100644 --- a/passes/techmap/abc9_exe.cc +++ b/passes/techmap/abc9_exe.cc @@ -31,7 +31,9 @@ #endif #ifdef YOSYS_LINK_ABC -extern "C" int Abc_RealMain(int argc, char *argv[]); +namespace abc { + int Abc_RealMain(int argc, char *argv[]); +} #endif std::string fold_abc9_cmd(std::string str) @@ -277,7 +279,7 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe abc9_argv[2] = strdup("-f"); abc9_argv[3] = strdup(tmp_script_name.c_str()); abc9_argv[4] = 0; - int ret = Abc_RealMain(4, abc9_argv); + int ret = abc::Abc_RealMain(4, abc9_argv); free(abc9_argv[0]); free(abc9_argv[1]); free(abc9_argv[2]); |