. Use CXX and CXXFLAGS for compiling C++ code, not CPP and CPPFLAGS.

  Also, respect the setting of CXX and CXXFLAGS.

2 files changed, 77 insertions, 0 deletions

diff --git a/java/jdk13/files/patch-adlc.make b/java/jdk13/files/patch-adlc.make
new file mode 100644
index 000000000000..ad02fde2c93a
--- /dev/null
+++ b/java/jdk13/files/patch-adlc.make
@@ -0,0 +1,42 @@
+$FreeBSD$
+
+--- ../../hotspot1.3.1/build/linux/makefiles/adlc.make	14 Jan 2002 12:49:49 -0000	1.2
++++ ../../hotspot1.3.1/build/linux/makefiles/adlc.make	22 Nov 2004 17:19:42 -0000
+@@ -53,8 +53,8 @@
+ #  /usr/dist/share/devpro/5.x-sparc/bin/CC
+ #  man -M /usr/dist/share/devpro/5.x-sparc/man CC
+ 
+-CPP       = g++
+-CPPFLAGS  = -DASSERT -g -o $@
++CXX       ?= g++
++CXXFLAGS  += -DASSERT -g -o $@
+ # -o      object file-name
+ # +w      Additional warnings: Nonportable, Likely mistakes or inefficient
+ # -xwe    Treat all warnings as errors (skipped for now)
+@@ -64,7 +64,7 @@
+ # $<      first component of target name
+ # $@      target name
+ 
+-CPPFLAGS += ${SYSDEFS} ${INCLUDES}
++CXXFLAGS += ${SYSDEFS} ${INCLUDES}
+ 
+ OBJECTNAMES = \
+ 	adlparse.o \
+@@ -92,7 +92,7 @@
+ 
+ $(EXEC) : $(OBJECTS)
+ 	@echo Making adlc
+-	@$(CPP) $(DFLAGS) $(LFLAGS) $(OBJECTS) -o $(EXEC)
++	@$(CXX) $(DFLAGS) $(LFLAGS) $(OBJECTS) -o $(EXEC)
+ 
+ # The source files refer to ostream.h, which sparcworks calls iostream.h
+ $(OBJECTS): ostream.h
+@@ -164,7 +164,7 @@
+ $(SOURCE.AD): $(SOURCES.AD)
+ 	@cat $(SOURCES.AD) > $(SOURCE.AD)
+ 
+-COMPILE   = ${CPP} ${CPPFLAGS} ${CFLAGS}
++COMPILE   = ${CXX} ${CXXFLAGS} ${CFLAGS}
+ 
+ COMPILE.o = ${COMPILE} -c
+ COMPILE.i = ${COMPILE} -E
diff --git a/java/jdk13/files/patch-vm.make b/java/jdk13/files/patch-vm.make
new file mode 100644
index 000000000000..79a99183fa0e
--- /dev/null
+++ b/java/jdk13/files/patch-vm.make
@@ -0,0 +1,35 @@
+$FreeBSD$
+
+--- ../../hotspot1.3.1/build/linux/makefiles/vm.make	23 Jul 2004 18:17:54 -0000	1.7
++++ ../../hotspot1.3.1/build/linux/makefiles/vm.make	22 Nov 2004 17:19:42 -0000
+@@ -62,7 +62,7 @@
+ BUILD_VERSION = -DHOTSPOT_BUILD_VERSION="\"$(HOTSPOT_BUILD_VERSION)\""
+ BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = 
+ 
+-CPPFLAGS = ${SYSDEFS} ${INCLUDES} ${BUILD_VERSION}
++CXXFLAGS += ${SYSDEFS} ${INCLUDES} ${BUILD_VERSION}
+ 
+ # Suppress warnings (for now)
+ CFLAGS += -w
+@@ -70,9 +70,9 @@
+ # do not include shared lib path in a.outs
+ #AOUT_FLAGS += -norunpath
+ 
+-COMPILE   = ${CPP} ${CPPFLAGS} ${CFLAGS}
+-LINK_LIB  = ${CPP} -shared -mimpure-text
+-LINK      = ${CPP} ${AOUT_FLAGS}
++COMPILE   = ${CXX} ${CXXFLAGS} ${CFLAGS}
++LINK_LIB  = ${CXX} -shared -mimpure-text
++LINK      = ${CXX} ${AOUT_FLAGS}
+ 
+ 
+ COMPILE.s = ${COMPILE} -S
+@@ -157,7 +157,7 @@
+ LAUNCHER = $(GAMMADIR)/src/os/$(Platform_os_family)/launcher
+ LAUNCHERFLAGS = -I$(LAUNCHER) -I$(GAMMADIR)/src/share/vm/prims
+ launcher.o: launcher.c $(LAUNCHER)/java.c $(LAUNCHER)/java_md.c
+-	$(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS)
++	$(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CXXFLAGS)
+ 
+ # Figure out how to turn this off:
+ #LAUNCHERFLAGS += -DOLDJAVA