misc: Appease gcc 5.1

This patch fixes a few small issues to ensure gem5 compiles when using
gcc 5.1.

First, the GDB_REG_BYTES in the RemoteGDB header are, rather
surprisingly, flagged as unused for both ARM and X86. Removing them,
however, causes compilation errors as they are actually used in the
source file. Moving the constant into the class definition fixes the
issue. Possibly a gcc bug.

Second, we have an unused EthPktData constructor using auto_ptr, and
the latter is deprecated. Since the code is never used it is simply
removed.

diff --git a/src/arch/arm/remote_gdb.hh b/src/arch/arm/remote_gdb.hh
index 56a50a133c153c3b320c18ede46917d3a03dad90..1e642063325a4b77fa4dd32473d3ffb91afcf7ab 100644 (file)
--- a/src/arch/arm/remote_gdb.hh
+++ b/src/arch/arm/remote_gdb.hh
@@ -76,9 +76,6 @@ enum {
     GDB64_NUMREGS = 98
 };
 
-const int GDB_REG_BYTES = std::max(GDB64_NUMREGS * sizeof(uint64_t),
-                                   GDB32_NUMREGS * sizeof(uint32_t));
-
 class RemoteGDB : public BaseRemoteGDB
 {
   protected:
@@ -89,6 +86,9 @@ class RemoteGDB : public BaseRemoteGDB
     void setregs();
 
   public:
+    const int GDB_REG_BYTES = std::max(GDB64_NUMREGS * sizeof(uint64_t),
+                                       GDB32_NUMREGS * sizeof(uint32_t));
+
     RemoteGDB(System *_system, ThreadContext *tc);
 };
 } // namespace ArmISA

diff --git a/src/arch/x86/remote_gdb.hh b/src/arch/x86/remote_gdb.hh
index f09d1e012d5b9f1d1c61a50c8846d785b70fb3d9..0f41055cd54619e3decb971a4127fc10b26ae195 100644 (file)
--- a/src/arch/x86/remote_gdb.hh
+++ b/src/arch/x86/remote_gdb.hh
@@ -111,6 +111,10 @@ 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);
@@ -122,10 +126,6 @@ class RemoteGDB : public BaseRemoteGDB
     bool checkBpLen(size_t len) { return len == 1; }
 };
 
-const int GDB_REG_BYTES =
-    std::max(RemoteGDB::GDB32_NUMREGS * sizeof(uint32_t),
-             RemoteGDB::GDB64_NUMREGS * sizeof(uint64_t));
-
 }
 
 #endif // __ARCH_X86_REMOTEGDB_HH__

diff --git a/src/dev/etherpkt.hh b/src/dev/etherpkt.hh
index 16576d329e874db95afbc5eaf88346db6db6d9ba..febd303a183b1927621eb46c1f98db78014caa1e 100644 (file)
--- a/src/dev/etherpkt.hh
+++ b/src/dev/etherpkt.hh
@@ -68,10 +68,6 @@ class EthPacketData
         : data(new uint8_t[size]), length(0)
     { }
 
-    EthPacketData(std::auto_ptr<uint8_t> d, int l)
-        : data(d.release()), length(l)
-    { }
-
     ~EthPacketData() { if (data) delete [] data; }
 
   public: