5 files changed, 0 insertions, 28 deletions
diff --git a/src/mem/gems_common/ioutil/attrlex.ll b/src/mem/gems_common/ioutil/attrlex.ll
index 293350b23..068591b07 100644
--- a/src/mem/gems_common/ioutil/attrlex.ll
+++ b/src/mem/gems_common/ioutil/attrlex.ll
@@ -68,9 +68,7 @@ WHITESPACE      [ \t]
 
 %{
 
-#ifdef IS_RUBY
 #include "Global.hh"
-#endif
 
 using namespace std;
 #include <string>
diff --git a/src/mem/gems_common/ioutil/attrparse.yy b/src/mem/gems_common/ioutil/attrparse.yy
index 8a0190e06..987e0cb3b 100644
--- a/src/mem/gems_common/ioutil/attrparse.yy
+++ b/src/mem/gems_common/ioutil/attrparse.yy
@@ -65,9 +65,7 @@
 /* Includes                                                               */
 /*------------------------------------------------------------------------*/
 
-#ifdef IS_RUBY
 #include "Global.hh"
-#endif
 
 using namespace std;
 #include <string>
diff --git a/src/mem/gems_common/ioutil/confio.cc b/src/mem/gems_common/ioutil/confio.cc
index 68d44197a..ff1e25f12 100644
--- a/src/mem/gems_common/ioutil/confio.cc
+++ b/src/mem/gems_common/ioutil/confio.cc
@@ -34,18 +34,8 @@
 /* Includes                                                               */
 /*------------------------------------------------------------------------*/
 
-#ifdef IS_OPAL
-#include "hfa.hh"
-#endif
-
-#ifdef IS_RUBY
 #include "Global.hh"
 #define SIM_HALT   ASSERT(0)
-#endif
-
-#ifdef IS_TOURMALINE
-#include "Tourmaline_Global.hh"
-#endif
 
 using namespace std;
 #include <string>
diff --git a/src/mem/gems_common/ioutil/initvar.cc b/src/mem/gems_common/ioutil/initvar.cc
index 9cccdf64b..57caad2b0 100644
--- a/src/mem/gems_common/ioutil/initvar.cc
+++ b/src/mem/gems_common/ioutil/initvar.cc
@@ -72,18 +72,7 @@ using namespace std;
 
 #include "FakeSimicsDataTypes.hh"
 
-#ifdef IS_OPAL
-#include "hfatypes.hh"
-#include "debugio.hh"
-#endif
-
-#ifdef IS_RUBY
 #include "Global.hh"
-#endif
-
-#ifdef IS_TOURMALINE
-#include "Tourmaline_Global.hh"
-#endif
 
 #include "confio.hh"
 #include "initvar.hh"
diff --git a/src/mem/ruby/init.cc b/src/mem/ruby/init.cc
index 213d6b176..5efc8f691 100644
--- a/src/mem/ruby/init.cc
+++ b/src/mem/ruby/init.cc
@@ -191,9 +191,6 @@ void init_simulator()
   g_eventQueue_ptr = NULL;
 
   cout << "Ruby Timing Mode" << endl;
-#ifndef MULTIFACET_NO_OPT_WARN
-  cerr << "Warning: optimizations not enabled." << endl;
-#endif
 
   if (g_SIMICS) {
     // LUKE - if we don't set the default SMT threads in condor scripts,