From 461575e7388064dbc06eed3e17b094655f046b6c Mon Sep 17 00:00:00 2001 From: Tim Rogers Date: Tue, 23 Apr 2013 20:33:07 -0800 Subject: Removing a slew of code still compiled with gcc and the need for a bunch of external C linkage [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 15912] --- libcuda/cuda_runtime_api.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libcuda/cuda_runtime_api.cc') diff --git a/libcuda/cuda_runtime_api.cc b/libcuda/cuda_runtime_api.cc index ef30748..72ade49 100644 --- a/libcuda/cuda_runtime_api.cc +++ b/libcuda/cuda_runtime_api.cc @@ -344,7 +344,7 @@ static CUctx_st* GPGPUSim_Context() return the_context; } -extern "C" void ptxinfo_addinfo() + void ptxinfo_addinfo() { if( !strcmp("__cuda_dummy_entry__",get_ptxinfo_kname()) ) { // this string produced by ptxas for empty ptx files (e.g., bandwidth test) @@ -1249,8 +1249,8 @@ void setCuobjdumpsassfilename(const char* filename){ } (dynamic_cast(cuobjdumpSectionList.front()))->setSASSfilename(filename); } -extern "C" int cuobjdump_parse(); -extern "C" FILE *cuobjdump_in; +extern int cuobjdump_parse(); +extern FILE *cuobjdump_in; //! Return the executable file of the process containing the PTX/SASS code //! @@ -2020,13 +2020,13 @@ int CUDARTAPI __cudaSynchronizeThreads(void**, void*) //////// -extern "C" int ptx_parse(); -extern "C" int ptx__scan_string(const char*); -extern "C" FILE *ptx_in; +extern int ptx_parse(); +extern int ptx__scan_string(const char*); +extern FILE *ptx_in; -extern "C" int ptxinfo_parse(); -extern "C" int ptxinfo_debug; -extern "C" FILE *ptxinfo_in; +extern int ptxinfo_parse(); +extern int ptxinfo_debug; +extern FILE *ptxinfo_in; /// static functions -- cgit v1.3