summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2014-09-01 16:55:46 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2014-09-01 16:55:46 -0500
commit00286fc5cbb7b8635d56eb335fed11d1499e2552 (patch)
tree66e044dac2601d2f3ca74f55b95faceb7f7d3931
parentd07abd9b5b7c9d0b47e1f3edc87da3823adaad11 (diff)
downloadgem5-00286fc5cbb7b8635d56eb335fed11d1499e2552.tar.xz
build opts: add MI_example to NULL ISA
A later changeset changes the file src/python/swig/pyobject.cc to include a header file that includes a header file generated at build time depending on the PROTOCOL in use. Since NULL ISA was not specifying any protocol, this resulted in compilation problems. Hence, the changeset.
-rw-r--r--build_opts/NULL1
-rw-r--r--src/mem/ruby/SConscript3
2 files changed, 1 insertions, 3 deletions
diff --git a/build_opts/NULL b/build_opts/NULL
index 5d85833f3..1242fa9ef 100644
--- a/build_opts/NULL
+++ b/build_opts/NULL
@@ -1,2 +1,3 @@
TARGET_ISA = 'null'
CPU_MODELS = ''
+PROTOCOL='MI_example'
diff --git a/src/mem/ruby/SConscript b/src/mem/ruby/SConscript
index 3029c3297..4200ddaeb 100644
--- a/src/mem/ruby/SConscript
+++ b/src/mem/ruby/SConscript
@@ -59,9 +59,6 @@ CompoundFlag('Ruby', [ 'RubyQueue', 'RubyNetwork', 'RubyTester',
'RubyMemory', 'RubyDma', 'RubyPort', 'RubySequencer', 'RubyCacheTrace',
'RubyPrefetcher'])
-if env['TARGET_ISA'] == 'null':
- Return()
-
if env['PROTOCOL'] == 'None':
Return()