summaryrefslogtreecommitdiff
path: root/libcuda
diff options
context:
space:
mode:
authorTim Rogers <[email protected]>2013-04-23 20:33:07 -0800
committerAndrew Boktor <[email protected]>2014-08-14 13:50:47 -0700
commit461575e7388064dbc06eed3e17b094655f046b6c (patch)
tree58b93b9fd53143d3033f3c599b14ad821af22e19 /libcuda
parentcd7a97f045cb9bf33fcb9b8bb7b9d1e3ff5caca2 (diff)
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]
Diffstat (limited to 'libcuda')
-rw-r--r--libcuda/cuda_runtime_api.cc18
1 files changed, 9 insertions, 9 deletions
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<cuobjdumpELFSection*>(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