Index: openjdk/hotspot/build/linux/makefiles/rules.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/rules.make +++ openjdk/hotspot/build/linux/makefiles/rules.make @@ -38,7 +38,7 @@ DEMANGLE = $(DEMANGLER) < $@ > .$ # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++). C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) +CC_COMPILE = $(CCC) $(CPPFLAGS) $(CXXFLAGS) AS.S = $(AS) $(ASFLAGS) Index: openjdk/hotspot/build/linux/makefiles/adlc.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/adlc.make +++ openjdk/hotspot/build/linux/makefiles/adlc.make @@ -56,12 +56,13 @@ INCLUDES += $(Src_Dirs_I:%=-I%) # Force assertions on. SYSDEFS += -DASSERT -CPPFLAGS = $(SYSDEFS) $(INCLUDES) +CPPFLAGS += $(SYSDEFS) $(INCLUDES) # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Suppress warnings (for now) CFLAGS_WARN = -w CFLAGS += $(CFLAGS_WARN) +CXXFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ adlparse.o \ Index: openjdk/hotspot/build/linux/makefiles/amd64.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/amd64.make +++ openjdk/hotspot/build/linux/makefiles/amd64.make @@ -30,11 +30,12 @@ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_C # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) # Must also specify if CPU is little endian -CFLAGS += -DVM_LITTLE_ENDIAN +CPPFLAGS += -DVM_LITTLE_ENDIAN -CFLAGS += -D_LP64=1 +CPPFLAGS += -D_LP64=1 # The serviceability agent relies on frame pointer (%rbp) to walk thread stack CFLAGS += -fno-omit-frame-pointer +CXXFLAGS += -fno-omit-frame-pointer OPT_CFLAGS/compactingPermGenGen.o = -O1 Index: openjdk/hotspot/build/linux/makefiles/compiler1.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/compiler1.make +++ openjdk/hotspot/build/linux/makefiles/compiler1.make @@ -28,4 +28,4 @@ TYPE=COMPILER1 VM_SUBDIR = client -CFLAGS += -DCOMPILER1 +CPPFLAGS += -DCOMPILER1 Index: openjdk/hotspot/build/linux/makefiles/compiler2.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/compiler2.make +++ openjdk/hotspot/build/linux/makefiles/compiler2.make @@ -28,4 +28,4 @@ TYPE=COMPILER2 VM_SUBDIR = server -CFLAGS += -DCOMPILER2 +CPPFLAGS += -DCOMPILER2 Index: openjdk/hotspot/build/linux/makefiles/gcc.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/gcc.make +++ openjdk/hotspot/build/linux/makefiles/gcc.make @@ -60,10 +60,11 @@ JVM_BASE_ADDR = 0x06000000 endif CFLAGS += $(VM_PICFLAG) -CFLAGS += -fno-rtti -CFLAGS += -fno-exceptions -CFLAGS += -D_REENTRANT -CFLAGS += -fcheck-new +CXXFLAGS += $(VM_PICFLAG) +CXXFLAGS += -fno-rtti +CXXFLAGS += -fno-exceptions +CPPFLAGS += -D_REENTRANT +CXXFLAGS += -fcheck-new ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) ARCHFLAG/i486 = -m32 -march=i586 @@ -73,20 +74,23 @@ ARCHFLAG/sparc = -m32 -mcpu=v9 ARCHFLAG/sparcv9 = -m64 -mcpu=v9 CFLAGS += $(ARCHFLAG) +CXXFLAGS += $(ARCHFLAG) AOUT_FLAGS += $(ARCHFLAG) LFLAGS += $(ARCHFLAG) ASFLAGS += $(ARCHFLAG) # Use C++ Interpreter ifdef CC_INTERP - CFLAGS += -DCC_INTERP + CPPFLAGS += -DCC_INTERP endif # Keep temporary files (.ii, .s) ifdef NEED_ASM CFLAGS += -save-temps + CXXFLAGS += -save-temps else CFLAGS += -pipe + CXXFLAGS += -pipe endif # Compiler warnings are treated as errors Index: openjdk/hotspot/build/linux/makefiles/hp1.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/hp1.make +++ openjdk/hotspot/build/linux/makefiles/hp1.make @@ -26,4 +26,4 @@ TYPE=HP1 -CFLAGS += -DCOMPILER1 +CPPFLAGS += -DCOMPILER1 Index: openjdk/hotspot/build/linux/makefiles/hp.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/hp.make +++ openjdk/hotspot/build/linux/makefiles/hp.make @@ -26,4 +26,4 @@ TYPE=HP -CFLAGS += -DCOMPILER2 +CPPFLAGS += -DCOMPILER2 Index: openjdk/hotspot/build/linux/makefiles/i486.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/i486.make +++ openjdk/hotspot/build/linux/makefiles/i486.make @@ -31,6 +31,6 @@ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_C # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) # Must also specify if CPU is little endian -CFLAGS += -DVM_LITTLE_ENDIAN +CPPFLAGS += -DVM_LITTLE_ENDIAN OPT_CFLAGS/compactingPermGenGen.o = -O1 Index: openjdk/hotspot/build/linux/makefiles/profiled.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/profiled.make +++ openjdk/hotspot/build/linux/makefiles/profiled.make @@ -26,5 +26,6 @@ # (It is also optimized.) CFLAGS += -pg +CXXFLAGS += -pg AOUT_FLAGS += -pg LDNOMAP = true Index: openjdk/hotspot/build/linux/makefiles/tiered.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/tiered.make +++ openjdk/hotspot/build/linux/makefiles/tiered.make @@ -28,4 +28,4 @@ TYPE=TIERED VM_SUBDIR = server -CFLAGS += -DCOMPILER2 -DCOMPILER1 +CPPFLAGS += -DCOMPILER2 -DCOMPILER1 Index: openjdk/hotspot/build/linux/makefiles/vm.make =================================================================== --- openjdk.orig/hotspot/build/linux/makefiles/vm.make +++ openjdk/hotspot/build/linux/makefiles/vm.make @@ -91,7 +91,7 @@ else endif endif -CPPFLAGS = \ +CPPFLAGS += \ ${SYSDEFS} \ ${INCLUDES} \ ${BUILD_VERSION} \ @@ -102,12 +102,14 @@ CPPFLAGS = \ # CFLAGS_WARN holds compiler options to suppress/enable warnings. CFLAGS += $(CFLAGS_WARN/BYFILE) +CXXFLAGS += $(CFLAGS_WARN/BYFILE) # Do not use C++ exception handling -CFLAGS += $(CFLAGS/NOEX) +CXXFLAGS += $(CFLAGS/NOEX) # Extra flags from gnumake's invocation or environment CFLAGS += $(EXTRA_CFLAGS) +CXXFLAGS += $(EXTRA_CXXFLAGS) LIBS += -lm -ldl -lpthread