From 22c04190c607b9360d9a23548f8a54e83cf0e74a Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Mon, 12 Oct 2015 04:07:59 -0400
Subject: misc: Remove redundant compiler-specific defines

This patch moves away from using M5_ATTR_OVERRIDE and the m5::hashmap
(and similar) abstractions, as these are no longer needed with gcc 4.7
and clang 3.1 as minimum compiler versions.
---
 src/arch/arm/kvm/armv8_cpu.hh |  6 +++---
 src/arch/arm/kvm/base_cpu.hh  |  4 ++--
 src/arch/arm/kvm/gic.hh       | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/arch/arm/kvm')

diff --git a/src/arch/arm/kvm/armv8_cpu.hh b/src/arch/arm/kvm/armv8_cpu.hh
index 97127b471..aee27a8a4 100644
--- a/src/arch/arm/kvm/armv8_cpu.hh
+++ b/src/arch/arm/kvm/armv8_cpu.hh
@@ -83,11 +83,11 @@ class ArmV8KvmCPU : public BaseArmKvmCPU
     ArmV8KvmCPU(ArmV8KvmCPUParams *params);
     virtual ~ArmV8KvmCPU();
 
-    void dump() M5_ATTR_OVERRIDE;
+    void dump() override;
 
   protected:
-    void updateKvmState() M5_ATTR_OVERRIDE;
-    void updateThreadContext() M5_ATTR_OVERRIDE;
+    void updateKvmState() override;
+    void updateThreadContext() override;
 
   protected:
     /** Mapping between integer registers in gem5 and KVM */
diff --git a/src/arch/arm/kvm/base_cpu.hh b/src/arch/arm/kvm/base_cpu.hh
index 736153b78..2f6f978f7 100644
--- a/src/arch/arm/kvm/base_cpu.hh
+++ b/src/arch/arm/kvm/base_cpu.hh
@@ -52,10 +52,10 @@ class BaseArmKvmCPU : public BaseKvmCPU
     BaseArmKvmCPU(BaseArmKvmCPUParams *params);
     virtual ~BaseArmKvmCPU();
 
-    void startup() M5_ATTR_OVERRIDE;
+    void startup() override;
 
   protected:
-    Tick kvmRun(Tick ticks) M5_ATTR_OVERRIDE;
+    Tick kvmRun(Tick ticks) override;
 
 
     /** Cached state of the IRQ line */
diff --git a/src/arch/arm/kvm/gic.hh b/src/arch/arm/kvm/gic.hh
index 4a115c87c..f156caa6b 100644
--- a/src/arch/arm/kvm/gic.hh
+++ b/src/arch/arm/kvm/gic.hh
@@ -76,23 +76,23 @@ class KvmGic : public BaseGic
     KvmGic(const KvmGicParams *p);
     ~KvmGic();
 
-    void startup() M5_ATTR_OVERRIDE { verifyMemoryMode(); }
-    void drainResume() M5_ATTR_OVERRIDE { verifyMemoryMode(); }
+    void startup() override { verifyMemoryMode(); }
+    void drainResume() override { verifyMemoryMode(); }
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(Checkpoint *cp, const std::string &sec)  M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(Checkpoint *cp, const std::string &sec)  override;
 
   public: // PioDevice
     AddrRangeList getAddrRanges() const { return addrRanges; }
-    Tick read(PacketPtr pkt) M5_ATTR_OVERRIDE;
-    Tick write(PacketPtr pkt) M5_ATTR_OVERRIDE;
+    Tick read(PacketPtr pkt) override;
+    Tick write(PacketPtr pkt) override;
 
   public: // BaseGic
-    void sendInt(uint32_t num) M5_ATTR_OVERRIDE;
-    void clearInt(uint32_t num) M5_ATTR_OVERRIDE;
+    void sendInt(uint32_t num) override;
+    void clearInt(uint32_t num) override;
 
-    void sendPPInt(uint32_t num, uint32_t cpu) M5_ATTR_OVERRIDE;
-    void clearPPInt(uint32_t num, uint32_t cpu) M5_ATTR_OVERRIDE;
+    void sendPPInt(uint32_t num, uint32_t cpu) override;
+    void clearPPInt(uint32_t num, uint32_t cpu) override;
 
   protected:
     /**
-- 
cgit v1.2.3