Merge ktlim@zizzer.eecs.umich.edu:/bk/m5

into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : 95e94251150a3eea380b6b3bc3a9596e188df315

diff --cc SConscript
Simple merge

diff --cc build/SConstruct
index 068158a4e93c76418625931f69014285eb449991,28cb77762f3b85d85d71feeb5a2f9d956905634b..3e71c1a748e54a9a4b66ff05be0c47410676ebf7
--- 1/build/SConstruct
--- 2/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