From 461575e7388064dbc06eed3e17b094655f046b6c Mon Sep 17 00:00:00 2001
From: Tim Rogers <timrogers@gmail.com>
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]
---
 cuobjdump_to_ptxplus/Makefile                | 3 +--
 cuobjdump_to_ptxplus/cuobjdump_to_ptxplus.cc | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'cuobjdump_to_ptxplus')

diff --git a/cuobjdump_to_ptxplus/Makefile b/cuobjdump_to_ptxplus/Makefile
index 62ef492..14fcc68 100644
--- a/cuobjdump_to_ptxplus/Makefile
+++ b/cuobjdump_to_ptxplus/Makefile
@@ -2,7 +2,6 @@ LEX			= flex
 LEXFLAGS	= -B 
 YACC		= bison
 YFLAGS		= -t -d --report=all --verbose
-CC			= gcc
 CCFLAGS		= -ggdb -fPIC -Wall -Wno-unused-function -Wno-sign-compare 
 CXX			= g++
 CXXFLAGS	= ${CCFLAGS}
@@ -61,7 +60,7 @@ $(OUTPUT_DIR)/%.o: %.cpp %.h
 	$(CXX) ${CXXFLAGS} -c -o $@ $<
 
 $(OUTPUT_DIR)/%.o: %.c %.h
-	${CC} ${CCFLAGS} -c -o $@ $<
+	${CXX} ${CCFLAGS} -c -o $@ $<
 
 SRCS = $(shell ls *.cc)
 
diff --git a/cuobjdump_to_ptxplus/cuobjdump_to_ptxplus.cc b/cuobjdump_to_ptxplus/cuobjdump_to_ptxplus.cc
index af8babe..82dcb7c 100644
--- a/cuobjdump_to_ptxplus/cuobjdump_to_ptxplus.cc
+++ b/cuobjdump_to_ptxplus/cuobjdump_to_ptxplus.cc
@@ -38,13 +38,13 @@ cuobjdumpInstList *g_instList = new cuobjdumpInstList();
 cuobjdumpInstList *g_headerList = new cuobjdumpInstList();
 
 int sass_parse();
-extern "C" FILE *sass_in;
+extern FILE *sass_in;
 
 int ptx_parse();
-extern "C" FILE *ptx_in;
+extern FILE *ptx_in;
 
 int elf_parse();
-extern "C" FILE *elf_in;
+extern FILE *elf_in;
 
 extern int g_error_detected;
 
-- 
cgit v1.3