From 97ef1472ad8f0e05938416cf3b9f2e05fe664203 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 8 May 2021 20:40:34 -0700 Subject: [PATCH] misc: Replace M5_LOCAL and M5_WEAK with GEM5_LOCAL and GEM5_WEAK. Change-Id: Ieb8350e647480f9bf582479b7933f0462f18d14d Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45236 Tested-by: kokoro Maintainer: Gabe Black Reviewed-by: Daniel Carvalho --- src/cpu/testers/traffic_gen/pygen.hh | 2 +- src/sim/init.cc | 2 +- src/systemc/core/sc_main_fiber.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpu/testers/traffic_gen/pygen.hh b/src/cpu/testers/traffic_gen/pygen.hh index 3e2b4d241e..9f84914b8f 100644 --- a/src/cpu/testers/traffic_gen/pygen.hh +++ b/src/cpu/testers/traffic_gen/pygen.hh @@ -45,7 +45,7 @@ struct PyTrafficGenParams; -class M5_LOCAL PyTrafficGen : public BaseTrafficGen +class GEM5_LOCAL PyTrafficGen : public BaseTrafficGen { public: PyTrafficGen(const PyTrafficGenParams &p); diff --git a/src/sim/init.cc b/src/sim/init.cc index df53c297f3..3b34ff6a96 100644 --- a/src/sim/init.cc +++ b/src/sim/init.cc @@ -245,7 +245,7 @@ registerNativeModules() * Make the commands array weak so that they can be overridden (used * by unit tests to specify a different python main function. */ -M5_WEAK const char *m5MainCommands[] = { +GEM5_WEAK const char *m5MainCommands[] = { "import m5", "m5.main()", 0 // sentinel is required diff --git a/src/systemc/core/sc_main_fiber.cc b/src/systemc/core/sc_main_fiber.cc index df804d01b5..83c3419a61 100644 --- a/src/systemc/core/sc_main_fiber.cc +++ b/src/systemc/core/sc_main_fiber.cc @@ -38,7 +38,7 @@ #include "systemc/utils/report.hh" // A weak symbol to detect if sc_main has been defined, and if so where it is. -M5_WEAK int sc_main(int argc, char *argv[]); +GEM5_WEAK int sc_main(int argc, char *argv[]); namespace sc_gem5 {