From: Kevin Lim <ktlim@umich.edu>
Date: Mon, 28 Mar 2005 19:40:02 +0000 (-0500)
Subject: Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
X-Git-Tag: m5_1.0_tutorial~67
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e2d9b5c35a8bc1f5b8f1a96cd9712429475b1d0;p=gem5.git

Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : 95e94251150a3eea380b6b3bc3a9596e188df315
---

2e2d9b5c35a8bc1f5b8f1a96cd9712429475b1d0
diff --cc build/SConstruct
index 068158a4e,28cb77762..3e71c1a74
--- a/build/SConstruct
+++ b/build/SConstruct
@@@ -117,16 -108,9 +108,14 @@@ configs_map = 
  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