Undoing the rest of files mistakly changed in CL10695, this change completes the work of CL10697 which undone the changes to one file (stream_manager.cc). Here I undo the changes for 4 make files and more importantly the setup_enviroment file where I uncommented the include path of openCL as the case before CL10695, and I kept Tim changes to the CUDA path done later in CL10723 which he made originally to undo the work I did but didn't uncommet the openCL path which I do here.

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

1 files changed, 0 insertions, 21 deletions

diff --git a/src/cuda-sim/Makefile b/src/cuda-sim/Makefile
index 939aa89..d47f99c 100644
--- a/src/cuda-sim/Makefile
+++ b/src/cuda-sim/Makefile
@@ -177,7 +177,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/cuda_device_printf.o: opcodes.h opcodes.def
 ../../build/release/cuda-sim/cuda_device_printf.o: memory.h
 ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/string.h
-../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/xlocale.h
 ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/stdio.h
 ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/libio.h
 ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/_G_config.h
@@ -212,7 +211,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/cuda-sim.o: ../tr1_hash_map.h opcodes.h
 ../../build/release/cuda-sim/cuda-sim.o: opcodes.def memory.h
 ../../build/release/cuda-sim/cuda-sim.o: /usr/include/string.h
-../../build/release/cuda-sim/cuda-sim.o: /usr/include/xlocale.h
 ../../build/release/cuda-sim/cuda-sim.o: /usr/include/stdio.h
 ../../build/release/cuda-sim/cuda-sim.o: /usr/include/libio.h
 ../../build/release/cuda-sim/cuda-sim.o: /usr/include/_G_config.h
@@ -227,10 +225,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/cuda-sim.o: ../gpgpu-sim/shader.h
 ../../build/release/cuda-sim/cuda-sim.o: /usr/include/math.h
 ../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/huge_val.h
-../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/huge_valf.h
-../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/huge_vall.h
-../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/inf.h
-../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/nan.h
 ../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/mathdef.h
 ../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/mathcalls.h
 ../../build/release/cuda-sim/cuda-sim.o: ../cuda-sim/ptx.tab.h
@@ -278,7 +272,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/instructions.o: ../tr1_hash_map.h opcodes.h
 ../../build/release/cuda-sim/instructions.o: opcodes.def memory.h
 ../../build/release/cuda-sim/instructions.o: /usr/include/string.h
-../../build/release/cuda-sim/instructions.o: /usr/include/xlocale.h
 ../../build/release/cuda-sim/instructions.o: /usr/include/stdio.h
 ../../build/release/cuda-sim/instructions.o: /usr/include/libio.h
 ../../build/release/cuda-sim/instructions.o: /usr/include/_G_config.h
@@ -288,10 +281,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/instructions.o: ../option_parser.h
 ../../build/release/cuda-sim/instructions.o: /usr/include/math.h
 ../../build/release/cuda-sim/instructions.o: /usr/include/bits/huge_val.h
-../../build/release/cuda-sim/instructions.o: /usr/include/bits/huge_valf.h
-../../build/release/cuda-sim/instructions.o: /usr/include/bits/huge_vall.h
-../../build/release/cuda-sim/instructions.o: /usr/include/bits/inf.h
-../../build/release/cuda-sim/instructions.o: /usr/include/bits/nan.h
 ../../build/release/cuda-sim/instructions.o: /usr/include/bits/mathdef.h
 ../../build/release/cuda-sim/instructions.o: /usr/include/bits/mathcalls.h
 ../../build/release/cuda-sim/instructions.o: /usr/include/fenv.h
@@ -326,7 +315,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/memory.o: /usr/include/gnu/stubs.h
 ../../build/release/cuda-sim/memory.o: /usr/include/gnu/stubs-64.h
 ../../build/release/cuda-sim/memory.o: /usr/include/string.h
