summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2005-01-11 19:00:16 -0500
committerKevin Lim <ktlim@umich.edu>2005-01-11 19:00:16 -0500
commit42f3b4ffb3fedcb70e9ff068ed7160dc6020b8c4 (patch)
treeba3d10f448bec63df45dff3bb7f2d6fbd6dcf9c7 /build
parent202758eea20c092bb85d1886898c3816f377d288 (diff)
parent90d4436351620bd3861013333aabd152d5492df7 (diff)
downloadgem5-42f3b4ffb3fedcb70e9ff068ed7160dc6020b8c4.tar.xz
Merge changes.
base/traceflags.py: Merge extra new CPU flags cpu/static_inst.hh: Include all the execute functions in static_inst_impl.hh --HG-- extra : convert_revision : 78eb753bf709d37400e7c2418bb35d842d7c3f63
Diffstat (limited to 'build')
-rw-r--r--build/SConstruct7
1 files changed, 6 insertions, 1 deletions
diff --git a/build/SConstruct b/build/SConstruct
index 3d7db1db2..a1f1cdc5c 100644
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -114,11 +114,16 @@ def MySqlOpt(env):
def NoFastAllocOpt(env):
env.Append(CPPDEFINES = 'NO_FAST_ALLOC')
+# Enable efence
+def EfenceOpt(env):
+ env.Append(LIBS=['efence'])
+
# Configuration options map.
options_map = {
'MEASURE' : MeasureOpt,
'MYSQL' : MySqlOpt,
- 'NO_FAST_ALLOC' : NoFastAllocOpt
+ 'NO_FAST_ALLOC' : NoFastAllocOpt,
+ 'EFENCE' : EfenceOpt
}
# The 'local_configs' file can be used to define additional base