Merge from upstream

This commit is contained in:
Akash Levy 2025-06-25 22:11:00 -07:00
commit faaac21ec8
2 changed files with 5 additions and 3 deletions

View File

@ -176,7 +176,7 @@ ifeq ($(OS), Haiku)
CXXFLAGS += -D_DEFAULT_SOURCE
endif
YOSYS_VER := 0.54+17
YOSYS_VER := 0.54+23
YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2)
YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'.' -f3)

View File

@ -189,13 +189,16 @@ int run_command(const std::string &command, std::function<void(const std::string
#endif
bool already_setup = false;
bool already_shutdown = false;
void yosys_setup()
{
if(already_setup)
return;
already_setup = true;
already_shutdown = false;
new backward::SignalHandling;
#ifdef WITH_PYTHON
// With Python 3.12, calling PyImport_AppendInittab on an already
// initialized platform fails (such as when libyosys is imported
@ -226,12 +229,11 @@ bool yosys_already_setup()
return already_setup;
}
bool already_shutdown = false;
void yosys_shutdown()
{
if(already_shutdown)
return;
already_setup = false;
already_shutdown = true;
log_pop();