Back out changelist 10951

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 10963]

1 files changed, 18 insertions, 19 deletions

diff --git a/src/Makefile b/src/Makefile
index 528cd17..40d7a89 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -83,7 +83,6 @@ option_parser.$(OEXT): option_parser.h
 ../build/debug/abstract_hardware_model.o: /usr/include/gnu/stubs.h
 ../build/debug/abstract_hardware_model.o: /usr/include/gnu/stubs-64.h
 ../build/debug/abstract_hardware_model.o: /usr/include/string.h
-../build/debug/abstract_hardware_model.o: /usr/include/xlocale.h
 ../build/debug/abstract_hardware_model.o: /usr/include/stdio.h
 ../build/debug/abstract_hardware_model.o: /usr/include/bits/types.h
 ../build/debug/abstract_hardware_model.o: /usr/include/bits/typesizes.h
@@ -107,8 +106,9 @@ option_parser.$(OEXT): option_parser.h
 ../build/debug/abstract_hardware_model.o: /usr/include/alloca.h
 ../build/debug/abstract_hardware_model.o: option_parser.h cuda-sim/ptx_ir.h
 ../build/debug/abstract_hardware_model.o: cuda-sim/ptx.tab.h
-../build/debug/abstract_hardware_model.o: cuda-sim/ptx_sim.h tr1_hash_map.h
-../build/debug/abstract_hardware_model.o: cuda-sim/opcodes.h
+../build/debug/abstract_hardware_model.o: cuda-sim/ptx_sim.h
+../build/debug/abstract_hardware_model.o: cuda-sim/dram_callback.h
+../build/debug/abstract_hardware_model.o: tr1_hash_map.h cuda-sim/opcodes.h
 ../build/debug/abstract_hardware_model.o: cuda-sim/opcodes.def
 ../build/debug/abstract_hardware_model.o: cuda-sim/memory.h option_parser.h
 ../build/debug/abstract_hardware_model.o: cuda-sim/ptx-stats.h
@@ -130,26 +130,24 @@ option_parser.$(OEXT): option_parser.h
 ../build/debug/debug.o: /usr/include/bits/pthreadtypes.h
 ../build/debug/debug.o: /usr/include/alloca.h /usr/include/math.h
 ../build/debug/debug.o: /usr/include/bits/huge_val.h
-../build/debug/debug.o: /usr/include/bits/huge_valf.h
-../build/debug/debug.o: /usr/include/bits/huge_vall.h /usr/include/bits/inf.h
-../build/debug/debug.o: /usr/include/bits/nan.h /usr/include/bits/mathdef.h
+../build/debug/debug.o: /usr/include/bits/mathdef.h
 ../build/debug/debug.o: /usr/include/bits/mathcalls.h /usr/include/assert.h
-../build/debug/debug.o: cuda-sim/ptx.tab.h gpgpu-sim/delayqueue.h
-../build/debug/debug.o: intersim/statwraper.h gpgpu-sim/gpu-misc.h
-../build/debug/debug.o: gpgpu-sim/stack.h abstract_hardware_model.h
-../build/debug/debug.o: gpgpu-sim/dram.h /usr/include/zlib.h
-../build/debug/debug.o: /usr/include/zconf.h /usr/include/unistd.h
-../build/debug/debug.o: /usr/include/bits/posix_opt.h
+../build/debug/debug.o: cuda-sim/ptx.tab.h cuda-sim/dram_callback.h
+../build/debug/debug.o: gpgpu-sim/delayqueue.h intersim/statwraper.h
+../build/debug/debug.o: gpgpu-sim/gpu-misc.h gpgpu-sim/stack.h
+../build/debug/debug.o: abstract_hardware_model.h gpgpu-sim/dram.h
+../build/debug/debug.o: /usr/include/zlib.h /usr/include/zconf.h
+../build/debug/debug.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
 ../build/debug/debug.o: /usr/include/bits/confname.h /usr/include/getopt.h
 ../build/debug/debug.o: gpgpu-sim/scoreboard.h gpgpu-sim/mem_fetch.h
 ../build/debug/debug.o: gpgpu-sim/addrdec.h option_parser.h gpgpu-sim/stats.h
 ../build/debug/debug.o: gpgpu-sim/gpu-cache.h tr1_hash_map.h
 ../build/debug/debug.o: gpgpu-sim/gpu-sim.h gpgpu-sim/shader.h
