/hg/release/icedtea7-forest-2.3/hotspot: Remove C++ flags from C...

[andrew at icedtea.classpath.org]

changeset c93fcd47982f in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=c93fcd47982f
author: andrew
date: Wed Jul 17 17:30:04 2013 +0100

	Remove C++ flags from CC_COMPILE and fix usage in zeroshark.make.


diffstat:

 make/linux/makefiles/rules.make     |  2 +-
 make/linux/makefiles/zeroshark.make |  9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 4e032c676dc8 -r c93fcd47982f make/linux/makefiles/rules.make
--- a/make/linux/makefiles/rules.make	Wed Jul 17 13:52:07 2013 +0100
+++ b/make/linux/makefiles/rules.make	Wed Jul 17 17:30:04 2013 +0100
@@ -31,7 +31,7 @@
 DEMANGLE        = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
 
 # $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++).
-CC_COMPILE       = $(CC) $(CXXFLAGS) $(CFLAGS)
+CC_COMPILE       = $(CC) $(CXXFLAGS)
 CXX_COMPILE      = $(CXX) $(CXXFLAGS) $(CFLAGS)
 
 AS.S            = $(AS) $(ASFLAGS)
diff -r 4e032c676dc8 -r c93fcd47982f make/linux/makefiles/zeroshark.make
--- a/make/linux/makefiles/zeroshark.make	Wed Jul 17 13:52:07 2013 +0100
+++ b/make/linux/makefiles/zeroshark.make	Wed Jul 17 17:30:04 2013 +0100
@@ -41,18 +41,17 @@
 	./mkoffsets > $@
 
 bytecodes_arm.s: bytecodes_arm.def mkbc
-	@echo Generatine ARM assembler bytecode sequences
-	$(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
+	@echo Generating ARM assembler bytecode sequences
+	$(CXX_COMPILE) -E - < $< | ./mkbc - $@ $(COMPILE_DONE)
 
-# Can't use $(CC_COMPILE) as it contains C++ flags
 mkbc:	$(GAMMADIR)/tools/mkbc.c
 	@echo Compiling mkbc tool
-	$(CC) -o $@ $< $(COMPILE_DONE)
+	$(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
 
 mkoffsets:	asm_helper.cpp
 	@echo Compiling offset generator
 	$(QUIETLY) $(REMOVE_TARGET)
-	$(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
+	$(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
 
 endif