From 97b1bc610f79b619126f29b35b0ca38b160988ab Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Fri, 31 Jan 2014 17:21:37 -0800 Subject: [PATCH] Fix linking on Darwin --- hwacha/hwacha.h | 2 -- riscv/dummy-rocc.h | 2 -- spike/extensions.cc | 3 +++ 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>& extensions() -- 2.30.2