-../build/debug/debug.o: cuda-sim/ptx_sim.h cuda-sim/opcodes.h
-../build/debug/debug.o: cuda-sim/opcodes.def cuda-sim/memory.h
-../build/debug/debug.o: cuda-sim/cuda-sim.h cuda-sim/ptx_ir.h
-../build/debug/debug.o: cuda-sim/ptx.tab.h cuda-sim/ptx_sim.h
-../build/debug/debug.o: /usr/include/string.h /usr/include/xlocale.h
+../build/debug/debug.o: cuda-sim/ptx_sim.h cuda-sim/dram_callback.h
+../build/debug/debug.o: cuda-sim/opcodes.h cuda-sim/opcodes.def
+../build/debug/debug.o: cuda-sim/memory.h cuda-sim/cuda-sim.h
+../build/debug/debug.o: cuda-sim/ptx_ir.h cuda-sim/ptx.tab.h
+../build/debug/debug.o: cuda-sim/ptx_sim.h /usr/include/string.h
 ../build/debug/gpgpusim_entrypoint.o: gpgpusim_entrypoint.h
 ../build/debug/gpgpusim_entrypoint.o: abstract_hardware_model.h
 ../build/debug/gpgpusim_entrypoint.o: /usr/include/time.h
@@ -180,6 +178,7 @@ option_parser.$(OEXT): option_parser.h
 ../build/debug/gpgpusim_entrypoint.o: /usr/include/alloca.h
 ../build/debug/gpgpusim_entrypoint.o: cuda-sim/cuda-sim.h
 ../build/debug/gpgpusim_entrypoint.o: abstract_hardware_model.h
+../build/debug/gpgpusim_entrypoint.o: cuda-sim/dram_callback.h
 ../build/debug/gpgpusim_entrypoint.o: cuda-sim/ptx_ir.h /usr/include/assert.h
 ../build/debug/gpgpusim_entrypoint.o: cuda-sim/ptx.tab.h cuda-sim/ptx_sim.h
 ../build/debug/gpgpusim_entrypoint.o: tr1_hash_map.h cuda-sim/opcodes.h
@@ -218,8 +217,7 @@ option_parser.$(OEXT): option_parser.h
 ../build/debug/option_parser.o: /usr/include/sys/sysmacros.h
 ../build/debug/option_parser.o: /usr/include/bits/pthreadtypes.h
 ../build/debug/option_parser.o: /usr/include/alloca.h /usr/include/assert.h
-../build/debug/option_parser.o: /usr/include/string.h /usr/include/xlocale.h
-../build/debug/option_parser.o: option_parser.h
+../build/debug/option_parser.o: /usr/include/string.h option_parser.h
 ../build/debug/stream_manager.o: stream_manager.h abstract_hardware_model.h
 ../build/debug/stream_manager.o: /usr/include/pthread.h
 ../build/debug/stream_manager.o: /usr/include/features.h
@@ -241,6 +239,7 @@ option_parser.$(OEXT): option_parser.h
 ../build/debug/stream_manager.o: /usr/include/bits/setjmp.h
 ../build/debug/stream_manager.o: gpgpusim_entrypoint.h cuda-sim/cuda-sim.h
 ../build/debug/stream_manager.o: abstract_hardware_model.h
+../build/debug/stream_manager.o: cuda-sim/dram_callback.h
 ../build/debug/stream_manager.o: /usr/include/stdlib.h
 ../build/debug/stream_manager.o: /usr/include/sys/types.h
 ../build/debug/stream_manager.o: /usr/include/sys/select.h