-../../build/release/cuda-sim/memory.o: /usr/include/xlocale.h
 ../../build/release/cuda-sim/memory.o: /usr/include/stdio.h
 ../../build/release/cuda-sim/memory.o: /usr/include/bits/types.h
 ../../build/release/cuda-sim/memory.o: /usr/include/bits/typesizes.h
@@ -375,7 +363,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/ptx_ir.o: ../tr1_hash_map.h opcodes.h
 ../../build/release/cuda-sim/ptx_ir.o: opcodes.def memory.h
 ../../build/release/cuda-sim/ptx_ir.o: /usr/include/string.h
-../../build/release/cuda-sim/ptx_ir.o: /usr/include/xlocale.h
 ../../build/release/cuda-sim/ptx_ir.o: /usr/include/stdio.h
 ../../build/release/cuda-sim/ptx_ir.o: /usr/include/libio.h
 ../../build/release/cuda-sim/ptx_ir.o: /usr/include/_G_config.h
@@ -410,7 +397,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/ptx_loader.o: ../tr1_hash_map.h opcodes.h
 ../../build/release/cuda-sim/ptx_loader.o: opcodes.def memory.h
 ../../build/release/cuda-sim/ptx_loader.o: /usr/include/string.h
-../../build/release/cuda-sim/ptx_loader.o: /usr/include/xlocale.h
 ../../build/release/cuda-sim/ptx_loader.o: /usr/include/stdio.h
 ../../build/release/cuda-sim/ptx_loader.o: /usr/include/libio.h
 ../../build/release/cuda-sim/ptx_loader.o: /usr/include/_G_config.h
@@ -450,7 +436,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/ptx_parser.o: ../tr1_hash_map.h opcodes.h
 ../../build/release/cuda-sim/ptx_parser.o: opcodes.def memory.h
 ../../build/release/cuda-sim/ptx_parser.o: /usr/include/string.h
-../../build/release/cuda-sim/ptx_parser.o: /usr/include/xlocale.h
 ../../build/release/cuda-sim/ptx_parser.o: /usr/include/stdio.h
 ../../build/release/cuda-sim/ptx_parser.o: /usr/include/libio.h
 ../../build/release/cuda-sim/ptx_parser.o: /usr/include/_G_config.h
@@ -484,7 +469,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/ptx_sim.o: /usr/include/assert.h opcodes.h
 ../../build/release/cuda-sim/ptx_sim.o: opcodes.def memory.h
 ../../build/release/cuda-sim/ptx_sim.o: /usr/include/string.h
-../../build/release/cuda-sim/ptx_sim.o: /usr/include/xlocale.h
 ../../build/release/cuda-sim/ptx_sim.o: /usr/include/stdio.h
 ../../build/release/cuda-sim/ptx_sim.o: /usr/include/libio.h
 ../../build/release/cuda-sim/ptx_sim.o: /usr/include/_G_config.h
@@ -497,10 +481,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/ptx_sim.o: ../gpgpu-sim/shader.h
 ../../build/release/cuda-sim/ptx_sim.o: /usr/include/math.h
 ../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/huge_val.h
-../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/huge_valf.h
-../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/huge_vall.h
-../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/inf.h
-../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/nan.h
 ../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/mathdef.h
 ../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/mathcalls.h
 ../../build/release/cuda-sim/ptx_sim.o: ../cuda-sim/ptx.tab.h
@@ -547,7 +527,6 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c
 ../../build/release/cuda-sim/ptx-stats.o: ../tr1_hash_map.h opcodes.h
 ../../build/release/cuda-sim/ptx-stats.o: opcodes.def memory.h
 ../../build/release/cuda-sim/ptx-stats.o: /usr/include/string.h
-../../build/release/cuda-sim/ptx-stats.o: /usr/include/xlocale.h
 ../../build/release/cuda-sim/ptx-stats.o: /usr/include/stdio.h
 ../../build/release/cuda-sim/ptx-stats.o: /usr/include/libio.h
 ../../build/release/cuda-sim/ptx-stats.o: /usr/include/_G_config.h