Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45237 )
Change subject: misc: Replace M5_ALIGNED with GEM5_ALIGNED.
......................................................................
misc: Replace M5_ALIGNED with GEM5_ALIGNED.
Change-Id: Ia06bc959c81e9b37e0a506c022b8f8d86a0897ac
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45237
Tested-by: kokoro <[email protected]>
Maintainer: Gabe Black <[email protected]>
Reviewed-by: Daniel Carvalho <[email protected]>
---
M src/arch/arm/linux/linux.hh
M src/arch/mips/linux/aligned.hh
M src/base/statistics.hh
3 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Daniel Carvalho: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/linux/linux.hh b/src/arch/arm/linux/linux.hh
index 6698a1c..6ca877c 100644
--- a/src/arch/arm/linux/linux.hh
+++ b/src/arch/arm/linux/linux.hh
@@ -226,9 +226,9 @@
uint32_t st_gid;
uint64_t st_rdev;
uint8_t __pad3[4];
- M5_ALIGNED(8) int64_t st_size;
+ GEM5_ALIGNED(8) int64_t st_size;
uint32_t st_blksize;
- M5_ALIGNED(8) uint64_t st_blocks;
+ GEM5_ALIGNED(8) uint64_t st_blocks;
uint32_t st_atimeX;
uint32_t st_atime_nsec;
uint32_t st_mtimeX;
diff --git a/src/arch/mips/linux/aligned.hh b/src/arch/mips/linux/aligned.hh
index 84157a2..ad80a0f 100644
--- a/src/arch/mips/linux/aligned.hh
+++ b/src/arch/mips/linux/aligned.hh
@@ -30,8 +30,8 @@
#define __ARCH_MIPS_LINUX_ALIGNED_HH__
-typedef M5_ALIGNED(8) uint64_t uint64_ta;
-typedef M5_ALIGNED(8) int64_t int64_ta;
-typedef M5_ALIGNED(8) Addr Addr_a;
+typedef GEM5_ALIGNED(8) uint64_t uint64_ta;
+typedef GEM5_ALIGNED(8) int64_t int64_ta;
+typedef GEM5_ALIGNED(8) Addr Addr_a;
#endif /* __ARCH_MIPS_LINUX_ALIGNED_HH__ */
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 9de975b..e96cc7b 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -515,7 +515,7 @@
protected:
/** The storage of this stat. */
- M5_ALIGNED(8) char storage[sizeof(Storage)];
+ GEM5_ALIGNED(8) char storage[sizeof(Storage)];
protected:
/**
@@ -1284,7 +1284,7 @@
protected:
/** The storage for this stat. */
- M5_ALIGNED(8) char storage[sizeof(Storage)];
+ GEM5_ALIGNED(8) char storage[sizeof(Storage)];
protected:
/**
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/+/45237
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: Ia06bc959c81e9b37e0a506c022b8f8d86a0897ac
Gerrit-Change-Number: 45237
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