projects
/
yosys.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c2f30e0
)
Verific build fixes
author
Clifford Wolf
<clifford@clifford.at>
Sun, 17 May 2015 06:19:52 +0000
(08:19 +0200)
committer
Clifford Wolf
<clifford@clifford.at>
Sun, 17 May 2015 06:19:52 +0000
(08:19 +0200)
frontends/verific/build_amd64.txt
patch
|
blob
|
history
frontends/verific/verific.cc
patch
|
blob
|
history
kernel/log.cc
patch
|
blob
|
history
techlibs/ice40/Makefile.inc
patch
|
blob
|
history
techlibs/xilinx/Makefile.inc
patch
|
blob
|
history
diff --git
a/frontends/verific/build_amd64.txt
b/frontends/verific/build_amd64.txt
index 9bb6e3203a37313603f518d711e2958c72714c8d..0a2204753a35be0e127c719577ddfbc31a59b092 100644
(file)
--- 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
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.
exact version of debian/ubuntu you are working with.
diff --git
a/frontends/verific/verific.cc
b/frontends/verific/verific.cc
index 79abcf245536b635ead89dc9ed902b0f8ff660b1..5f362a0c3d1e27ccc47086ba652b64adbfaf6c9a 100644
(file)
--- 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");
}
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;
{
MapIter mi;
Att *attr;
diff --git
a/kernel/log.cc
b/kernel/log.cc
index bf92dacedd441be16637dab8693e1d9fb6c44a67..29644a067c2a22b7a23bedce2101a475d6d84d35 100644
(file)
--- a/
kernel/log.cc
+++ b/
kernel/log.cc
@@
-264,7
+264,7
@@
void log_pop()
log_flush();
}
log_flush();
}
-#if
def __linux__
+#if
defined(__linux__) && defined(YOSYS_ENABLE_PLUGINS)
void log_backtrace(const char *prefix, int levels)
{
if (levels <= 0) return;
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 6900f74abe76d6e638678e824b5d5d8420b67f53..a9d2f2369649cd562ab039f0f6294ac1b8e68e4c 100644
(file)
--- 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
.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
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 76a0cd7425f39a9dbfc24bcf6fdec45f4a3084c3..a8f5416e345bffcd01e1653ab085dbdd15c6be84 100644
(file)
--- 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
.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
techlibs/xilinx/brams_init_36.vh: techlibs/xilinx/brams_init.mk
techlibs/xilinx/brams_init_32.vh: techlibs/xilinx/brams_init.mk