summaryrefslogtreecommitdiff
path: root/src/cpu/inorder
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2013-03-20 06:41:23 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2013-03-20 06:41:23 -0400
commit2ca42cd62666f4d13eab259290b6cde5fe677862 (patch)
tree0ccc459f1e62366b9d6029325b1539fc9189b5ea /src/cpu/inorder
parente28e6246fc106569909124ada78603ae1507a972 (diff)
downloadgem5-2ca42cd62666f4d13eab259290b6cde5fe677862.tar.xz
cpu: Avoid including inorder TLBUnit to avoid gcc LTO bug
This patch comments out the inclusion of the inorder TLBUnit which is only used in the 9-stage pipeline. With the TLBUnit present, gcc >= 4.6 in combination with LTO ends up throwing away the definition of the TLBUnit destructor, and consequently fail to link. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53808 for more details about the bug, and http://gcc.gnu.org/ml/gcc/2012-06/msg00397.html for the discussion thread that also touches on similar issues seen with clang.
Diffstat (limited to 'src/cpu/inorder')
-rw-r--r--src/cpu/inorder/resources/resource_list.hh4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cpu/inorder/resources/resource_list.hh b/src/cpu/inorder/resources/resource_list.hh
index ae6b4ecaf..a3876d80f 100644
--- a/src/cpu/inorder/resources/resource_list.hh
+++ b/src/cpu/inorder/resources/resource_list.hh
@@ -42,7 +42,9 @@
#include "cpu/inorder/resources/graduation_unit.hh"
#include "cpu/inorder/resources/inst_buffer.hh"
#include "cpu/inorder/resources/mult_div_unit.hh"
-#include "cpu/inorder/resources/tlb_unit.hh"
+// The TLBUnit is only needed with the 9-stage pipe and is
+// triggering a gcc LTO bug
+//#include "cpu/inorder/resources/tlb_unit.hh"
#include "cpu/inorder/resources/use_def.hh"
#endif