diff options
| author | Inderpreet Singh <[email protected]> | 2011-10-02 20:12:55 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:18:23 -0700 |
| commit | 39fde1bdd52080391a7083536b22a3ea9a686dcf (patch) | |
| tree | 5a38fc6f1539b5bc81962676e37b3e482397976c | |
| parent | faec221021266754fbeb9bc471f25cbad41dde3f (diff) | |
Integrated in 10477 - Fixes for compiling with gcc v4.5.1
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 10478]
| -rw-r--r-- | decuda_to_ptxplus/decudaInst.cc | 1 | ||||
| -rw-r--r-- | libopencl/Makefile | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/decuda_to_ptxplus/decudaInst.cc b/decuda_to_ptxplus/decudaInst.cc index c387d15..093bf8e 100644 --- a/decuda_to_ptxplus/decudaInst.cc +++ b/decuda_to_ptxplus/decudaInst.cc @@ -3,6 +3,7 @@ #include <string> #include <cstring> #include <stdlib.h> +#include <stdio.h> extern void output(const char * text); diff --git a/libopencl/Makefile b/libopencl/Makefile index c1c3557..0247048 100644 --- a/libopencl/Makefile +++ b/libopencl/Makefile @@ -103,7 +103,7 @@ depend: nvopencl_wrapper: nvopencl_wrapper.cc if [ ! -d bin ]; then mkdir bin; fi - g++ $(CCFLAGS) nvopencl_wrapper.cc -I./ -L $(NVOPENCL_LIBDIR) -lOpenCL -o bin/nvopencl_wrapper + g++ $(CCFLAGS) nvopencl_wrapper.cc -I./ -I$(NVIDIA_CUDA_SDK_LOCATION)/OpenCL/common/inc -L $(NVOPENCL_LIBDIR) -lOpenCL -o bin/nvopencl_wrapper OUTPUT_DIR=../$(SIM_OBJ_FILES_DIR)/libopencl @@ -144,6 +144,7 @@ clean: ../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/stdio_lim.h ../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/sys_errlist.h ../build/release/libopencl/opencl_runtime_api.o: /usr/include/string.h +../build/release/libopencl/opencl_runtime_api.o: /usr/include/xlocale.h ../build/release/libopencl/opencl_runtime_api.o: /usr/include/assert.h ../build/release/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h ../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/cuda-sim.h @@ -164,6 +165,10 @@ clean: ../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h ../build/release/libopencl/opencl_runtime_api.o: /usr/include/math.h ../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_val.h +../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_valf.h +../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_vall.h +../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/inf.h +../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/nan.h ../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/mathdef.h ../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/mathcalls.h ../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx.tab.h @@ -183,7 +188,3 @@ clean: ../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/stats.h ../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-cache.h ../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/CL/cl.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/CL/cl_platform.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/stdint.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/wchar.h |