From: Andrew Waterman <waterman@eecs.berkeley.edu>
Date: Sat, 1 Feb 2014 01:21:37 +0000 (-0800)
Subject: Fix linking on Darwin
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97b1bc610f79b619126f29b35b0ca38b160988ab;p=riscv-isa-sim.git

Fix linking on Darwin
---

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()