diff options
| author | Andrew M. B. Boktor <[email protected]> | 2012-08-07 22:48:59 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:48:53 -0700 |
| commit | 2c6901bdfb99d6b7e57e0365d64442c1e148d13f (patch) | |
| tree | 13907ff80ad28e79146ed0baba5ace6a3cfb102e /libcuda | |
| parent | fd71a7bde3969a2de90b036511749bb7ffda0d49 (diff) | |
Removing compiler warnings
Fixing failed compilation due to double definition of parsing functions
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13683]
Diffstat (limited to 'libcuda')
| -rw-r--r-- | libcuda/cuda_runtime_api.cc | 4 | ||||
| -rw-r--r-- | libcuda/cuobjdump.y | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libcuda/cuda_runtime_api.cc b/libcuda/cuda_runtime_api.cc index e189403..cdfd99c 100644 --- a/libcuda/cuda_runtime_api.cc +++ b/libcuda/cuda_runtime_api.cc @@ -551,9 +551,7 @@ __host__ cudaError_t CUDARTAPI cudaMemcpy2D(void *dst, size_t dpitch, const void { CUctx_st *context = GPGPUSim_Context(); gpgpu_t *gpu = context->get_device()->get_gpgpu(); - struct cudaArray *cuArray_ptr; size_t size = spitch*height; - cuArray_ptr = (cudaArray*)dst; gpgpusim_ptx_assert( (dpitch==spitch), "different src and dst pitch not supported yet" ); if( kind == cudaMemcpyHostToDevice ) gpu->memcpy_to_gpu( (size_t)dst, src, size ); @@ -1801,7 +1799,7 @@ int CUDARTAPI __cudaSynchronizeThreads(void**, void*) //////// -extern "C" int ptx_parse(); +//extern "C" int ptx_parse(); extern "C" int ptx__scan_string(const char*); extern "C" FILE *ptx_in; diff --git a/libcuda/cuobjdump.y b/libcuda/cuobjdump.y index 914a3d6..b07c754 100644 --- a/libcuda/cuobjdump.y +++ b/libcuda/cuobjdump.y @@ -103,7 +103,7 @@ ptxcode : ptxcode PTXLINE {fprintf(ptxfile, "%s", $2);} elfcode : elfcode ELFLINE {fprintf(elffile, "%s", $2);} | ; -sasscode : sasscode SASSLINE {fprintf(sassfile, "%s", $2)} +sasscode : sasscode SASSLINE {fprintf(sassfile, "%s", $2);} | ; |