summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2015-05-17 08:19:52 +0200
committerClifford Wolf <clifford@clifford.at>2015-05-17 08:19:52 +0200
commit61512b6f4115fce5326b78914b675be278c6845f (patch)
tree57c8933bbe35e8bf18065f9382c033bf9731e154
parentc2f30e0de41d93ef7e6468ba7041c51c971c6a0c (diff)
Verific build fixes
-rw-r--r--frontends/verific/build_amd64.txt2
-rw-r--r--frontends/verific/verific.cc2
-rw-r--r--kernel/log.cc2
-rw-r--r--techlibs/ice40/Makefile.inc4
-rw-r--r--techlibs/xilinx/Makefile.inc4
5 files changed, 7 insertions, 7 deletions
diff --git a/frontends/verific/build_amd64.txt b/frontends/verific/build_amd64.txt
index 9bb6e320..0a220475 100644
--- a/frontends/verific/build_amd64.txt
+++ b/frontends/verific/build_amd64.txt
@@ -21,7 +21,7 @@ VERIFIC_DIR = /usr/local/src/verific_lib_eval
2.) Install the necessary multilib packages
Hint: On debian/ubuntu the multilib packages have names such as
-libreadline-dev:amd64 or lib32readline6-dev, depending on the
+libreadline-dev:i386 or lib32readline6-dev, depending on the
exact version of debian/ubuntu you are working with.
diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 79abcf24..5f362a0c 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -65,7 +65,7 @@ static void msg_func(msg_type_t msg_type, const char *message_id, linefile_type
log("\n");
}
-static void import_attributes(std::map<RTLIL::IdString, RTLIL::Const> &attributes, DesignObj *obj)
+static void import_attributes(dict<RTLIL::IdString, RTLIL::Const> &attributes, DesignObj *obj)
{
MapIter mi;
Att *attr;
diff --git a/kernel/log.cc b/kernel/log.cc
index bf92dace..29644a06 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -264,7 +264,7 @@ void log_pop()
log_flush();
}
-#ifdef __linux__
+#if defined(__linux__) && defined(YOSYS_ENABLE_PLUGINS)
void log_backtrace(const char *prefix, int levels)
{
if (levels <= 0) return;
diff --git a/techlibs/ice40/Makefile.inc b/techlibs/ice40/Makefile.inc
index 6900f74a..a9d2f236 100644
--- a/techlibs/ice40/Makefile.inc
+++ b/techlibs/ice40/Makefile.inc
@@ -11,8 +11,8 @@ EXTRA_OBJS += techlibs/ice40/brams_init.mk
.SECONDARY: techlibs/ice40/brams_init.mk
techlibs/ice40/brams_init.mk: techlibs/ice40/brams_init.py
- cd techlibs/ice40 && python brams_init.py
- touch techlibs/ice40/brams_init.mk
+ $(P) cd techlibs/ice40 && python brams_init.py
+ $(Q) touch techlibs/ice40/brams_init.mk
techlibs/ice40/brams_init1.vh: techlibs/ice40/brams_init.mk
techlibs/ice40/brams_init2.vh: techlibs/ice40/brams_init.mk
diff --git a/techlibs/xilinx/Makefile.inc b/techlibs/xilinx/Makefile.inc
index 76a0cd74..a8f5416e 100644
--- a/techlibs/xilinx/Makefile.inc
+++ b/techlibs/xilinx/Makefile.inc
@@ -10,8 +10,8 @@ EXTRA_OBJS += techlibs/xilinx/brams_init.mk
.SECONDARY: techlibs/xilinx/brams_init.mk
techlibs/xilinx/brams_init.mk: techlibs/xilinx/brams_init.py
- cd techlibs/xilinx && python brams_init.py
- touch techlibs/xilinx/brams_init.mk
+ $(P) cd techlibs/xilinx && python brams_init.py
+ $(Q) touch techlibs/xilinx/brams_init.mk
techlibs/xilinx/brams_init_36.vh: techlibs/xilinx/brams_init.mk
techlibs/xilinx/brams_init_32.vh: techlibs/xilinx/brams_init.mk