ruby: strip out some unused defines

diff --git a/src/mem/gems_common/ioutil/attrlex.ll b/src/mem/gems_common/ioutil/attrlex.ll
index 293350b23b4eaae7cc085c60205e4a3aa540c81b..068591b079fab20e597dd222f83ed1e189c7937d 100644 (file)
--- 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 8a0190e0642fbb7bd2e0c78a192eee831e80168f..987e0cb3bc3f8cc00e773fb333e0f7802dfe5f6e 100644 (file)
--- 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 68d44197aa35943047cc04ae7e385ff4b82caa16..ff1e25f123532387656ef7552ab3fe40e862a4f6 100644 (file)
--- 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 9cccdf64bc453e19d685fc550c3124f0e4445d40..57caad2b02c4d56da69705f5b3468a0b71841987 100644 (file)
--- 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 213d6b17696adb8796b294bff725fd03ffa0dd7b..5efc8f691f3b0af31b6adf23552e50d8eb4fd534 100644 (file)
--- 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,