Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45236 )
Change subject: misc: Replace M5_LOCAL and M5_WEAK with GEM5_LOCAL and
GEM5_WEAK.
......................................................................
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 <[email protected]>
Maintainer: Gabe Black <[email protected]>
Reviewed-by: Daniel Carvalho <[email protected]>
---
M src/cpu/testers/traffic_gen/pygen.hh
M src/sim/init.cc
M src/systemc/core/sc_main_fiber.cc
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Daniel Carvalho: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/testers/traffic_gen/pygen.hh
b/src/cpu/testers/traffic_gen/pygen.hh
index 3e2b4d2..9f84914 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 df53c29..3b34ff6 100644
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -245,7 +245,7 @@
* 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 df804d0..83c3419 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
{
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45236
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ieb8350e647480f9bf582479b7933f0462f18d14d
Gerrit-Change-Number: 45236
Gerrit-PatchSet: 7
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s