aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Waterman <waterman@eecs.berkeley.edu>2014-01-31 17:21:37 -0800
committerAndrew Waterman <waterman@eecs.berkeley.edu>2014-01-31 17:21:37 -0800
commit97b1bc610f79b619126f29b35b0ca38b160988ab (patch)
tree50c81570b3dc1e93a3b57cdfae688cdabcce7a46
parent0346522aa6ca2a91f2d32f824646febc6dff1fc8 (diff)
downloadriscv-isa-sim-97b1bc610f79b619126f29b35b0ca38b160988ab.zip
riscv-isa-sim-97b1bc610f79b619126f29b35b0ca38b160988ab.tar.gz
riscv-isa-sim-97b1bc610f79b619126f29b35b0ca38b160988ab.tar.bz2
Fix linking on Darwin
-rw-r--r--hwacha/hwacha.h2
-rw-r--r--riscv/dummy-rocc.h2
-rw-r--r--spike/extensions.cc3
3 files changed, 3 insertions, 4 deletions
diff --git a/hwacha/hwacha.h b/hwacha/hwacha.h
index bbdd7c7..8b27f96 100644
--- a/hwacha/hwacha.h
+++ b/hwacha/hwacha.h
@@ -59,6 +59,4 @@ private:
bool debug;
};
-REGISTER_EXTENSION(hwacha, []() { return new hwacha_t; })
-
#endif
diff --git a/riscv/dummy-rocc.h b/riscv/dummy-rocc.h
index c74286e..75e0722 100644
--- a/riscv/dummy-rocc.h
+++ b/riscv/dummy-rocc.h
@@ -46,6 +46,4 @@ class dummy_rocc_t : public rocc_t
reg_t acc[num_acc];
};
-REGISTER_EXTENSION(dummy, []() { return new dummy_rocc_t; })
-
#endif
diff --git a/spike/extensions.cc b/spike/extensions.cc
index d6ee6f1..0d22a95 100644
--- a/spike/extensions.cc
+++ b/spike/extensions.cc
@@ -2,6 +2,9 @@
#include "hwacha.h"
#include "dummy-rocc.h"
+REGISTER_EXTENSION(dummy, []() { return new dummy_rocc_t; })
+REGISTER_EXTENSION(hwacha, []() { return new hwacha_t; })
+
// Static constructors want to make use of the extensions map, so we
// access it through a function call to guarantee initialization order.
std::map<std::string, std::function<extension_t*()>>& extensions()