From: Andreas Hansson <andreas.hansson@arm.com>
Date: Mon, 20 Oct 2014 22:03:53 +0000 (-0400)
Subject: ext: Bump DRAMPower to avoid compilation issues
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b976496a347208dc00d5998a31f3833bce14e049;p=gem5.git

ext: Bump DRAMPower to avoid compilation issues

This patch bumps DRAMPower to commit
19433a6897ede4bbb19b06694faa8589b5a6569a which contains a small fix
for clang, and a work-around for LTO with gcc 4.6.
---

diff --git a/ext/drampower/src/MemCommand.h b/ext/drampower/src/MemCommand.h
index 4159fe008..ea7164577 100644
--- a/ext/drampower/src/MemCommand.h
+++ b/ext/drampower/src/MemCommand.h
@@ -159,6 +159,7 @@ class MemCommand {
       }
     }
     assert(false); // Unknown name.
+    return NOP;  // For clang compilation
   }
 
  private:
diff --git a/ext/drampower/src/Utils.h b/ext/drampower/src/Utils.h
index 3fba0961f..4aa8bb220 100644
--- a/ext/drampower/src/Utils.h
+++ b/ext/drampower/src/Utils.h
@@ -54,8 +54,7 @@ throw(std::runtime_error)
   T t;
 
   if (!(is >> f >> t)) {
-    throw std::runtime_error("Cannot convert '" + s + "' to " +
-                             typeid(t).name() + " using fromString");
+    throw std::runtime_error("fromString cannot convert " + s);
   }
 
   return t;