From 179787f31faf12f7f4a31506db40236e82873675 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Fri, 24 Apr 2015 03:30:08 -0400 Subject: misc: Appease gcc 5.1 without moving GDB_REG_BYTES This patch rolls back the move of the GDB_REG_BYTES constant, and instead adds M5_VAR_USED. --- src/arch/x86/remote_gdb.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/arch/x86') diff --git a/src/arch/x86/remote_gdb.hh b/src/arch/x86/remote_gdb.hh index 0f41055cd..991452f74 100644 --- a/src/arch/x86/remote_gdb.hh +++ b/src/arch/x86/remote_gdb.hh @@ -111,10 +111,6 @@ class RemoteGDB : public BaseRemoteGDB GDB64_NUMREGS = (GDB64_GS_32 + 1) / 2 + 1 }; - const int GDB_REG_BYTES = - std::max(RemoteGDB::GDB32_NUMREGS * sizeof(uint32_t), - RemoteGDB::GDB64_NUMREGS * sizeof(uint64_t)); - RemoteGDB(System *system, ThreadContext *context); bool acc(Addr addr, size_t len); @@ -126,6 +122,10 @@ class RemoteGDB : public BaseRemoteGDB bool checkBpLen(size_t len) { return len == 1; } }; +const int GDB_REG_BYTES M5_VAR_USED = + std::max(RemoteGDB::GDB32_NUMREGS * sizeof(uint32_t), + RemoteGDB::GDB64_NUMREGS * sizeof(uint64_t)); + } #endif // __ARCH_X86_REMOTEGDB_HH__ -- cgit v1.2.3