diff options
| author | Tim Rogers <[email protected]> | 2013-04-23 20:33:07 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:50:47 -0700 |
| commit | 461575e7388064dbc06eed3e17b094655f046b6c (patch) | |
| tree | 58b93b9fd53143d3033f3c599b14ad821af22e19 /src/cuda-sim/Makefile | |
| parent | cd7a97f045cb9bf33fcb9b8bb7b9d1e3ff5caca2 (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 'src/cuda-sim/Makefile')
| -rw-r--r-- | src/cuda-sim/Makefile | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/cuda-sim/Makefile b/src/cuda-sim/Makefile index 9e37fe7..8d33e19 100644 --- a/src/cuda-sim/Makefile +++ b/src/cuda-sim/Makefile @@ -33,7 +33,6 @@ DEBUG?=0 TRACE?=0 CPP = g++ $(SNOW) -CC = gcc $(SNOW) ifeq ($(INTEL),1) CPP = icpc CC = icc @@ -80,16 +79,16 @@ libgpgpu_ptx_sim.a: $(OBJS) ar rcs $(OUTPUT_DIR)/libgpgpu_ptx_sim.a $(OUTPUT_DIR)/ptx.tab.o $(OUTPUT_DIR)/lex.ptx_.o $(OUTPUT_DIR)/ptxinfo.tab.o $(OUTPUT_DIR)/lex.ptxinfo_.o $(OBJS) $(OUTPUT_DIR)/ptx.tab.o: ptx.tab.c - $(CC) -c $(OPT) -DYYDEBUG ptx.tab.c -o $(OUTPUT_DIR)/ptx.tab.o + $(CPP) -c $(OPT) -DYYDEBUG ptx.tab.c -o $(OUTPUT_DIR)/ptx.tab.o $(OUTPUT_DIR)/lex.ptx_.o: lex.ptx_.c - $(CC) -c $(OPT) lex.ptx_.c -o $(OUTPUT_DIR)/lex.ptx_.o + $(CPP) -c $(OPT) lex.ptx_.c -o $(OUTPUT_DIR)/lex.ptx_.o $(OUTPUT_DIR)/ptxinfo.tab.o: ptxinfo.tab.c - $(CC) -c $(OPT) -DYYDEBUG ptxinfo.tab.c -o $(OUTPUT_DIR)/ptxinfo.tab.o + $(CPP) -c $(OPT) -DYYDEBUG ptxinfo.tab.c -o $(OUTPUT_DIR)/ptxinfo.tab.o $(OUTPUT_DIR)/lex.ptxinfo_.o: lex.ptxinfo_.c - $(CC) -c $(OPT) lex.ptxinfo_.c -o $(OUTPUT_DIR)/lex.ptxinfo_.o + $(CPP) -c $(OPT) lex.ptxinfo_.c -o $(OUTPUT_DIR)/lex.ptxinfo_.o ptx.tab.c: ptx.y bison --name-prefix=ptx_ -v -d ptx.y @@ -112,7 +111,7 @@ clean: rm -f Makefile.makedepend Makefile.makedepend.bak $(OUTPUT_DIR)/%.o: %.c - $(CC) -c $(OPT) $< -o $(OUTPUT_DIR)/$*.o + $(CPP) -c $(OPT) $< -o $(OUTPUT_DIR)/$*.o $(OUTPUT_DIR)/%.o: %.cc $(CPP) -c $(CXX_OPT) $< -o $(OUTPUT_DIR)/$*.o @@ -123,13 +122,7 @@ instructions.h: instructions.cc @echo "#include \"ptx_ir.h\"" >> $*.h @echo "#ifndef instructions_h_included" >> $*.h @echo "#define instructions_h_included" >> $*.h - @echo "#ifdef __cplusplus" >> $*.h - @echo "extern \"C\" {" >> $*.h - @echo "#endif" >> $*.h @cat $< | grep "_impl(" | sed 's/{.*//' | sed 's/$$/;/' >> $*.h - @echo "#ifdef __cplusplus" >> $*.h - @echo "}" >> $*.h - @echo "#endif" >> $*.h @echo "#endif" >> $*.h @chmod -w $*.h @echo "created instructions.h" |