Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
Merge
Thu, 09 Feb 2012 18:01:20 -0800
- author
- jrose
- date
- Thu, 09 Feb 2012 18:01:20 -0800
- changeset 3523
- 2f985b6ce7ff
- parent 3522
- c742b0b47fe5
- parent 3519
- ea677dbdd883
- child 3529
- f174909614bd
- child 3564
- 73df3733f2eb
Merge
1.1 --- a/make/bsd/makefiles/adlc.make Wed Feb 08 09:52:24 2012 +0100 1.2 +++ b/make/bsd/makefiles/adlc.make Thu Feb 09 18:01:20 2012 -0800 1.3 @@ -61,10 +61,10 @@ 1.4 INCLUDES += $(Src_Dirs_I:%=-I%) 1.5 1.6 # set flags for adlc compilation 1.7 -CPPFLAGS = $(SYSDEFS) $(INCLUDES) 1.8 +CXXFLAGS = $(SYSDEFS) $(INCLUDES) 1.9 1.10 # Force assertions on. 1.11 -CPPFLAGS += -DASSERT 1.12 +CXXFLAGS += -DASSERT 1.13 1.14 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 1.15 # Compiler warnings are treated as errors 1.16 @@ -111,7 +111,7 @@ 1.17 1.18 $(EXEC) : $(OBJECTS) 1.19 @echo Making adlc 1.20 - $(QUIETLY) $(HOST.LINK_NOPROF.CC) -o $(EXEC) $(OBJECTS) 1.21 + $(QUIETLY) $(HOST.LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS) 1.22 1.23 # Random dependencies: 1.24 $(OBJECTS): opcodes.hpp classes.hpp adlc.hpp adlcVMDeps.hpp adlparse.hpp archDesc.hpp arena.hpp dict2.hpp filebuff.hpp forms.hpp formsopt.hpp formssel.hpp 1.25 @@ -213,14 +213,14 @@ 1.26 $(OUTDIR)/%.o: %.cpp 1.27 @echo Compiling $< 1.28 $(QUIETLY) $(REMOVE_TARGET) 1.29 - $(QUIETLY) $(HOST.COMPILE.CC) -o $@ $< $(COMPILE_DONE) 1.30 + $(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE) 1.31 1.32 # Some object files are given a prefix, to disambiguate 1.33 # them from objects of the same name built for the VM. 1.34 $(OUTDIR)/adlc-%.o: %.cpp 1.35 @echo Compiling $< 1.36 $(QUIETLY) $(REMOVE_TARGET) 1.37 - $(QUIETLY) $(HOST.COMPILE.CC) -o $@ $< $(COMPILE_DONE) 1.38 + $(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE) 1.39 1.40 # ######################################################################### 1.41
2.1 --- a/make/bsd/makefiles/dtrace.make Wed Feb 08 09:52:24 2012 +0100 2.2 +++ b/make/bsd/makefiles/dtrace.make Thu Feb 09 18:01:20 2012 -0800 2.3 @@ -105,11 +105,11 @@ 2.4 2.5 lib$(GENOFFS).dylib: $(DTRACE_SRCDIR)/$(GENOFFS).cpp $(DTRACE_SRCDIR)/$(GENOFFS).h \ 2.6 $(LIBJVM.o) 2.7 - $(QUIETLY) $(CCC) $(CPPFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \ 2.8 + $(QUIETLY) $(CXX) $(CXXFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \ 2.9 $(LFLAGS_GENOFFS) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS).cpp -ljvm 2.10 2.11 $(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).dylib 2.12 - $(QUIETLY) $(LINK.CC) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \ 2.13 + $(QUIETLY) $(LINK.CXX) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \ 2.14 ./lib$(GENOFFS).dylib 2.15 2.16 # $@.tmp is created first to avoid an empty $(JVMOFFS).h if an error occurs. 2.17 @@ -135,7 +135,7 @@ 2.18 fi 2.19 2.20 $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp 2.21 - $(QUIETLY) $(CCC) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp 2.22 + $(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp 2.23 2.24 $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE) 2.25 @echo Making $@
3.1 --- a/make/bsd/makefiles/gcc.make Wed Feb 08 09:52:24 2012 +0100 3.2 +++ b/make/bsd/makefiles/gcc.make Thu Feb 09 18:01:20 2012 -0800 3.3 @@ -25,20 +25,19 @@ 3.4 OS_VENDOR = $(shell uname -s) 3.5 3.6 #------------------------------------------------------------------------ 3.7 -# CC, CPP & AS 3.8 +# CC, CXX & AS 3.9 3.10 # When cross-compiling the ALT_COMPILER_PATH points 3.11 # to the cross-compilation toolset 3.12 ifdef CROSS_COMPILE_ARCH 3.13 - CPP = $(ALT_COMPILER_PATH)/g++ 3.14 + CXX = $(ALT_COMPILER_PATH)/g++ 3.15 CC = $(ALT_COMPILER_PATH)/gcc 3.16 - HOSTCPP = g++ 3.17 + HOSTCXX = g++ 3.18 HOSTCC = gcc 3.19 else ifneq ($(OS_VENDOR), Darwin) 3.20 CXX = g++ 3.21 - CPP = $(CXX) 3.22 CC = gcc 3.23 - HOSTCPP = $(CPP) 3.24 + HOSTCXX = $(CXX) 3.25 HOSTCC = $(CC) 3.26 endif 3.27 3.28 @@ -53,7 +52,6 @@ 3.29 ifeq ($(origin CC), default) 3.30 CC = llvm-gcc 3.31 endif 3.32 - CPP = $(CXX) 3.33 3.34 ifeq ($(ARCH), i486) 3.35 LLVM_SUPPORTS_STACKREALIGN := $(shell \ 3.36 @@ -67,11 +65,11 @@ 3.37 CXX32 ?= g++-4.0 3.38 CC32 ?= gcc-4.0 3.39 endif 3.40 - CPP = $(CXX32) 3.41 + CXX = $(CXX32) 3.42 CC = $(CC32) 3.43 endif 3.44 3.45 - HOSTCPP = $(CPP) 3.46 + HOSTCXX = $(CXX) 3.47 HOSTCC = $(CC) 3.48 endif 3.49
4.1 --- a/make/bsd/makefiles/launcher.make Wed Feb 08 09:52:24 2012 +0100 4.2 +++ b/make/bsd/makefiles/launcher.make Thu Feb 09 18:01:20 2012 -0800 4.3 @@ -71,10 +71,10 @@ 4.4 LIBS_LAUNCHER += -l$(JVM) $(LIBS) 4.5 endif 4.6 4.7 -LINK_LAUNCHER = $(LINK.c) 4.8 +LINK_LAUNCHER = $(LINK.CC) 4.9 4.10 -LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK) 4.11 -LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK) 4.12 +LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CXX/PRE_HOOK) 4.13 +LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CXX/POST_HOOK) 4.14 4.15 LAUNCHER_OUT = launcher 4.16 4.17 @@ -90,11 +90,11 @@ 4.18 4.19 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c 4.20 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 4.21 - $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 4.22 + $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS) 4.23 4.24 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c 4.25 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 4.26 - $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 4.27 + $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS) 4.28 4.29 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) 4.30 $(QUIETLY) echo Linking launcher...
5.1 --- a/make/bsd/makefiles/product.make Wed Feb 08 09:52:24 2012 +0100 5.2 +++ b/make/bsd/makefiles/product.make Thu Feb 09 18:01:20 2012 -0800 5.3 @@ -55,4 +55,4 @@ 5.4 STRIP_AOUT = $(STRIP) -x $@ || exit 1; 5.5 5.6 # Don't strip in VM build; JDK build will strip libraries later 5.7 -# LINK_LIB.CC/POST_HOOK += $(STRIP_$(LINK_INTO)) 5.8 +# LINK_LIB.CXX/POST_HOOK += $(STRIP_$(LINK_INTO))
6.1 --- a/make/bsd/makefiles/rules.make Wed Feb 08 09:52:24 2012 +0100 6.2 +++ b/make/bsd/makefiles/rules.make Thu Feb 09 18:01:20 2012 -0800 6.3 @@ -27,52 +27,39 @@ 6.4 # Tell make that .cpp is important 6.5 .SUFFIXES: .cpp $(SUFFIXES) 6.6 6.7 -# For now. Other makefiles use CPP as the c++ compiler, but that should really 6.8 -# name the preprocessor. 6.9 -ifeq ($(CCC),) 6.10 -CCC = $(CPP) 6.11 -endif 6.12 - 6.13 DEMANGLER = c++filt 6.14 DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@ 6.15 6.16 -# $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++). 6.17 -C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) 6.18 -CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) 6.19 +# $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++). 6.20 +CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) 6.21 +CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) 6.22 6.23 AS.S = $(AS) $(ASFLAGS) 6.24 6.25 -COMPILE.c = $(C_COMPILE) -c 6.26 -GENASM.c = $(C_COMPILE) -S 6.27 -LINK.c = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 6.28 -LINK_LIB.c = $(CC) $(LFLAGS) $(SHARED_FLAG) 6.29 -PREPROCESS.c = $(C_COMPILE) -E 6.30 +COMPILE.CC = $(CC_COMPILE) -c 6.31 +GENASM.CC = $(CC_COMPILE) -S 6.32 +LINK.CC = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 6.33 +LINK_LIB.CC = $(CC) $(LFLAGS) $(SHARED_FLAG) 6.34 +PREPROCESS.CC = $(CC_COMPILE) -E 6.35 6.36 -COMPILE.CC = $(CC_COMPILE) -c 6.37 -GENASM.CC = $(CC_COMPILE) -S 6.38 -LINK.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 6.39 -LINK_NOPROF.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) 6.40 -LINK_LIB.CC = $(CCC) $(LFLAGS) $(SHARED_FLAG) 6.41 -PREPROCESS.CC = $(CC_COMPILE) -E 6.42 +COMPILE.CXX = $(CXX_COMPILE) -c 6.43 +GENASM.CXX = $(CXX_COMPILE) -S 6.44 +LINK.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 6.45 +LINK_NOPROF.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS) 6.46 +LINK_LIB.CXX = $(CXX) $(LFLAGS) $(SHARED_FLAG) 6.47 +PREPROCESS.CXX = $(CXX_COMPILE) -E 6.48 6.49 # cross compiling the jvm with c2 requires host compilers to build 6.50 # adlc tool 6.51 6.52 -HOST.CC_COMPILE = $(HOSTCPP) $(CPPFLAGS) $(CFLAGS) 6.53 -HOST.COMPILE.CC = $(HOST.CC_COMPILE) -c 6.54 -HOST.LINK_NOPROF.CC = $(HOSTCPP) $(LFLAGS) $(AOUT_FLAGS) 6.55 +HOST.CXX_COMPILE = $(HOSTCXX) $(CXXFLAGS) $(CFLAGS) 6.56 +HOST.COMPILE.CXX = $(HOST.CXX_COMPILE) -c 6.57 +HOST.LINK_NOPROF.CXX = $(HOSTCXX) $(LFLAGS) $(AOUT_FLAGS) 6.58 6.59 6.60 # Effect of REMOVE_TARGET is to delete out-of-date files during "gnumake -k". 6.61 REMOVE_TARGET = rm -f $@ 6.62 6.63 -# Synonyms. 6.64 -COMPILE.cpp = $(COMPILE.CC) 6.65 -GENASM.cpp = $(GENASM.CC) 6.66 -LINK.cpp = $(LINK.CC) 6.67 -LINK_LIB.cpp = $(LINK_LIB.CC) 6.68 -PREPROCESS.cpp = $(PREPROCESS.CC) 6.69 - 6.70 # Note use of ALT_BOOTDIR to explicitly specify location of java and 6.71 # javac; this is the same environment variable used in the J2SE build 6.72 # process for overriding the default spec, which is BOOTDIR. 6.73 @@ -161,14 +148,14 @@ 6.74 %.o: %.cpp 6.75 @echo Compiling $< 6.76 $(QUIETLY) $(REMOVE_TARGET) 6.77 - $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) 6.78 + $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) 6.79 else 6.80 %.o: %.cpp 6.81 @echo Compiling $< 6.82 $(QUIETLY) $(REMOVE_TARGET) 6.83 $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ 6.84 - $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ 6.85 - $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) 6.86 + $(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ 6.87 + $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) 6.88 endif 6.89 6.90 %.o: %.s 6.91 @@ -178,13 +165,13 @@ 6.92 6.93 %.s: %.cpp 6.94 @echo Generating assembly for $< 6.95 - $(QUIETLY) $(GENASM.CC) -o $@ $< 6.96 + $(QUIETLY) $(GENASM.CXX) -o $@ $< 6.97 $(QUIETLY) $(DEMANGLE) $(COMPILE_DONE) 6.98 6.99 # Intermediate files (for debugging macros) 6.100 %.i: %.cpp 6.101 @echo Preprocessing $< to $@ 6.102 - $(QUIETLY) $(PREPROCESS.CC) $< > $@ $(COMPILE_DONE) 6.103 + $(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE) 6.104 6.105 # Override gnumake built-in rules which do sccs get operations badly. 6.106 # (They put the checked out code in the current directory, not in the
7.1 --- a/make/bsd/makefiles/sparcWorks.make Wed Feb 08 09:52:24 2012 +0100 7.2 +++ b/make/bsd/makefiles/sparcWorks.make Thu Feb 09 18:01:20 2012 -0800 7.3 @@ -23,13 +23,13 @@ 7.4 # 7.5 7.6 #------------------------------------------------------------------------ 7.7 -# CC, CPP & AS 7.8 +# CC, CXX & AS 7.9 7.10 -CPP = CC 7.11 +CXX = CC 7.12 CC = cc 7.13 AS = $(CC) -c 7.14 7.15 -HOSTCPP = $(CPP) 7.16 +HOSTCXX = $(CXX) 7.17 HOSTCC = $(CC) 7.18 7.19 ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
8.1 --- a/make/bsd/makefiles/vm.make Wed Feb 08 09:52:24 2012 +0100 8.2 +++ b/make/bsd/makefiles/vm.make Thu Feb 09 18:01:20 2012 -0800 8.3 @@ -82,18 +82,22 @@ 8.4 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" 8.5 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" 8.6 8.7 -CPPFLAGS = \ 8.8 +CXXFLAGS = \ 8.9 ${SYSDEFS} \ 8.10 ${INCLUDES} \ 8.11 ${BUILD_VERSION} \ 8.12 ${BUILD_TARGET} \ 8.13 ${BUILD_USER} \ 8.14 ${HS_LIB_ARCH} \ 8.15 - ${JRE_VERSION} \ 8.16 ${VM_DISTRO} 8.17 8.18 +# This is VERY important! The version define must only be supplied to vm_version.o 8.19 +# If not, ccache will not re-use the cache at all, since the version string might contain 8.20 +# a time and date. 8.21 +vm_version.o: CXXFLAGS += ${JRE_VERSION} 8.22 + 8.23 ifdef DEFAULT_LIBPATH 8.24 -CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" 8.25 +CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" 8.26 endif 8.27 8.28 ifndef JAVASE_EMBEDDED 8.29 @@ -260,9 +264,9 @@ 8.30 ifeq ($(STATIC_CXX), true) 8.31 LFLAGS_VM += $(STATIC_LIBGCC) 8.32 LIBS_VM += $(STATIC_STDCXX) 8.33 - LINK_VM = $(LINK_LIB.c) 8.34 + LINK_VM = $(LINK_LIB.CC) 8.35 else 8.36 - LINK_VM = $(LINK_LIB.CC) 8.37 + LINK_VM = $(LINK_LIB.CXX) 8.38 endif 8.39 8.40 LIBS_VM += $(LIBS) 8.41 @@ -280,7 +284,7 @@ 8.42 $(PRECOMPILED_HEADER): 8.43 $(QUIETLY) echo Generating precompiled header $@ 8.44 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR) 8.45 - $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE) 8.46 + $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE) 8.47 8.48 # making the library: 8.49 8.50 @@ -305,10 +309,10 @@ 8.51 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) 8.52 $(QUIETLY) { \ 8.53 echo Linking vm...; \ 8.54 - $(LINK_LIB.CC/PRE_HOOK) \ 8.55 + $(LINK_LIB.CXX/PRE_HOOK) \ 8.56 $(LINK_VM) $(LD_SCRIPT_FLAG) \ 8.57 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ 8.58 - $(LINK_LIB.CC/POST_HOOK) \ 8.59 + $(LINK_LIB.CXX/POST_HOOK) \ 8.60 rm -f $@.1; ln -s $@ $@.1; \ 8.61 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ 8.62 }
9.1 --- a/make/linux/makefiles/adlc.make Wed Feb 08 09:52:24 2012 +0100 9.2 +++ b/make/linux/makefiles/adlc.make Thu Feb 09 18:01:20 2012 -0800 9.3 @@ -61,10 +61,10 @@ 9.4 INCLUDES += $(Src_Dirs_I:%=-I%) 9.5 9.6 # set flags for adlc compilation 9.7 -CPPFLAGS = $(SYSDEFS) $(INCLUDES) 9.8 +CXXFLAGS = $(SYSDEFS) $(INCLUDES) 9.9 9.10 # Force assertions on. 9.11 -CPPFLAGS += -DASSERT 9.12 +CXXFLAGS += -DASSERT 9.13 9.14 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 9.15 # Compiler warnings are treated as errors 9.16 @@ -109,7 +109,7 @@ 9.17 9.18 $(EXEC) : $(OBJECTS) 9.19 @echo Making adlc 9.20 - $(QUIETLY) $(HOST.LINK_NOPROF.CC) -o $(EXEC) $(OBJECTS) 9.21 + $(QUIETLY) $(HOST.LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS) 9.22 9.23 # Random dependencies: 9.24 $(OBJECTS): opcodes.hpp classes.hpp adlc.hpp adlcVMDeps.hpp adlparse.hpp archDesc.hpp arena.hpp dict2.hpp filebuff.hpp forms.hpp formsopt.hpp formssel.hpp 9.25 @@ -211,14 +211,14 @@ 9.26 $(OUTDIR)/%.o: %.cpp 9.27 @echo Compiling $< 9.28 $(QUIETLY) $(REMOVE_TARGET) 9.29 - $(QUIETLY) $(HOST.COMPILE.CC) -o $@ $< $(COMPILE_DONE) 9.30 + $(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE) 9.31 9.32 # Some object files are given a prefix, to disambiguate 9.33 # them from objects of the same name built for the VM. 9.34 $(OUTDIR)/adlc-%.o: %.cpp 9.35 @echo Compiling $< 9.36 $(QUIETLY) $(REMOVE_TARGET) 9.37 - $(QUIETLY) $(HOST.COMPILE.CC) -o $@ $< $(COMPILE_DONE) 9.38 + $(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE) 9.39 9.40 # ######################################################################### 9.41
10.1 --- a/make/linux/makefiles/gcc.make Wed Feb 08 09:52:24 2012 +0100 10.2 +++ b/make/linux/makefiles/gcc.make Thu Feb 09 18:01:20 2012 -0800 10.3 @@ -23,19 +23,19 @@ 10.4 # 10.5 10.6 #------------------------------------------------------------------------ 10.7 -# CC, CPP & AS 10.8 +# CC, CXX & AS 10.9 10.10 # When cross-compiling the ALT_COMPILER_PATH points 10.11 # to the cross-compilation toolset 10.12 ifdef CROSS_COMPILE_ARCH 10.13 -CPP = $(ALT_COMPILER_PATH)/g++ 10.14 +CXX = $(ALT_COMPILER_PATH)/g++ 10.15 CC = $(ALT_COMPILER_PATH)/gcc 10.16 -HOSTCPP = g++ 10.17 +HOSTCXX = g++ 10.18 HOSTCC = gcc 10.19 else 10.20 -CPP = g++ 10.21 +CXX = g++ 10.22 CC = gcc 10.23 -HOSTCPP = $(CPP) 10.24 +HOSTCXX = $(CXX) 10.25 HOSTCC = $(CC) 10.26 endif 10.27
11.1 --- a/make/linux/makefiles/launcher.make Wed Feb 08 09:52:24 2012 +0100 11.2 +++ b/make/linux/makefiles/launcher.make Thu Feb 09 18:01:20 2012 -0800 11.3 @@ -54,10 +54,10 @@ 11.4 LIBS_LAUNCHER += -l$(JVM) $(LIBS) 11.5 endif 11.6 11.7 -LINK_LAUNCHER = $(LINK.c) 11.8 +LINK_LAUNCHER = $(LINK.CC) 11.9 11.10 -LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK) 11.11 -LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK) 11.12 +LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CXX/PRE_HOOK) 11.13 +LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CXX/POST_HOOK) 11.14 11.15 LAUNCHER_OUT = launcher 11.16 11.17 @@ -73,11 +73,11 @@ 11.18 11.19 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c 11.20 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 11.21 - $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 11.22 + $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS) 11.23 11.24 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c 11.25 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 11.26 - $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 11.27 + $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS) 11.28 11.29 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) 11.30 $(QUIETLY) echo Linking launcher...
12.1 --- a/make/linux/makefiles/product.make Wed Feb 08 09:52:24 2012 +0100 12.2 +++ b/make/linux/makefiles/product.make Thu Feb 09 18:01:20 2012 -0800 12.3 @@ -52,4 +52,4 @@ 12.4 12.5 # If we can create .debuginfo files, then the VM is stripped in vm.make 12.6 # and this macro is not used. 12.7 -# LINK_LIB.CC/POST_HOOK += $(STRIP_$(LINK_INTO)) 12.8 +# LINK_LIB.CXX/POST_HOOK += $(STRIP_$(LINK_INTO))
13.1 --- a/make/linux/makefiles/rules.make Wed Feb 08 09:52:24 2012 +0100 13.2 +++ b/make/linux/makefiles/rules.make Thu Feb 09 18:01:20 2012 -0800 13.3 @@ -27,52 +27,39 @@ 13.4 # Tell make that .cpp is important 13.5 .SUFFIXES: .cpp $(SUFFIXES) 13.6 13.7 -# For now. Other makefiles use CPP as the c++ compiler, but that should really 13.8 -# name the preprocessor. 13.9 -ifeq ($(CCC),) 13.10 -CCC = $(CPP) 13.11 -endif 13.12 - 13.13 DEMANGLER = c++filt 13.14 DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@ 13.15 13.16 -# $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++). 13.17 -C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) 13.18 -CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) 13.19 +# $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++). 13.20 +CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) 13.21 +CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) 13.22 13.23 AS.S = $(AS) $(ASFLAGS) 13.24 13.25 -COMPILE.c = $(C_COMPILE) -c 13.26 -GENASM.c = $(C_COMPILE) -S 13.27 -LINK.c = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 13.28 -LINK_LIB.c = $(CC) $(LFLAGS) $(SHARED_FLAG) 13.29 -PREPROCESS.c = $(C_COMPILE) -E 13.30 +COMPILE.CC = $(CC_COMPILE) -c 13.31 +GENASM.CC = $(CC_COMPILE) -S 13.32 +LINK.CC = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 13.33 +LINK_LIB.CC = $(CC) $(LFLAGS) $(SHARED_FLAG) 13.34 +PREPROCESS.CC = $(CC_COMPILE) -E 13.35 13.36 -COMPILE.CC = $(CC_COMPILE) -c 13.37 -GENASM.CC = $(CC_COMPILE) -S 13.38 -LINK.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 13.39 -LINK_NOPROF.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) 13.40 -LINK_LIB.CC = $(CCC) $(LFLAGS) $(SHARED_FLAG) 13.41 -PREPROCESS.CC = $(CC_COMPILE) -E 13.42 +COMPILE.CXX = $(CXX_COMPILE) -c 13.43 +GENASM.CXX = $(CXX_COMPILE) -S 13.44 +LINK.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 13.45 +LINK_NOPROF.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS) 13.46 +LINK_LIB.CXX = $(CXX) $(LFLAGS) $(SHARED_FLAG) 13.47 +PREPROCESS.CXX = $(CXX_COMPILE) -E 13.48 13.49 # cross compiling the jvm with c2 requires host compilers to build 13.50 # adlc tool 13.51 13.52 -HOST.CC_COMPILE = $(HOSTCPP) $(CPPFLAGS) $(CFLAGS) 13.53 -HOST.COMPILE.CC = $(HOST.CC_COMPILE) -c 13.54 -HOST.LINK_NOPROF.CC = $(HOSTCPP) $(LFLAGS) $(AOUT_FLAGS) 13.55 +HOST.CXX_COMPILE = $(HOSTCXX) $(CXXFLAGS) $(CFLAGS) 13.56 +HOST.COMPILE.CXX = $(HOST.CXX_COMPILE) -c 13.57 +HOST.LINK_NOPROF.CXX = $(HOSTCXX) $(LFLAGS) $(AOUT_FLAGS) 13.58 13.59 13.60 # Effect of REMOVE_TARGET is to delete out-of-date files during "gnumake -k". 13.61 REMOVE_TARGET = rm -f $@ 13.62 13.63 -# Synonyms. 13.64 -COMPILE.cpp = $(COMPILE.CC) 13.65 -GENASM.cpp = $(GENASM.CC) 13.66 -LINK.cpp = $(LINK.CC) 13.67 -LINK_LIB.cpp = $(LINK_LIB.CC) 13.68 -PREPROCESS.cpp = $(PREPROCESS.CC) 13.69 - 13.70 # Note use of ALT_BOOTDIR to explicitly specify location of java and 13.71 # javac; this is the same environment variable used in the J2SE build 13.72 # process for overriding the default spec, which is BOOTDIR. 13.73 @@ -161,14 +148,14 @@ 13.74 %.o: %.cpp 13.75 @echo Compiling $< 13.76 $(QUIETLY) $(REMOVE_TARGET) 13.77 - $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) 13.78 + $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) 13.79 else 13.80 %.o: %.cpp 13.81 @echo Compiling $< 13.82 $(QUIETLY) $(REMOVE_TARGET) 13.83 $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ 13.84 - $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ 13.85 - $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) 13.86 + $(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ 13.87 + $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) 13.88 endif 13.89 13.90 %.o: %.s 13.91 @@ -178,13 +165,13 @@ 13.92 13.93 %.s: %.cpp 13.94 @echo Generating assembly for $< 13.95 - $(QUIETLY) $(GENASM.CC) -o $@ $< 13.96 + $(QUIETLY) $(GENASM.CXX) -o $@ $< 13.97 $(QUIETLY) $(DEMANGLE) $(COMPILE_DONE) 13.98 13.99 # Intermediate files (for debugging macros) 13.100 %.i: %.cpp 13.101 @echo Preprocessing $< to $@ 13.102 - $(QUIETLY) $(PREPROCESS.CC) $< > $@ $(COMPILE_DONE) 13.103 + $(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE) 13.104 13.105 # Override gnumake built-in rules which do sccs get operations badly. 13.106 # (They put the checked out code in the current directory, not in the
14.1 --- a/make/linux/makefiles/sparcWorks.make Wed Feb 08 09:52:24 2012 +0100 14.2 +++ b/make/linux/makefiles/sparcWorks.make Thu Feb 09 18:01:20 2012 -0800 14.3 @@ -23,13 +23,13 @@ 14.4 # 14.5 14.6 #------------------------------------------------------------------------ 14.7 -# CC, CPP & AS 14.8 +# CC, CXX & AS 14.9 14.10 -CPP = CC 14.11 +CXX = CC 14.12 CC = cc 14.13 AS = $(CC) -c 14.14 14.15 -HOSTCPP = $(CPP) 14.16 +HOSTCXX = $(CXX) 14.17 HOSTCC = $(CC) 14.18 14.19 ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
15.1 --- a/make/linux/makefiles/vm.make Wed Feb 08 09:52:24 2012 +0100 15.2 +++ b/make/linux/makefiles/vm.make Thu Feb 09 18:01:20 2012 -0800 15.3 @@ -88,16 +88,20 @@ 15.4 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" 15.5 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" 15.6 15.7 -CPPFLAGS = \ 15.8 +CXXFLAGS = \ 15.9 ${SYSDEFS} \ 15.10 ${INCLUDES} \ 15.11 ${BUILD_VERSION} \ 15.12 ${BUILD_TARGET} \ 15.13 ${BUILD_USER} \ 15.14 ${HS_LIB_ARCH} \ 15.15 - ${JRE_VERSION} \ 15.16 ${VM_DISTRO} 15.17 15.18 +# This is VERY important! The version define must only be supplied to vm_version.o 15.19 +# If not, ccache will not re-use the cache at all, since the version string might contain 15.20 +# a time and date. 15.21 +vm_version.o: CXXFLAGS += ${JRE_VERSION} 15.22 + 15.23 ifndef JAVASE_EMBEDDED 15.24 CFLAGS += -DINCLUDE_TRACE 15.25 endif 15.26 @@ -272,13 +276,13 @@ 15.27 LIBS_VM += $(LLVM_LIBS) 15.28 endif 15.29 15.30 -LINK_VM = $(LINK_LIB.c) 15.31 +LINK_VM = $(LINK_LIB.CC) 15.32 15.33 # rule for building precompiled header 15.34 $(PRECOMPILED_HEADER): 15.35 $(QUIETLY) echo Generating precompiled header $@ 15.36 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR) 15.37 - $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE) 15.38 + $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE) 15.39 15.40 # making the library: 15.41 15.42 @@ -308,10 +312,10 @@ 15.43 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) 15.44 $(QUIETLY) { \ 15.45 echo Linking vm...; \ 15.46 - $(LINK_LIB.CC/PRE_HOOK) \ 15.47 + $(LINK_LIB.CXX/PRE_HOOK) \ 15.48 $(LINK_VM) $(LD_SCRIPT_FLAG) \ 15.49 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ 15.50 - $(LINK_LIB.CC/POST_HOOK) \ 15.51 + $(LINK_LIB.CXX/POST_HOOK) \ 15.52 rm -f $@.1; ln -s $@ $@.1; \ 15.53 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ 15.54 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \
16.1 --- a/make/solaris/makefiles/adlc.make Wed Feb 08 09:52:24 2012 +0100 16.2 +++ b/make/solaris/makefiles/adlc.make Thu Feb 09 18:01:20 2012 -0800 16.3 @@ -62,10 +62,10 @@ 16.4 INCLUDES += $(Src_Dirs_I:%=-I%) 16.5 16.6 # set flags for adlc compilation 16.7 -CPPFLAGS = $(SYSDEFS) $(INCLUDES) 16.8 +CXXFLAGS = $(SYSDEFS) $(INCLUDES) 16.9 16.10 # Force assertions on. 16.11 -CPPFLAGS += -DASSERT 16.12 +CXXFLAGS += -DASSERT 16.13 16.14 ifndef USE_GCC 16.15 # We need libCstd.so for adlc 16.16 @@ -130,7 +130,7 @@ 16.17 16.18 $(EXEC) : $(OBJECTS) 16.19 @echo Making adlc 16.20 - $(QUIETLY) $(LINK_NOPROF.CC) -o $(EXEC) $(OBJECTS) 16.21 + $(QUIETLY) $(LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS) 16.22 16.23 # Random dependencies: 16.24 $(OBJECTS): opcodes.hpp classes.hpp adlc.hpp adlcVMDeps.hpp adlparse.hpp archDesc.hpp arena.hpp dict2.hpp filebuff.hpp forms.hpp formsopt.hpp formssel.hpp 16.25 @@ -228,14 +228,14 @@ 16.26 $(OUTDIR)/%.o: %.cpp 16.27 @echo Compiling $< 16.28 $(QUIETLY) $(REMOVE_TARGET) 16.29 - $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE) 16.30 + $(QUIETLY) $(COMPILE.CXX) -o $@ $< $(COMPILE_DONE) 16.31 16.32 # Some object files are given a prefix, to disambiguate 16.33 # them from objects of the same name built for the VM. 16.34 $(OUTDIR)/adlc-%.o: %.cpp 16.35 @echo Compiling $< 16.36 $(QUIETLY) $(REMOVE_TARGET) 16.37 - $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE) 16.38 + $(QUIETLY) $(COMPILE.CXX) -o $@ $< $(COMPILE_DONE) 16.39 16.40 # ######################################################################### 16.41
17.1 --- a/make/solaris/makefiles/dtrace.make Wed Feb 08 09:52:24 2012 +0100 17.2 +++ b/make/solaris/makefiles/dtrace.make Thu Feb 09 18:01:20 2012 -0800 17.3 @@ -150,11 +150,11 @@ 17.4 17.5 lib$(GENOFFS).so: $(DTRACE_SRCDIR)/$(GENOFFS).cpp $(DTRACE_SRCDIR)/$(GENOFFS).h \ 17.6 $(LIBJVM.o) 17.7 - $(QUIETLY) $(CCC) $(CPPFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \ 17.8 + $(QUIETLY) $(CXX) $(CXXFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \ 17.9 $(LFLAGS_GENOFFS) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS).cpp -lc 17.10 17.11 $(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).so 17.12 - $(QUIETLY) $(LINK.CC) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \ 17.13 + $(QUIETLY) $(LINK.CXX) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \ 17.14 ./lib$(GENOFFS).so 17.15 17.16 CONDITIONALLY_UPDATE_JVMOFFS_TARGET = \ 17.17 @@ -178,7 +178,7 @@ 17.18 $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET) 17.19 17.20 $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp 17.21 - $(QUIETLY) $(CCC) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp 17.22 + $(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp 17.23 17.24 $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE) 17.25 @echo Making $@
18.1 --- a/make/solaris/makefiles/gcc.make Wed Feb 08 09:52:24 2012 +0100 18.2 +++ b/make/solaris/makefiles/gcc.make Thu Feb 09 18:01:20 2012 -0800 18.3 @@ -23,9 +23,9 @@ 18.4 # 18.5 18.6 #------------------------------------------------------------------------ 18.7 -# CC, CPP & AS 18.8 +# CC, CXX & AS 18.9 18.10 -CPP = g++ 18.11 +CXX = g++ 18.12 CC = gcc 18.13 AS = $(CC) -c 18.14 18.15 @@ -36,12 +36,12 @@ 18.16 CC_VER_MAJOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1) 18.17 CC_VER_MINOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f2) 18.18 18.19 -# Check for the versions of C++ and C compilers ($CPP and $CC) used. 18.20 +# Check for the versions of C++ and C compilers ($CXX and $CC) used. 18.21 18.22 # Get the last thing on the line that looks like x.x+ (x is a digit). 18.23 COMPILER_REV := \ 18.24 -$(shell $(CPP) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1) 18.25 -C_COMPILER_REV := \ 18.26 +$(shell $(CXX) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1) 18.27 +CC_COMPILER_REV := \ 18.28 $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f2) 18.29 18.30
19.1 --- a/make/solaris/makefiles/launcher.make Wed Feb 08 09:52:24 2012 +0100 19.2 +++ b/make/solaris/makefiles/launcher.make Thu Feb 09 18:01:20 2012 -0800 19.3 @@ -52,10 +52,10 @@ 19.4 LIBS_LAUNCHER += -l$(JVM) $(LIBS) 19.5 endif 19.6 19.7 -LINK_LAUNCHER = $(LINK.CC) 19.8 +LINK_LAUNCHER = $(LINK.CXX) 19.9 19.10 -LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK) 19.11 -LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK) 19.12 +LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CXX/PRE_HOOK) 19.13 +LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CXX/POST_HOOK) 19.14 19.15 ifeq ("${Platform_compiler}", "sparcWorks") 19.16 # Enable the following LAUNCHERFLAGS addition if you need to compare the 19.17 @@ -86,11 +86,11 @@ 19.18 19.19 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c 19.20 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 19.21 - $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 19.22 + $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS) 19.23 19.24 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c 19.25 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 19.26 - $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 19.27 + $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS) 19.28 19.29 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) 19.30 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
20.1 --- a/make/solaris/makefiles/product.make Wed Feb 08 09:52:24 2012 +0100 20.2 +++ b/make/solaris/makefiles/product.make Thu Feb 09 18:01:20 2012 -0800 20.3 @@ -70,7 +70,7 @@ 20.4 20.5 # If we can create .debuginfo files, then the VM is stripped in vm.make 20.6 # and this macro is not used. 20.7 -# LINK_LIB.CC/POST_HOOK += $(STRIP_LIB.CC/POST_HOOK) 20.8 +# LINK_LIB.CXX/POST_HOOK += $(STRIP_LIB.CXX/POST_HOOK) 20.9 20.10 G_SUFFIX = 20.11 SYSDEFS += -DPRODUCT
21.1 --- a/make/solaris/makefiles/rules.make Wed Feb 08 09:52:24 2012 +0100 21.2 +++ b/make/solaris/makefiles/rules.make Thu Feb 09 18:01:20 2012 -0800 21.3 @@ -27,44 +27,31 @@ 21.4 # Tell make that .cpp is important 21.5 .SUFFIXES: .cpp $(SUFFIXES) 21.6 21.7 -# For now. Other makefiles use CPP as the c++ compiler, but that should really 21.8 -# name the preprocessor. 21.9 -ifeq ($(CCC),) 21.10 -CCC = $(CPP) 21.11 -endif 21.12 - 21.13 DEMANGLER = c++filt 21.14 DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@ 21.15 21.16 -# $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++). 21.17 -C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) 21.18 -CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) 21.19 +# $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++). 21.20 +CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) 21.21 +CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) 21.22 21.23 AS.S = $(AS) $(ASFLAGS) 21.24 21.25 -COMPILE.c = $(C_COMPILE) -c 21.26 -GENASM.c = $(C_COMPILE) -S 21.27 -LINK.c = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 21.28 -LINK_LIB.c = $(CC) $(LFLAGS) $(SHARED_FLAG) 21.29 -PREPROCESS.c = $(C_COMPILE) -E 21.30 +COMPILE.CC = $(CC_COMPILE) -c 21.31 +GENASM.CC = $(CC_COMPILE) -S 21.32 +LINK.CC = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 21.33 +LINK_LIB.CC = $(CC) $(LFLAGS) $(SHARED_FLAG) 21.34 +PREPROCESS.CC = $(CC_COMPILE) -E 21.35 21.36 -COMPILE.CC = $(CC_COMPILE) -c 21.37 -GENASM.CC = $(CC_COMPILE) -S 21.38 -LINK.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 21.39 -LINK_NOPROF.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) 21.40 -LINK_LIB.CC = $(CCC) $(LFLAGS) $(SHARED_FLAG) 21.41 -PREPROCESS.CC = $(CC_COMPILE) -E 21.42 +COMPILE.CXX = $(CXX_COMPILE) -c 21.43 +GENASM.CXX = $(CXX_COMPILE) -S 21.44 +LINK.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 21.45 +LINK_NOPROF.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS) 21.46 +LINK_LIB.CXX = $(CXX) $(LFLAGS) $(SHARED_FLAG) 21.47 +PREPROCESS.CXX = $(CXX_COMPILE) -E 21.48 21.49 # Effect of REMOVE_TARGET is to delete out-of-date files during "gnumake -k". 21.50 REMOVE_TARGET = rm -f $@ 21.51 21.52 -# Synonyms. 21.53 -COMPILE.cpp = $(COMPILE.CC) 21.54 -GENASM.cpp = $(GENASM.CC) 21.55 -LINK.cpp = $(LINK.CC) 21.56 -LINK_LIB.cpp = $(LINK_LIB.CC) 21.57 -PREPROCESS.cpp = $(PREPROCESS.CC) 21.58 - 21.59 # Note use of ALT_BOOTDIR to explicitly specify location of java and 21.60 # javac; this is the same environment variable used in the J2SE build 21.61 # process for overriding the default spec, which is BOOTDIR. 21.62 @@ -153,14 +140,14 @@ 21.63 %.o: %.cpp 21.64 @echo Compiling $< 21.65 $(QUIETLY) $(REMOVE_TARGET) 21.66 - $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) 21.67 + $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) 21.68 else 21.69 %.o: %.cpp 21.70 @echo Compiling $< 21.71 $(QUIETLY) $(REMOVE_TARGET) 21.72 $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ 21.73 - $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ 21.74 - $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) 21.75 + $(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ 21.76 + $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) 21.77 endif 21.78 21.79 %.o: %.s 21.80 @@ -170,13 +157,13 @@ 21.81 21.82 %.s: %.cpp 21.83 @echo Generating assembly for $< 21.84 - $(QUIETLY) $(GENASM.CC) -o $@ $< 21.85 + $(QUIETLY) $(GENASM.CXX) -o $@ $< 21.86 $(QUIETLY) $(DEMANGLE) $(COMPILE_DONE) 21.87 21.88 # Intermediate files (for debugging macros) 21.89 %.i: %.cpp 21.90 @echo Preprocessing $< to $@ 21.91 - $(QUIETLY) $(PREPROCESS.CC) $< > $@ $(COMPILE_DONE) 21.92 + $(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE) 21.93 21.94 # Override gnumake built-in rules which do sccs get operations badly. 21.95 # (They put the checked out code in the current directory, not in the
22.1 --- a/make/solaris/makefiles/saproc.make Wed Feb 08 09:52:24 2012 +0100 22.2 +++ b/make/solaris/makefiles/saproc.make Thu Feb 09 18:01:20 2012 -0800 22.3 @@ -93,7 +93,7 @@ 22.4 exit 1; \ 22.5 fi 22.6 @echo Making SA debugger back-end... 22.7 - $(QUIETLY) $(CPP) \ 22.8 + $(QUIETLY) $(CXX) \ 22.9 $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ 22.10 -I$(SASRCDIR) \ 22.11 -I$(GENERATED) \
23.1 --- a/make/solaris/makefiles/sparcWorks.make Wed Feb 08 09:52:24 2012 +0100 23.2 +++ b/make/solaris/makefiles/sparcWorks.make Thu Feb 09 18:01:20 2012 -0800 23.3 @@ -26,7 +26,7 @@ 23.4 23.5 # tell make which C and C++ compilers to use 23.6 CC = cc 23.7 -CPP = CC 23.8 +CXX = CC 23.9 23.10 # Note that this 'as' is an older version of the Sun Studio 'fbe', and will 23.11 # use the older style options. The 'fbe' options will match 'cc' and 'CC'. 23.12 @@ -37,23 +37,23 @@ 23.13 23.14 REORDER_FLAG = -xF 23.15 23.16 -# Check for the versions of C++ and C compilers ($CPP and $CC) used. 23.17 +# Check for the versions of C++ and C compilers ($CXX and $CC) used. 23.18 23.19 # Get the last thing on the line that looks like x.x+ (x is a digit). 23.20 COMPILER_REV := \ 23.21 -$(shell $(CPP) -V 2>&1 | sed -n 's/^.*[ ,\t]C++[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p') 23.22 -C_COMPILER_REV := \ 23.23 +$(shell $(CXX) -V 2>&1 | sed -n 's/^.*[ ,\t]C++[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p') 23.24 +CC_COMPILER_REV := \ 23.25 $(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p') 23.26 23.27 # Pick which compiler is validated 23.28 ifeq ($(JRE_RELEASE_VER),1.6.0) 23.29 # Validated compiler for JDK6 is SS11 (5.8) 23.30 VALIDATED_COMPILER_REVS := 5.8 23.31 - VALIDATED_C_COMPILER_REVS := 5.8 23.32 + VALIDATED_CC_COMPILER_REVS := 5.8 23.33 else 23.34 # Validated compiler for JDK7 is SS12 update 1 + patches (5.10) 23.35 VALIDATED_COMPILER_REVS := 5.10 23.36 - VALIDATED_C_COMPILER_REVS := 5.10 23.37 + VALIDATED_CC_COMPILER_REVS := 5.10 23.38 endif 23.39 23.40 # Warning messages about not using the above validated versions 23.41 @@ -67,13 +67,13 @@ 23.42 warning.) 23.43 endif 23.44 23.45 -ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := $(strip ${VALIDATED_C_COMPILER_REVS}) 23.46 -ifeq ($(filter ${ENFORCE_C_COMPILER_REV},${C_COMPILER_REV}),) 23.47 -PRINTABLE_C_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_C_COMPILER_REV}) 23.48 +ENFORCE_CC_COMPILER_REV${ENFORCE_CC_COMPILER_REV} := $(strip ${VALIDATED_CC_COMPILER_REVS}) 23.49 +ifeq ($(filter ${ENFORCE_CC_COMPILER_REV},${CC_COMPILER_REV}),) 23.50 +PRINTABLE_C_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_CC_COMPILER_REV}) 23.51 dummy_var_to_enforce_c_compiler_rev := $(shell \ 23.52 - echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} and \ 23.53 + echo >&2 WARNING: You are using cc version ${CC_COMPILER_REV} and \ 23.54 should be using version ${PRINTABLE_C_REVS}.; \ 23.55 - echo >&2 Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this \ 23.56 + echo >&2 Set ENFORCE_CC_COMPILER_REV=${CC_COMPILER_REV} to avoid this \ 23.57 warning.) 23.58 endif 23.59 23.60 @@ -98,7 +98,7 @@ 23.61 } \ 23.62 END { exit rc; }' 23.63 23.64 -LINK_LIB.CC/PRE_HOOK += $(JVM_CHECK_SYMBOLS) || exit 1; 23.65 +LINK_LIB.CXX/PRE_HOOK += $(JVM_CHECK_SYMBOLS) || exit 1; 23.66 23.67 # New architecture options started in SS12 (5.9), we need both styles to build. 23.68 # The older arch options for SS11 (5.8) or older and also for /usr/ccs/bin/as. 23.69 @@ -518,7 +518,7 @@ 23.70 #FASTDEBUG_CFLAGS += -Qoption ccfe -xglobalstatic 23.71 23.72 ifeq (${COMPILER_REV_NUMERIC}, 502) 23.73 -COMPILER_DATE := $(shell $(CPP) -V 2>&1 | sed -n '/^.*[ ]C++[ ]\([1-9]\.[0-9][0-9]*\)/p' | awk '{ print $$NF; }') 23.74 +COMPILER_DATE := $(shell $(CXX) -V 2>&1 | sed -n '/^.*[ ]C++[ ]\([1-9]\.[0-9][0-9]*\)/p' | awk '{ print $$NF; }') 23.75 ifeq (${COMPILER_DATE}, 2001/01/31) 23.76 # disable -g0 in fastdebug since SC6.1 dated 2001/01/31 seems to be buggy 23.77 # use an innocuous value because it will get -g if it's empty 23.78 @@ -568,7 +568,7 @@ 23.79 # removing repeated lines. The data can be extracted from 23.80 # binaries in the field by using "mcs -p libjvm.so" or the older 23.81 # command "what libjvm.so". 23.82 -LINK_LIB.CC/POST_HOOK += $(MCS) -c $@ || exit 1; 23.83 +LINK_LIB.CXX/POST_HOOK += $(MCS) -c $@ || exit 1; 23.84 # (The exit 1 is necessary to cause a build failure if the command fails and 23.85 # multiple commands are strung together, and the final semicolon is necessary 23.86 # since the hook must terminate itself as a valid command.) 23.87 @@ -576,7 +576,7 @@ 23.88 # Also, strip debug and line number information (worth about 1.7Mb). 23.89 # If we can create .debuginfo files, then the VM is stripped in vm.make 23.90 # and this macro is not used. 23.91 -STRIP_LIB.CC/POST_HOOK = $(STRIP) -x $@ || exit 1; 23.92 -# STRIP_LIB.CC/POST_HOOK is incorporated into LINK_LIB.CC/POST_HOOK 23.93 +STRIP_LIB.CXX/POST_HOOK = $(STRIP) -x $@ || exit 1; 23.94 +# STRIP_LIB.CXX/POST_HOOK is incorporated into LINK_LIB.CXX/POST_HOOK 23.95 # in certain configurations, such as product.make. Other configurations, 23.96 # such as debug.make, do not include the strip operation.
24.1 --- a/make/solaris/makefiles/vm.make Wed Feb 08 09:52:24 2012 +0100 24.2 +++ b/make/solaris/makefiles/vm.make Thu Feb 09 18:01:20 2012 -0800 24.3 @@ -76,16 +76,20 @@ 24.4 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" 24.5 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" 24.6 24.7 -CPPFLAGS = \ 24.8 +CXXFLAGS = \ 24.9 ${SYSDEFS} \ 24.10 ${INCLUDES} \ 24.11 ${BUILD_VERSION} \ 24.12 ${BUILD_TARGET} \ 24.13 ${BUILD_USER} \ 24.14 ${HS_LIB_ARCH} \ 24.15 - ${JRE_VERSION} \ 24.16 ${VM_DISTRO} 24.17 24.18 +# This is VERY important! The version define must only be supplied to vm_version.o 24.19 +# If not, ccache will not re-use the cache at all, since the version string might contain 24.20 +# a time and date. 24.21 +vm_version.o: CXXFLAGS += ${JRE_VERSION} 24.22 + 24.23 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 24.24 CFLAGS += $(CFLAGS_WARN) 24.25 24.26 @@ -265,17 +269,17 @@ 24.27 endif 24.28 24.29 ifdef USE_GCC 24.30 -LINK_VM = $(LINK_LIB.c) 24.31 +LINK_VM = $(LINK_LIB.CC) 24.32 else 24.33 -LINK_VM = $(LINK_LIB.CC) 24.34 +LINK_VM = $(LINK_LIB.CXX) 24.35 endif 24.36 # making the library: 24.37 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) 24.38 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) 24.39 @echo Linking vm... 24.40 - $(QUIETLY) $(LINK_LIB.CC/PRE_HOOK) 24.41 + $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK) 24.42 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) 24.43 - $(QUIETLY) $(LINK_LIB.CC/POST_HOOK) 24.44 + $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK) 24.45 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 24.46 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) 24.47 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
25.1 --- a/make/windows/build_vm_def.sh Wed Feb 08 09:52:24 2012 +0100 25.2 +++ b/make/windows/build_vm_def.sh Thu Feb 09 18:01:20 2012 -0800 25.3 @@ -57,10 +57,10 @@ 25.4 25.5 # When called from IDE the first param should contain the link version, otherwise may be nill 25.6 if [ "x$1" != "x" ]; then 25.7 -LINK_VER="$1" 25.8 +LD_VER="$1" 25.9 fi 25.10 25.11 -if [ "x$LINK_VER" != "x800" -a "x$LINK_VER" != "x900" -a "x$LINK_VER" != "x1000" ]; then 25.12 +if [ "x$LD_VER" != "x800" -a "x$LD_VER" != "x900" -a "x$LD_VER" != "x1000" ]; then 25.13 $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def 25.14 else 25.15 # Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def
26.1 --- a/make/windows/get_msc_ver.sh Wed Feb 08 09:52:24 2012 +0100 26.2 +++ b/make/windows/get_msc_ver.sh Thu Feb 09 18:01:20 2012 -0800 26.3 @@ -72,8 +72,8 @@ 26.4 echo "MSC_VER_RAW=$MSC_VER_RAW" 26.5 fi 26.6 26.7 -if [ "x$FORCE_LINK_VER" != "x" ]; then 26.8 - echo "LINK_VER=$FORCE_LINK_VER" 26.9 +if [ "x$FORCE_LD_VER" != "x" ]; then 26.10 + echo "LD_VER=$FORCE_LD_VER" 26.11 else 26.12 # use the "link" command that is co-located with the "cl" command 26.13 cl_cmd=`which cl` 26.14 @@ -83,11 +83,11 @@ 26.15 # which can't find "cl" so just use which ever "link" we find 26.16 link_cmd="link" 26.17 fi 26.18 - LINK_VER_RAW=`"$link_cmd" 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'` 26.19 - LINK_VER_MAJOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f1` 26.20 - LINK_VER_MINOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f2` 26.21 - LINK_VER_MICRO=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f3` 26.22 - LINK_VER=`"$EXPR" $LINK_VER_MAJOR \* 100 + $LINK_VER_MINOR` 26.23 - echo "LINK_VER=$LINK_VER" 26.24 - echo "LINK_VER_RAW=$LINK_VER_RAW" 26.25 + LD_VER_RAW=`"$link_cmd" 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'` 26.26 + LD_VER_MAJOR=`"$ECHO" $LD_VER_RAW | "$CUT" -d'.' -f1` 26.27 + LD_VER_MINOR=`"$ECHO" $LD_VER_RAW | "$CUT" -d'.' -f2` 26.28 + LD_VER_MICRO=`"$ECHO" $LD_VER_RAW | "$CUT" -d'.' -f3` 26.29 + LD_VER=`"$EXPR" $LD_VER_MAJOR \* 100 + $LD_VER_MINOR` 26.30 + echo "LD_VER=$LD_VER" 26.31 + echo "LD_VER_RAW=$LD_VER_RAW" 26.32 fi
27.1 --- a/make/windows/makefiles/adlc.make Wed Feb 08 09:52:24 2012 +0100 27.2 +++ b/make/windows/makefiles/adlc.make Thu Feb 09 18:01:20 2012 -0800 27.3 @@ -45,9 +45,9 @@ 27.4 ADLCFLAGS=-q -T -U_LP64 27.5 !endif 27.6 27.7 -ADLC_CPP_FLAGS=$(CPP_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE 27.8 +ADLC_CXX_FLAGS=$(CXX_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE 27.9 27.10 -CPP_INCLUDE_DIRS=\ 27.11 +CXX_INCLUDE_DIRS=\ 27.12 /I "..\generated" \ 27.13 /I "$(WorkSpace)\src\share\vm" \ 27.14 /I "$(WorkSpace)\src\os\windows\vm" \ 27.15 @@ -94,14 +94,14 @@ 27.16 $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp 27.17 27.18 {$(WorkSpace)\src\share\vm\adlc}.cpp.obj:: 27.19 - $(CPP) $(ADLC_CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $< 27.20 + $(CXX) $(ADLC_CXX_FLAGS) $(EXH_FLAGS) $(CXX_INCLUDE_DIRS) /c $< 27.21 27.22 {$(WorkSpace)\src\share\vm\opto}.cpp.obj:: 27.23 - $(CPP) $(ADLC_CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $< 27.24 + $(CXX) $(ADLC_CXX_FLAGS) $(EXH_FLAGS) $(CXX_INCLUDE_DIRS) /c $< 27.25 27.26 adlc.exe: main.obj adlparse.obj archDesc.obj arena.obj dfa.obj dict2.obj filebuff.obj \ 27.27 forms.obj formsopt.obj formssel.obj opcodes.obj output_c.obj output_h.obj 27.28 - $(LINK) $(LINK_FLAGS) /subsystem:console /out:$@ $** 27.29 + $(LD) $(LD_FLAGS) /subsystem:console /out:$@ $** 27.30 !if "$(MT)" != "" 27.31 # The previous link command created a .manifest file that we want to 27.32 # insert into the linked artifact so we do not need to track it
28.1 --- a/make/windows/makefiles/compile.make Wed Feb 08 09:52:24 2012 +0100 28.2 +++ b/make/windows/makefiles/compile.make Thu Feb 09 18:01:20 2012 -0800 28.3 @@ -23,9 +23,9 @@ 28.4 # 28.5 28.6 # Generic compiler settings 28.7 -CPP=cl.exe 28.8 +CXX=cl.exe 28.9 28.10 -# CPP Flags: (these vary slightly from VC6->VS2003->VS2005 compilers) 28.11 +# CXX Flags: (these vary slightly from VC6->VS2003->VS2005 compilers) 28.12 # /nologo Supress copyright message at every cl.exe startup 28.13 # /W3 Warning level 3 28.14 # /Zi Include debugging information 28.15 @@ -50,47 +50,47 @@ 28.16 # improving the quality of crash log stack traces involving jvm.dll. 28.17 28.18 # These are always used in all compiles 28.19 -CPP_FLAGS=/nologo /W3 /WX 28.20 +CXX_FLAGS=/nologo /W3 /WX 28.21 28.22 # Let's add debug information always too. 28.23 -CPP_FLAGS=$(CPP_FLAGS) /Zi 28.24 +CXX_FLAGS=$(CXX_FLAGS) /Zi 28.25 28.26 # Based on BUILDARCH we add some flags and select the default compiler name 28.27 !if "$(BUILDARCH)" == "ia64" 28.28 MACHINE=IA64 28.29 DEFAULT_COMPILER_NAME=VS2003 28.30 -CPP_FLAGS=$(CPP_FLAGS) /D "CC_INTERP" /D "_LP64" /D "IA64" 28.31 +CXX_FLAGS=$(CXX_FLAGS) /D "CC_INTERP" /D "_LP64" /D "IA64" 28.32 !endif 28.33 28.34 !if "$(BUILDARCH)" == "amd64" 28.35 MACHINE=AMD64 28.36 DEFAULT_COMPILER_NAME=VS2005 28.37 -CPP_FLAGS=$(CPP_FLAGS) /D "_LP64" /D "AMD64" 28.38 +CXX_FLAGS=$(CXX_FLAGS) /D "_LP64" /D "AMD64" 28.39 LP64=1 28.40 !endif 28.41 28.42 !if "$(BUILDARCH)" == "i486" 28.43 MACHINE=I386 28.44 DEFAULT_COMPILER_NAME=VS2003 28.45 -CPP_FLAGS=$(CPP_FLAGS) /D "IA32" 28.46 +CXX_FLAGS=$(CXX_FLAGS) /D "IA32" 28.47 !endif 28.48 28.49 # Sanity check, this is the default if not amd64, ia64, or i486 28.50 !ifndef DEFAULT_COMPILER_NAME 28.51 -CPP=ARCH_ERROR 28.52 +CXX=ARCH_ERROR 28.53 !endif 28.54 28.55 -CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS" 28.56 +CXX_FLAGS=$(CXX_FLAGS) /D "WIN32" /D "_WINDOWS" 28.57 # Must specify this for sharedRuntimeTrig.cpp 28.58 -CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN" 28.59 +CXX_FLAGS=$(CXX_FLAGS) /D "VM_LITTLE_ENDIAN" 28.60 28.61 # Used for platform dispatching 28.62 -CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_FAMILY_windows 28.63 -CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_$(Platform_arch) 28.64 -CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_MODEL_$(Platform_arch_model) 28.65 -CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_windows_$(Platform_arch) 28.66 -CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_MODEL_windows_$(Platform_arch_model) 28.67 -CPP_FLAGS=$(CPP_FLAGS) /D TARGET_COMPILER_visCPP 28.68 +CXX_FLAGS=$(CXX_FLAGS) /D TARGET_OS_FAMILY_windows 28.69 +CXX_FLAGS=$(CXX_FLAGS) /D TARGET_ARCH_$(Platform_arch) 28.70 +CXX_FLAGS=$(CXX_FLAGS) /D TARGET_ARCH_MODEL_$(Platform_arch_model) 28.71 +CXX_FLAGS=$(CXX_FLAGS) /D TARGET_OS_ARCH_windows_$(Platform_arch) 28.72 +CXX_FLAGS=$(CXX_FLAGS) /D TARGET_OS_ARCH_MODEL_windows_$(Platform_arch_model) 28.73 +CXX_FLAGS=$(CXX_FLAGS) /D TARGET_COMPILER_visCPP 28.74 28.75 28.76 # MSC_VER is a 4 digit number that tells us what compiler is being used 28.77 @@ -150,14 +150,14 @@ 28.78 # Always add the _STATIC_CPPLIB flag 28.79 STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB /D _DISABLE_DEPRECATE_STATIC_CPPLIB 28.80 MS_RUNTIME_OPTION = $(MS_RUNTIME_OPTION) $(STATIC_CPPLIB_OPTION) 28.81 -CPP_FLAGS=$(CPP_FLAGS) $(MS_RUNTIME_OPTION) 28.82 +CXX_FLAGS=$(CXX_FLAGS) $(MS_RUNTIME_OPTION) 28.83 28.84 # How /GX option is spelled 28.85 GX_OPTION = /GX 28.86 28.87 # Optimization settings for various versions of the compilers and types of 28.88 # builds. Three basic sets of settings: product, fastdebug, and debug. 28.89 -# These get added into CPP_FLAGS as needed by other makefiles. 28.90 +# These get added into CXX_FLAGS as needed by other makefiles. 28.91 !if "$(COMPILER_NAME)" == "VC6" 28.92 PRODUCT_OPT_OPTION = /Ox /Os /Gy /GF 28.93 FASTDEBUG_OPT_OPTION = /Ox /Os /Gy /GF 28.94 @@ -180,7 +180,7 @@ 28.95 # externals at link time. Even with /GS-, you need bufferoverflowU.lib. 28.96 # NOTE: Currently we decided to not use /GS- 28.97 BUFFEROVERFLOWLIB = bufferoverflowU.lib 28.98 -LINK_FLAGS = /manifest $(LINK_FLAGS) $(BUFFEROVERFLOWLIB) 28.99 +LD_FLAGS = /manifest $(LD_FLAGS) $(BUFFEROVERFLOWLIB) 28.100 # Manifest Tool - used in VS2005 and later to adjust manifests stored 28.101 # as resources inside build artifacts. 28.102 MT=mt.exe 28.103 @@ -191,7 +191,7 @@ 28.104 FASTDEBUG_OPT_OPTION = /O2 /Oy- 28.105 DEBUG_OPT_OPTION = /Od 28.106 GX_OPTION = /EHsc 28.107 -LINK_FLAGS = /manifest $(LINK_FLAGS) 28.108 +LD_FLAGS = /manifest $(LD_FLAGS) 28.109 # Manifest Tool - used in VS2005 and later to adjust manifests stored 28.110 # as resources inside build artifacts. 28.111 MT=mt.exe 28.112 @@ -202,12 +202,12 @@ 28.113 FASTDEBUG_OPT_OPTION = /O2 /Oy- 28.114 DEBUG_OPT_OPTION = /Od 28.115 GX_OPTION = /EHsc 28.116 -LINK_FLAGS = /manifest $(LINK_FLAGS) 28.117 +LD_FLAGS = /manifest $(LD_FLAGS) 28.118 # Manifest Tool - used in VS2005 and later to adjust manifests stored 28.119 # as resources inside build artifacts. 28.120 MT=mt.exe 28.121 !if "$(BUILDARCH)" == "i486" 28.122 -LINK_FLAGS = /SAFESEH $(LINK_FLAGS) 28.123 +LD_FLAGS = /SAFESEH $(LD_FLAGS) 28.124 !endif 28.125 !endif 28.126 28.127 @@ -225,15 +225,15 @@ 28.128 !endif 28.129 28.130 # Generic linker settings 28.131 -LINK=link.exe 28.132 -LINK_FLAGS= $(LINK_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \ 28.133 +LD=link.exe 28.134 +LD_FLAGS= $(LD_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \ 28.135 comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ 28.136 uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \ 28.137 /opt:ICF,8 /map /debug 28.138 28.139 28.140 !if $(MSC_VER) >= 1600 28.141 -LINK_FLAGS= $(LINK_FLAGS) psapi.lib 28.142 +LD_FLAGS= $(LD_FLAGS) psapi.lib 28.143 !endif 28.144 28.145 # Resource compiler settings 28.146 @@ -250,7 +250,7 @@ 28.147 /D "HS_INTERNAL_NAME=$(HS_INTERNAL_NAME)" \ 28.148 /D "HS_NAME=$(HS_NAME)" 28.149 28.150 -# Need this to match the CPP_FLAGS settings 28.151 +# Need this to match the CXX_FLAGS settings 28.152 !if "$(MFC_DEBUG)" == "true" 28.153 RC_FLAGS = $(RC_FLAGS) /D "_DEBUG" 28.154 !endif
29.1 --- a/make/windows/makefiles/debug.make Wed Feb 08 09:52:24 2012 +0100 29.2 +++ b/make/windows/makefiles/debug.make Thu Feb 09 18:01:20 2012 -0800 29.3 @@ -38,7 +38,7 @@ 29.4 !include ../local.make 29.5 !include compile.make 29.6 29.7 -CPP_FLAGS=$(CPP_FLAGS) $(DEBUG_OPT_OPTION) 29.8 +CXX_FLAGS=$(CXX_FLAGS) $(DEBUG_OPT_OPTION) 29.9 29.10 !include $(WorkSpace)/make/windows/makefiles/vm.make 29.11 !include local.make 29.12 @@ -52,8 +52,8 @@ 29.13 sh $(WorkSpace)/make/windows/build_vm_def.sh 29.14 29.15 $(AOUT): $(Res_Files) $(Obj_Files) vm.def 29.16 - $(LINK) @<< 29.17 - $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 29.18 + $(LD) @<< 29.19 + $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 29.20 << 29.21 !if "$(MT)" != "" 29.22 # The previous link command created a .manifest file that we want to
30.1 --- a/make/windows/makefiles/fastdebug.make Wed Feb 08 09:52:24 2012 +0100 30.2 +++ b/make/windows/makefiles/fastdebug.make Thu Feb 09 18:01:20 2012 -0800 30.3 @@ -38,7 +38,7 @@ 30.4 !include ../local.make 30.5 !include compile.make 30.6 30.7 -CPP_FLAGS=$(CPP_FLAGS) $(FASTDEBUG_OPT_OPTION) 30.8 +CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION) 30.9 30.10 !include $(WorkSpace)/make/windows/makefiles/vm.make 30.11 !include local.make 30.12 @@ -52,8 +52,8 @@ 30.13 sh $(WorkSpace)/make/windows/build_vm_def.sh 30.14 30.15 $(AOUT): $(Res_Files) $(Obj_Files) vm.def 30.16 - $(LINK) @<< 30.17 - $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 30.18 + $(LD) @<< 30.19 + $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 30.20 << 30.21 !if "$(MT)" != "" 30.22 # The previous link command created a .manifest file that we want to
31.1 --- a/make/windows/makefiles/launcher.make Wed Feb 08 09:52:24 2012 +0100 31.2 +++ b/make/windows/makefiles/launcher.make Thu Feb 09 18:01:20 2012 -0800 31.3 @@ -23,7 +23,7 @@ 31.4 # 31.5 31.6 31.7 -LAUNCHER_FLAGS=$(CPP_FLAGS) $(ARCHFLAG) \ 31.8 +LAUNCHER_FLAGS=$(CXX_FLAGS) $(ARCHFLAG) \ 31.9 /D FULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \ 31.10 /D JDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \ 31.11 /D JDK_MINOR_VERSION=\"$(JDK_MINOR_VERSION)\" \ 31.12 @@ -39,18 +39,18 @@ 31.13 /I $(WorkSpace)\src\cpu\$(Platform_arch)\vm \ 31.14 /I $(WorkSpace)\src\os\windows\vm 31.15 31.16 -LINK_FLAGS=/manifest $(HS_INTERNAL_NAME).lib kernel32.lib user32.lib /nologo /machine:$(MACHINE) /map /debug /subsystem:console 31.17 +LD_FLAGS=/manifest $(HS_INTERNAL_NAME).lib kernel32.lib user32.lib /nologo /machine:$(MACHINE) /map /debug /subsystem:console 31.18 31.19 !if "$(COMPILER_NAME)" == "VS2005" 31.20 # This VS2005 compiler has /GS as a default and requires bufferoverflowU.lib 31.21 # on the link command line, otherwise we get missing __security_check_cookie 31.22 # externals at link time. Even with /GS-, you need bufferoverflowU.lib. 31.23 BUFFEROVERFLOWLIB = bufferoverflowU.lib 31.24 -LINK_FLAGS = $(LINK_FLAGS) $(BUFFEROVERFLOWLIB) 31.25 +LD_FLAGS = $(LD_FLAGS) $(BUFFEROVERFLOWLIB) 31.26 !endif 31.27 31.28 !if "$(COMPILER_NAME)" == "VS2010" && "$(BUILDARCH)" == "i486" 31.29 -LINK_FLAGS = /SAFESEH $(LINK_FLAGS) 31.30 +LD_FLAGS = /SAFESEH $(LD_FLAGS) 31.31 !endif 31.32 31.33 LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher 31.34 @@ -60,14 +60,14 @@ 31.35 31.36 {$(LAUNCHERDIR)}.c{$(OUTDIR)}.obj: 31.37 -mkdir $(OUTDIR) 2>NUL >NUL 31.38 - $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $< 31.39 + $(CXX) $(LAUNCHER_FLAGS) /c /Fo$@ $< 31.40 31.41 {$(LAUNCHERDIR_SHARE)}.c{$(OUTDIR)}.obj: 31.42 -mkdir $(OUTDIR) 2>NUL >NUL 31.43 - $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $< 31.44 + $(CXX) $(LAUNCHER_FLAGS) /c /Fo$@ $< 31.45 31.46 $(OUTDIR)\*.obj: $(LAUNCHERDIR)\*.c $(LAUNCHERDIR)\*.h $(LAUNCHERDIR_SHARE)\*.c $(LAUNCHERDIR_SHARE)\*.h 31.47 31.48 launcher: $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj 31.49 echo $(JAVA_HOME) > jdkpath.txt 31.50 - $(LINK) $(LINK_FLAGS) /out:hotspot.exe $** 31.51 + $(LD) $(LD_FLAGS) /out:hotspot.exe $**
32.1 --- a/make/windows/makefiles/product.make Wed Feb 08 09:52:24 2012 +0100 32.2 +++ b/make/windows/makefiles/product.make Thu Feb 09 18:01:20 2012 -0800 32.3 @@ -37,7 +37,7 @@ 32.4 !include ../local.make 32.5 !include compile.make 32.6 32.7 -CPP_FLAGS=$(CPP_FLAGS) $(PRODUCT_OPT_OPTION) 32.8 +CXX_FLAGS=$(CXX_FLAGS) $(PRODUCT_OPT_OPTION) 32.9 32.10 RELEASE= 32.11 32.12 @@ -54,16 +54,16 @@ 32.13 # Kernel doesn't need exported vtbl symbols. 32.14 !if "$(Variant)" == "kernel" 32.15 $(AOUT): $(Res_Files) $(Obj_Files) 32.16 - $(LINK) @<< 32.17 - $(LINK_FLAGS) /out:$@ /implib:$*.lib $(Obj_Files) $(Res_Files) 32.18 + $(LD) @<< 32.19 + $(LD_FLAGS) /out:$@ /implib:$*.lib $(Obj_Files) $(Res_Files) 32.20 << 32.21 !else 32.22 vm.def: $(Obj_Files) 32.23 sh $(WorkSpace)/make/windows/build_vm_def.sh 32.24 32.25 $(AOUT): $(Res_Files) $(Obj_Files) vm.def 32.26 - $(LINK) @<< 32.27 - $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 32.28 + $(LD) @<< 32.29 + $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 32.30 << 32.31 !endif 32.32 !if "$(MT)" != ""
33.1 --- a/make/windows/makefiles/projectcreator.make Wed Feb 08 09:52:24 2012 +0100 33.2 +++ b/make/windows/makefiles/projectcreator.make Thu Feb 09 18:01:20 2012 -0800 33.3 @@ -89,7 +89,7 @@ 33.4 -jdkTargetRoot $(HOTSPOTJDKDIST) \ 33.5 -define ALIGN_STACK_FRAMES \ 33.6 -define VM_LITTLE_ENDIAN \ 33.7 - -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LINK_VER)" \ 33.8 + -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \ 33.9 -postbuild "" "Building hotspot.exe..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \ 33.10 -ignoreFile jsig.c \ 33.11 -ignoreFile jvmtiEnvRecommended.cpp \
34.1 --- a/make/windows/makefiles/sa.make Wed Feb 08 09:52:24 2012 +0100 34.2 +++ b/make/windows/makefiles/sa.make Thu Feb 09 18:01:20 2012 -0800 34.3 @@ -91,16 +91,16 @@ 34.4 !if "$(COMPILER_NAME)" == "VS2005" 34.5 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line, 34.6 # otherwise we get missing __security_check_cookie externals at link time. 34.7 -SA_LINK_FLAGS = bufferoverflowU.lib 34.8 +SA_LD_FLAGS = bufferoverflowU.lib 34.9 !endif 34.10 !else 34.11 SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 /Gm $(GX_OPTION) /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c 34.12 !endif 34.13 !if "$(MT)" != "" 34.14 -SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS) 34.15 +SA_LD_FLAGS = /manifest $(SA_LD_FLAGS) 34.16 !endif 34.17 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp 34.18 -SA_LFLAGS = $(SA_LINK_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE) 34.19 +SA_LFLAGS = $(SA_LD_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE) 34.20 34.21 # Note that we do not keep sawindbj.obj around as it would then 34.22 # get included in the dumpbin command in build_vm_def.sh 34.23 @@ -110,14 +110,14 @@ 34.24 # Use ";#2" for .dll and ";#1" for .exe in the MT command below: 34.25 $(SAWINDBG): $(SASRCFILE) 34.26 set INCLUDE=$(SA_INCLUDE)$(INCLUDE) 34.27 - $(CPP) @<< 34.28 + $(CXX) @<< 34.29 /I"$(BootStrapDir)/include" /I"$(BootStrapDir)/include/win32" 34.30 /I"$(GENERATED)" $(SA_CFLAGS) 34.31 $(SASRCFILE) 34.32 /out:sawindbg.obj 34.33 << 34.34 set LIB=$(SA_LIB)$(LIB) 34.35 - $(LINK) /out:$@ /DLL sawindbg.obj dbgeng.lib $(SA_LFLAGS) 34.36 + $(LD) /out:$@ /DLL sawindbg.obj dbgeng.lib $(SA_LFLAGS) 34.37 !if "$(MT)" != "" 34.38 $(MT) /manifest $(@F).manifest /outputresource:$(@F);#2 34.39 !endif
35.1 --- a/make/windows/makefiles/sanity.make Wed Feb 08 09:52:24 2012 +0100 35.2 +++ b/make/windows/makefiles/sanity.make Thu Feb 09 18:01:20 2012 -0800 35.3 @@ -31,5 +31,5 @@ 35.4 echo *** WARNING *** unrecognized cl.exe version $(MSC_VER) ($(RAW_MSC_VER)). Use FORCE_MSC_VER to override automatic detection. 35.5 35.6 checkLink: 35.7 - @ if "$(LINK_VER)" NEQ "710" if "$(LINK_VER)" NEQ "800" if "$(LINK_VER)" NEQ "900" if "$(LINK_VER)" NEQ "1000" \ 35.8 - echo *** WARNING *** unrecognized link.exe version $(LINK_VER) ($(RAW_LINK_VER)). Use FORCE_LINK_VER to override automatic detection. 35.9 + @ if "$(LD_VER)" NEQ "710" if "$(LD_VER)" NEQ "800" if "$(LD_VER)" NEQ "900" if "$(LD_VER)" NEQ "1000" \ 35.10 + echo *** WARNING *** unrecognized link.exe version $(LD_VER) ($(RAW_LD_VER)). Use FORCE_LD_VER to override automatic detection.
36.1 --- a/make/windows/makefiles/shared.make Wed Feb 08 09:52:24 2012 +0100 36.2 +++ b/make/windows/makefiles/shared.make Thu Feb 09 18:01:20 2012 -0800 36.3 @@ -30,8 +30,8 @@ 36.4 DIR=. 36.5 !endif 36.6 36.7 -!ifndef CPP 36.8 -CPP=cl.exe 36.9 +!ifndef CXX 36.10 +CXX=cl.exe 36.11 !endif 36.12 36.13
37.1 --- a/make/windows/makefiles/vm.make Wed Feb 08 09:52:24 2012 +0100 37.2 +++ b/make/windows/makefiles/vm.make Thu Feb 09 18:01:20 2012 -0800 37.3 @@ -32,12 +32,12 @@ 37.4 37.5 !ifdef RELEASE 37.6 !ifdef DEVELOP 37.7 -CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG" 37.8 +CXX_FLAGS=$(CXX_FLAGS) /D "DEBUG" 37.9 !else 37.10 -CPP_FLAGS=$(CPP_FLAGS) /D "PRODUCT" 37.11 +CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT" 37.12 !endif 37.13 !else 37.14 -CPP_FLAGS=$(CPP_FLAGS) /D "ASSERT" 37.15 +CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT" 37.16 !endif 37.17 37.18 !if "$(Variant)" == "core" 37.19 @@ -45,19 +45,19 @@ 37.20 !endif 37.21 37.22 !if "$(Variant)" == "kernel" 37.23 -CPP_FLAGS=$(CPP_FLAGS) /D "KERNEL" 37.24 +CXX_FLAGS=$(CXX_FLAGS) /D "KERNEL" 37.25 !endif 37.26 37.27 !if "$(Variant)" == "compiler1" 37.28 -CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" 37.29 +CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1" 37.30 !endif 37.31 37.32 !if "$(Variant)" == "compiler2" 37.33 -CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER2" 37.34 +CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER2" 37.35 !endif 37.36 37.37 !if "$(Variant)" == "tiered" 37.38 -CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "COMPILER2" 37.39 +CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1" /D "COMPILER2" 37.40 !endif 37.41 37.42 !if "$(BUILDARCH)" == "i486" 37.43 @@ -67,21 +67,21 @@ 37.44 !endif 37.45 37.46 # The following variables are defined in the generated local.make file. 37.47 -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\"" 37.48 -CPP_FLAGS=$(CPP_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" 37.49 -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\"" 37.50 -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" 37.51 -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" 37.52 -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 37.53 +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\"" 37.54 +CXX_FLAGS=$(CXX_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" 37.55 +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\"" 37.56 +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" 37.57 +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" 37.58 +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 37.59 37.60 !ifndef JAVASE_EMBEDDED 37.61 -CPP_FLAGS=$(CPP_FLAGS) /D "INCLUDE_TRACE" 37.62 +CXX_FLAGS=$(CXX_FLAGS) /D "INCLUDE_TRACE" 37.63 !endif 37.64 37.65 -CPP_FLAGS=$(CPP_FLAGS) $(CPP_INCLUDE_DIRS) 37.66 +CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS) 37.67 37.68 # Define that so jni.h is on correct side 37.69 -CPP_FLAGS=$(CPP_FLAGS) /D "_JNI_IMPLEMENTATION_" 37.70 +CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_" 37.71 37.72 !if "$(BUILDARCH)" == "ia64" 37.73 STACK_SIZE="/STACK:1048576,262144" 37.74 @@ -102,7 +102,7 @@ 37.75 37.76 # If you modify exports below please do the corresponding changes in 37.77 # src/share/tools/ProjectCreator/WinGammaPlatformVC7.java 37.78 -LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \ 37.79 +LD_FLAGS=$(LD_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \ 37.80 /export:JNI_GetDefaultJavaVMInitArgs \ 37.81 /export:JNI_CreateJavaVM \ 37.82 /export:JVM_FindClassFromBootLoader \ 37.83 @@ -118,25 +118,25 @@ 37.84 /export:JVM_GetThreadStateValues \ 37.85 /export:JVM_InitAgentProperties 37.86 37.87 -CPP_INCLUDE_DIRS=/I "..\generated" 37.88 +CXX_INCLUDE_DIRS=/I "..\generated" 37.89 37.90 !if exists($(ALTSRC)\share\vm) 37.91 -CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm" 37.92 +CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm" 37.93 !endif 37.94 37.95 !if exists($(ALTSRC)\os\windows\vm) 37.96 -CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm" 37.97 +CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm" 37.98 !endif 37.99 37.100 !if exists($(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm) 37.101 -CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm" 37.102 +CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm" 37.103 !endif 37.104 37.105 !if exists($(ALTSRC)\cpu\$(Platform_arch)\vm) 37.106 -CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm" 37.107 +CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm" 37.108 !endif 37.109 37.110 -CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) \ 37.111 +CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) \ 37.112 /I "$(COMMONSRC)\share\vm" \ 37.113 /I "$(COMMONSRC)\share\vm\precompiled" \ 37.114 /I "$(COMMONSRC)\share\vm\prims" \ 37.115 @@ -144,12 +144,12 @@ 37.116 /I "$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm" \ 37.117 /I "$(COMMONSRC)\cpu\$(Platform_arch)\vm" 37.118 37.119 -CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER 37.120 +CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER 37.121 37.122 !if "$(USE_PRECOMPILED_HEADER)" != "0" 37.123 -CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" 37.124 +CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" 37.125 !else 37.126 -CPP_USE_PCH=$(CPP_DONT_USE_PCH) 37.127 +CXX_USE_PCH=$(CXX_DONT_USE_PCH) 37.128 !endif 37.129 37.130 # Where to find the source code for the virtual machine (is this used?) 37.131 @@ -194,101 +194,101 @@ 37.132 # Special case files not using precompiled header files. 37.133 37.134 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 37.135 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 37.136 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 37.137 37.138 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp 37.139 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp 37.140 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp 37.141 37.142 os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 37.143 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 37.144 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 37.145 37.146 osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 37.147 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 37.148 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 37.149 37.150 conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 37.151 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 37.152 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 37.153 37.154 getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 37.155 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 37.156 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 37.157 37.158 opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp 37.159 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp 37.160 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp 37.161 37.162 bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 37.163 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 37.164 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 37.165 37.166 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 37.167 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 37.168 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 37.169 37.170 # Default rules for the Virtual Machine 37.171 {$(COMMONSRC)\share\vm\c1}.cpp.obj:: 37.172 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.173 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.174 37.175 {$(COMMONSRC)\share\vm\compiler}.cpp.obj:: 37.176 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.177 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.178 37.179 {$(COMMONSRC)\share\vm\code}.cpp.obj:: 37.180 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.181 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.182 37.183 {$(COMMONSRC)\share\vm\interpreter}.cpp.obj:: 37.184 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.185 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.186 37.187 {$(COMMONSRC)\share\vm\ci}.cpp.obj:: 37.188 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.189 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.190 37.191 {$(COMMONSRC)\share\vm\classfile}.cpp.obj:: 37.192 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.193 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.194 37.195 {$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj:: 37.196 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.197 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.198 37.199 {$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj:: 37.200 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.201 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.202 37.203 {$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj:: 37.204 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.205 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.206 37.207 {$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: 37.208 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.209 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.210 37.211 {$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj:: 37.212 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.213 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.214 37.215 {$(COMMONSRC)\share\vm\gc_interface}.cpp.obj:: 37.216 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.217 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.218 37.219 {$(COMMONSRC)\share\vm\asm}.cpp.obj:: 37.220 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.221 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.222 37.223 {$(COMMONSRC)\share\vm\memory}.cpp.obj:: 37.224 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.225 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.226 37.227 {$(COMMONSRC)\share\vm\oops}.cpp.obj:: 37.228 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.229 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.230 37.231 {$(COMMONSRC)\share\vm\prims}.cpp.obj:: 37.232 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.233 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.234 37.235 {$(COMMONSRC)\share\vm\runtime}.cpp.obj:: 37.236 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.237 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.238 37.239 {$(COMMONSRC)\share\vm\services}.cpp.obj:: 37.240 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.241 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.242 37.243 {$(COMMONSRC)\share\vm\trace}.cpp.obj:: 37.244 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.245 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.246 37.247 {$(COMMONSRC)\share\vm\utilities}.cpp.obj:: 37.248 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.249 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.250 37.251 {$(COMMONSRC)\share\vm\libadt}.cpp.obj:: 37.252 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.253 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.254 37.255 {$(COMMONSRC)\share\vm\opto}.cpp.obj:: 37.256 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.257 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.258 37.259 {$(COMMONSRC)\os\windows\vm}.cpp.obj:: 37.260 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.261 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.262 37.263 # This guy should remain a single colon rule because 37.264 # otherwise we can't specify the output filename. 37.265 @@ -296,113 +296,113 @@ 37.266 @$(RC) $(RC_FLAGS) /fo"$@" $< 37.267 37.268 {$(COMMONSRC)\cpu\$(Platform_arch)\vm}.cpp.obj:: 37.269 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.270 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.271 37.272 {$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj:: 37.273 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.274 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.275 37.276 {$(ALTSRC)\share\vm\c1}.cpp.obj:: 37.277 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.278 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.279 37.280 {$(ALTSRC)\share\vm\compiler}.cpp.obj:: 37.281 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.282 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.283 37.284 {$(ALTSRC)\share\vm\code}.cpp.obj:: 37.285 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.286 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.287 37.288 {$(ALTSRC)\share\vm\interpreter}.cpp.obj:: 37.289 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.290 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.291 37.292 {$(ALTSRC)\share\vm\ci}.cpp.obj:: 37.293 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.294 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.295 37.296 {$(ALTSRC)\share\vm\classfile}.cpp.obj:: 37.297 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.298 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.299 37.300 {$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj:: 37.301 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.302 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.303 37.304 {$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj:: 37.305 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.306 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.307 37.308 {$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj:: 37.309 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.310 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.311 37.312 {$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: 37.313 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.314 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.315 37.316 {$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj:: 37.317 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.318 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.319 37.320 {$(ALTSRC)\share\vm\gc_interface}.cpp.obj:: 37.321 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.322 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.323 37.324 {$(ALTSRC)\share\vm\asm}.cpp.obj:: 37.325 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.326 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.327 37.328 {$(ALTSRC)\share\vm\memory}.cpp.obj:: 37.329 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.330 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.331 37.332 {$(ALTSRC)\share\vm\oops}.cpp.obj:: 37.333 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.334 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.335 37.336 {$(ALTSRC)\share\vm\prims}.cpp.obj:: 37.337 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.338 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.339 37.340 {$(ALTSRC)\share\vm\runtime}.cpp.obj:: 37.341 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.342 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.343 37.344 {$(ALTSRC)\share\vm\services}.cpp.obj:: 37.345 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.346 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.347 37.348 {$(ALTSRC)\share\vm\trace}.cpp.obj:: 37.349 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.350 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.351 37.352 {$(ALTSRC)\share\vm\utilities}.cpp.obj:: 37.353 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.354 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.355 37.356 {$(ALTSRC)\share\vm\libadt}.cpp.obj:: 37.357 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.358 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.359 37.360 {$(ALTSRC)\share\vm\opto}.cpp.obj:: 37.361 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.362 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.363 37.364 {$(ALTSRC)\os\windows\vm}.cpp.obj:: 37.365 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.366 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.367 37.368 # otherwise we can't specify the output filename. 37.369 {$(ALTSRC)\os\windows\vm}.rc.res: 37.370 @$(RC) $(RC_FLAGS) /fo"$@" $< 37.371 37.372 {$(ALTSRC)\cpu\$(Platform_arch)\vm}.cpp.obj:: 37.373 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.374 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.375 37.376 {$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj:: 37.377 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.378 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.379 37.380 {..\generated\incls}.cpp.obj:: 37.381 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.382 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.383 37.384 {..\generated\adfiles}.cpp.obj:: 37.385 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.386 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.387 37.388 {..\generated\jvmtifiles}.cpp.obj:: 37.389 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.390 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.391 37.392 {$(ALTSRC)\share\vm\jfr}.cpp.obj:: 37.393 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.394 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.395 37.396 {$(ALTSRC)\share\vm\jfr\agent}.cpp.obj:: 37.397 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.398 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.399 37.400 {$(ALTSRC)\share\vm\jfr\agent\isolated_deps\util}.cpp.obj:: 37.401 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.402 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.403 37.404 {$(ALTSRC)\share\vm\jfr\jvm}.cpp.obj:: 37.405 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 37.406 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 37.407 37.408 default:: 37.409 37.410 _build_pch_file.obj: 37.411 @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp 37.412 - $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp 37.413 + $(CXX) $(CXX_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp
38.1 --- a/src/os/solaris/vm/os_solaris.cpp Wed Feb 08 09:52:24 2012 +0100 38.2 +++ b/src/os/solaris/vm/os_solaris.cpp Thu Feb 09 18:01:20 2012 -0800 38.3 @@ -4007,7 +4007,6 @@ 38.4 iaInfo->ia_uprilim = cur_class == new_class 38.5 ? IA_NOCHANGE : (pri_t)iaLimits.maxPrio; 38.6 iaInfo->ia_mode = IA_NOCHANGE; 38.7 - iaInfo->ia_nice = cur_class == new_class ? IA_NOCHANGE : NZERO; 38.8 if (ThreadPriorityVerbose) { 38.9 tty->print_cr("IA: [%d...%d] %d->%d\n", 38.10 iaLimits.minPrio, maxClamped, newPrio, iaInfo->ia_upri);
39.1 --- a/src/share/vm/runtime/vm_version.cpp Wed Feb 08 09:52:24 2012 +0100 39.2 +++ b/src/share/vm/runtime/vm_version.cpp Thu Feb 09 18:01:20 2012 -0800 39.3 @@ -165,6 +165,13 @@ 39.4 return VM_RELEASE; 39.5 } 39.6 39.7 +// NOTE: do *not* use stringStream. this function is called by 39.8 +// fatal error handlers. if the crash is in native thread, 39.9 +// stringStream cannot get resource allocated and will SEGV. 39.10 +const char* Abstract_VM_Version::jre_release_version() { 39.11 + return JRE_RELEASE_VERSION; 39.12 +} 39.13 + 39.14 #define OS LINUX_ONLY("linux") \ 39.15 WINDOWS_ONLY("windows") \ 39.16 SOLARIS_ONLY("solaris") \
40.1 --- a/src/share/vm/runtime/vm_version.hpp Wed Feb 08 09:52:24 2012 +0100 40.2 +++ b/src/share/vm/runtime/vm_version.hpp Thu Feb 09 18:01:20 2012 -0800 40.3 @@ -71,6 +71,7 @@ 40.4 40.5 // Internal version providing additional build information 40.6 static const char* internal_vm_info_string(); 40.7 + static const char* jre_release_version(); 40.8 40.9 // does HW support an 8-byte compare-exchange operation? 40.10 static bool supports_cx8() {return _supports_cx8;}
