riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream'

This commit is contained in:
Zapta 2024-03-04 14:55:14 -08:00
parent 672c89498a 16f6386613
commit 36c244aeda
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -267,7 +267,7 @@ CXX = emcc
CXXFLAGS := -std=$(CXXSTD) $(filter-out -fPIC -ggdb,$(CXXFLAGS)) CXXFLAGS := -std=$(CXXSTD) $(filter-out -fPIC -ggdb,$(CXXFLAGS))
ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -DABC_MEMALIGN=8 -Wno-c++11-narrowing" ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -DABC_MEMALIGN=8 -Wno-c++11-narrowing"
EMCC_CXXFLAGS := -Os -Wno-warn-absolute-paths EMCC_CXXFLAGS := -Os -Wno-warn-absolute-paths
EMCC_LINKFLAGS := --memory-init-file 0 --embed-file share EMCC_LINKFLAGS := --embed-file share
EMCC_LINKFLAGS += -s NO_EXIT_RUNTIME=1 EMCC_LINKFLAGS += -s NO_EXIT_RUNTIME=1
EMCC_LINKFLAGS += -s EXPORTED_FUNCTIONS="['_main','_run','_prompt','_errmsg','_memset']" EMCC_LINKFLAGS += -s EXPORTED_FUNCTIONS="['_main','_run','_prompt','_errmsg','_memset']"
EMCC_LINKFLAGS += -s TOTAL_MEMORY=134217728 EMCC_LINKFLAGS += -s TOTAL_MEMORY=134217728

8
kernel/yosys.cc
View File

@ -55,7 +55,7 @@
# include <glob.h> # include <glob.h>
#endif #endif
#ifdef __FreeBSD__ #if defined(__FreeBSD__) || defined(__NetBSD__)
# include <sys/sysctl.h> # include <sys/sysctl.h>
#endif #endif
@ -901,10 +901,14 @@ std::string proc_self_dirname()
buflen--; buflen--;
return std::string(path, buflen); return std::string(path, buflen);
} }
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__) || defined(__NetBSD__)
std::string proc_self_dirname() std::string proc_self_dirname()
{ {
#ifdef __NetBSD__
int mib[4] = {CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_PATHNAME};
#else
int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1}; int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
#endif
size_t buflen; size_t buflen;
char *buffer; char *buffer;
std::string path; std::string path;

2
passes/equiv/equiv_simple.cc
View File

@ -339,6 +339,8 @@ struct EquivSimplePass : public Pass {
CellTypes ct; CellTypes ct;
ct.setup_internals(); ct.setup_internals();
ct.setup_stdcells(); ct.setup_stdcells();
ct.setup_internals_ff();
ct.setup_stdcells_mem();
for (auto module : design->selected_modules()) for (auto module : design->selected_modules())
{ {