Fix linking on Darwin

diff --git a/hwacha/hwacha.h b/hwacha/hwacha.h
index bbdd7c730708bafc32a265049c5812cafd16907e..8b27f966781bdb5381e661d1ee9b477b887a670e 100644 (file)
--- 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 c74286e477b869be2b02d7d8f49daff583b33b61..75e0722e44b97c2e52f1868587cc24be7ea3a649 100644 (file)
--- 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 d6ee6f18b089329c5cfef86dd04236021c58c67a..0d22a95d932f956a4a91fe5055a11b0f7f018e9f 100644 (file)
--- 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()