summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2014-10-20 18:03:53 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2014-10-20 18:03:53 -0400
commitb976496a347208dc00d5998a31f3833bce14e049 (patch)
tree11268902dbb23ef11e39346daaf6e90ba952d7bc
parent29dd2887f4e1c2ee7689f912c705552afaac4d03 (diff)
downloadgem5-b976496a347208dc00d5998a31f3833bce14e049.tar.xz
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.
-rw-r--r--ext/drampower/src/MemCommand.h1
-rw-r--r--ext/drampower/src/Utils.h3
2 files changed, 2 insertions, 2 deletions
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;