hammer: fixed dma uniproc error

[gem5.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 89036c31f1cde9a760f2c6dc8eee856c8f0bdf08..eee1c78e87762adb461f9a638adab1c3f0612749 100755 (executable)
--- a/SConstruct
+++ b/SConstruct
@@ -227,19 +227,11 @@ If you are actually a M5 developer, please fix this and
 run the style hook. It is important.
 """
 
-hg_info = "Unknown"
 if hgdir.exists():
-    # 1) Grab repository revision if we know it.
-    cmd = "hg id -n -i -t -b"
-    try:
-        hg_info = readCommand(cmd, cwd=main.root.abspath).strip()
-    except OSError:
-        print mercurial_bin_not_found
-
-    # 2) Ensure that the style hook is in place.
+    # Ensure that the style hook is in place.
     try:
         ui = None
-        if GetOption('ignore_style'):
+        if not GetOption('ignore_style'):
             from mercurial import ui
             ui = ui.ui()
     except ImportError:
@@ -255,8 +247,6 @@ if hgdir.exists():
 else:
     print ".hg directory not found"
 
-main['HG_INFO'] = hg_info
-
 ###################################################
 #
 # Figure out which configurations to set up based on the path(s) of
@@ -832,8 +822,8 @@ sticky_vars.AddVariables(
                  sorted(n for n,m in CpuModel.dict.iteritems() if m.default),
                  sorted(CpuModel.list)),
     BoolVariable('NO_FAST_ALLOC', 'Disable fast object allocator', False),
-    BoolVariable('FAST_ALLOC_DEBUG', 'Enable fast object allocator debugging',
-                 False),
+    BoolVariable('FORCE_FAST_ALLOC',
+                 'Enable fast object allocator, even for m5.debug', False),
     BoolVariable('FAST_ALLOC_STATS', 'Enable fast object allocator statistics',
                  False),
     BoolVariable('EFENCE', 'Link with Electric Fence malloc debugger',
@@ -854,7 +844,7 @@ sticky_vars.AddVariables(
 
 # These variables get exported to #defines in config/*.hh (see src/SConscript).
 export_vars += ['FULL_SYSTEM', 'USE_FENV', 'USE_MYSQL',
-                'NO_FAST_ALLOC', 'FAST_ALLOC_DEBUG', 'FAST_ALLOC_STATS',
+                'NO_FAST_ALLOC', 'FORCE_FAST_ALLOC', 'FAST_ALLOC_STATS',
                 'SS_COMPATIBLE_FP', 'USE_CHECKER', 'TARGET_ISA', 'CP_ANNOTATE',
                 'USE_POSIX_CLOCK' ]