From e92f64b0b7d605d7d32f610c2ed1dca7e0bb98d7 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 8 May 2021 20:41:42 -0700 Subject: [PATCH] misc: Replace M5_ALIGNED with GEM5_ALIGNED. Change-Id: Ia06bc959c81e9b37e0a506c022b8f8d86a0897ac Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45237 Tested-by: kokoro Maintainer: Gabe Black Reviewed-by: Daniel Carvalho --- src/arch/arm/linux/linux.hh | 4 ++-- src/arch/mips/linux/aligned.hh | 6 +++--- src/base/statistics.hh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/arch/arm/linux/linux.hh b/src/arch/arm/linux/linux.hh index 6698a1c568..6ca877c93d 100644 --- a/src/arch/arm/linux/linux.hh +++ b/src/arch/arm/linux/linux.hh @@ -226,9 +226,9 @@ class ArmLinux32 : public ArmLinux 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 84157a2d80..ad80a0fd22 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 9de975be45..e96cc7b15d 100644 --- a/src/base/statistics.hh +++ b/src/base/statistics.hh @@ -515,7 +515,7 @@ class ScalarBase : public DataWrap 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 @@ class DistBase : public DataWrap protected: /** The storage for this stat. */ - M5_ALIGNED(8) char storage[sizeof(Storage)]; + GEM5_ALIGNED(8) char storage[sizeof(Storage)]; protected: /**