mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 11:42:30 +00:00
Code Activity

Fix external ABC build after commit 0ca0932b5.

Browse source
This commit is contained in:
Catherine 2022-07-07 08:08:17 +00:00
parent 43d86f2c26
commit 502b96fe53
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -153,7 +153,7 @@ bumpversion:
# is just a symlink to your actual ABC working directory, as 'make mrproper' # 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 # will remove the 'abc' directory and you do not want to accidentally
# delete your work on ABC.. # delete your work on ABC..
ABCREV = f159bef ABCREV = 5f40c47
ABCPULL = 1 ABCPULL = 1
ABCURL ?= https://github.com/YosysHQ/abc ABCURL ?= https://github.com/YosysHQ/abc
ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q) ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)

6
passes/techmap/abc.cc
View file

@ -65,7 +65,9 @@
#include "frontends/blif/blifparse.h" #include "frontends/blif/blifparse.h"
#ifdef YOSYS_LINK_ABC #ifdef YOSYS_LINK_ABC
extern "C" int Abc_RealMain(int argc, char *argv[]); namespace abc {
int Abc_RealMain(int argc, char *argv[]);
}
#endif #endif
USING_YOSYS_NAMESPACE 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[2] = strdup("-f");
abc_argv[3] = strdup(tmp_script_name.c_str()); abc_argv[3] = strdup(tmp_script_name.c_str());
abc_argv[4] = 0; 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[0]);
free(abc_argv[1]); free(abc_argv[1]);
free(abc_argv[2]); free(abc_argv[2]);

6
passes/techmap/abc9_exe.cc
View file

@ -31,7 +31,9 @@
#endif #endif
#ifdef YOSYS_LINK_ABC #ifdef YOSYS_LINK_ABC
extern "C" int Abc_RealMain(int argc, char *argv[]); namespace abc {
int Abc_RealMain(int argc, char *argv[]);
}
#endif #endif
std::string fold_abc9_cmd(std::string str) 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[2] = strdup("-f");
abc9_argv[3] = strdup(tmp_script_name.c_str()); abc9_argv[3] = strdup(tmp_script_name.c_str());
abc9_argv[4] = 0; 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[0]);
free(abc9_argv[1]); free(abc9_argv[1]);
free(abc9_argv[2]); free(abc9_argv[2]);