/hg/icedtea6: Make javac versioning patch work with hs16 as well.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 30 12:48:11 PDT 2010
changeset 911fc7449289 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=911fc7449289
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 30 20:37:12 2010 +0100
Make javac versioning patch work with hs16 as well.
2010-03-30 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/6873059-javac-versioning-hotspot.patch:
Move to hotspot/original directory.
* Makefile.am: Make javac versioning patch for HotSpot
version-specific.
* patches/hotspot/hs16/6873059-javac-versioning-hotspot.patch:
Variant of earlier javac versioning patch for hs16 (direct
from OpenJDK7).
* patches/hotspot/original/6873059-javac-versioning-hotspot.patch,
Previous javac versioning patch modified for hs14.
diffstat:
5 files changed, 503 insertions(+), 246 deletions(-)
ChangeLog | 12
Makefile.am | 2
patches/hotspot/hs16/6873059-javac-versioning-hotspot.patch | 245 ++++++++++
patches/hotspot/original/6873059-javac-versioning-hotspot.patch | 245 ++++++++++
patches/openjdk/6873059-javac-versioning-hotspot.patch | 245 ----------
diffs (truncated from 778 to 500 lines):
diff -r 906953e7c9af -r 911fc7449289 ChangeLog
--- a/ChangeLog Tue Mar 30 14:36:22 2010 +0100
+++ b/ChangeLog Tue Mar 30 20:37:12 2010 +0100
@@ -1,3 +1,15 @@ 2010-03-30 Edward Nevill <ed at camswl.c
+2010-03-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6873059-javac-versioning-hotspot.patch:
+ Move to hotspot/original directory.
+ * Makefile.am: Make javac versioning patch for HotSpot
+ version-specific.
+ * patches/hotspot/hs16/6873059-javac-versioning-hotspot.patch:
+ Variant of earlier javac versioning patch for hs16 (direct
+ from OpenJDK7).
+ * patches/hotspot/original/6873059-javac-versioning-hotspot.patch,
+ Previous javac versioning patch modified for hs14.
+
2010-03-30 Edward Nevill <ed at camswl.com>
* bytecodeInterpreter.cpp
diff -r 906953e7c9af -r 911fc7449289 Makefile.am
--- a/Makefile.am Tue Mar 30 14:36:22 2010 +0100
+++ b/Makefile.am Tue Mar 30 20:37:12 2010 +0100
@@ -313,7 +313,7 @@ ICEDTEA_PATCHES = \
patches/extensions/netx-umask.patch \
patches/icedtea-jtreg-httpTest.patch \
patches/openjdk/6873059-javac-versioning-corba.patch \
- patches/openjdk/6873059-javac-versioning-hotspot.patch \
+ patches/hotspot/$(HSBUILD)/6873059-javac-versioning-hotspot.patch \
patches/openjdk/6873059-javac-versioning-jdk.patch
if WITH_RHINO
diff -r 906953e7c9af -r 911fc7449289 patches/hotspot/hs16/6873059-javac-versioning-hotspot.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs16/6873059-javac-versioning-hotspot.patch Tue Mar 30 20:37:12 2010 +0100
@@ -0,0 +1,245 @@
+# HG changeset patch
+# User andrew
+# Date 1252756207 -3600
+# Node ID 0fc81f0a8ca8642c9e4b6901fa23b59c29ac81d7
+# Parent 682194ca1d8d5e705da06c5974ffcda76b0a7add
+6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
+Summary: The build fails if the bootstrap JDK defaults to <1.5
+Reviewed-by: jcoomes
+
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/linux/makefiles/jvmti.make
+--- a/make/linux/makefiles/jvmti.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/linux/makefiles/jvmti.make Sat Sep 12 12:50:07 2009 +0100
+@@ -70,10 +70,10 @@
+ both = $(JvmtiGenClass) $(JvmtiSrcDir)/jvmti.xml $(JvmtiSrcDir)/jvmtiLib.xsl
+
+ $(JvmtiGenClass): $(JvmtiGenSource)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiGenSource)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
+
+ $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
+
+ $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
+ @echo Generating $@
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/linux/makefiles/rules.make
+--- a/make/linux/makefiles/rules.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/linux/makefiles/rules.make Sat Sep 12 12:50:07 2009 +0100
+@@ -122,12 +122,20 @@
+ endif
+ endif
+
++COMPILE.JAVAC += $(BOOTSTRAP_JAVAC_FLAGS)
++
+ SUM = /usr/bin/sum
+
+ # 'gmake MAKE_VERBOSE=y' gives all the gory details.
+ QUIETLY$(MAKE_VERBOSE) = @
+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
+
++# Settings for javac
++BOOT_SOURCE_LANGUAGE_VERSION = 6
++BOOT_TARGET_CLASS_VERSION = 6
++JAVAC_FLAGS = -g -encoding ascii
++BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++
+ # With parallel makes, print a message at the end of compilation.
+ ifeq ($(findstring j,$(MFLAGS)),j)
+ COMPILE_DONE = && { echo Done with $<; }
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/linux/makefiles/sa.make
+--- a/make/linux/makefiles/sa.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/linux/makefiles/sa.make Sat Sep 12 12:50:07 2009 +0100
+@@ -74,8 +74,8 @@
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
+
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/linux/makefiles/top.make
+--- a/make/linux/makefiles/top.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/linux/makefiles/top.make Sat Sep 12 12:50:07 2009 +0100
+@@ -24,7 +24,7 @@
+
+ # top.make is included in the Makefile in the build directories.
+ # It DOES NOT include the vm dependency info in order to be faster.
+-# It's main job is to implement the incremental form of make lists.
++# Its main job is to implement the incremental form of make lists.
+ # It also:
+ # -builds and runs adlc via adlc.make
+ # -generates JVMTI source and docs via jvmti.make (JSR-163)
+@@ -114,7 +114,7 @@
+ # make makeDeps: (and zap the cached db files to force a nonincremental run)
+
+ $(GENERATED)/$(MakeDepsClass): $(MakeDepsSources)
+- @$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -g -d $(GENERATED) $(MakeDepsSources)
++ @$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources)
+ @echo Removing $(Incremental_Lists) to force regeneration.
+ @rm -f $(Incremental_Lists)
+ @$(CDG) echo >$(Cached_plat)
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/solaris/makefiles/jvmti.make
+--- a/make/solaris/makefiles/jvmti.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/solaris/makefiles/jvmti.make Sat Sep 12 12:50:07 2009 +0100
+@@ -69,10 +69,10 @@
+ both = $(JvmtiGenClass) $(JvmtiSrcDir)/jvmti.xml $(JvmtiSrcDir)/jvmtiLib.xsl
+
+ $(JvmtiGenClass): $(JvmtiGenSource)
+- $(QUIETLY) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiGenSource)
++ $(QUIETLY) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
+
+ $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
+- $(QUIETLY) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
++ $(QUIETLY) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
+
+ $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
+ @echo Generating $@
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/solaris/makefiles/rules.make
+--- a/make/solaris/makefiles/rules.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/solaris/makefiles/rules.make Sat Sep 12 12:50:07 2009 +0100
+@@ -122,12 +122,20 @@
+ endif
+ endif
+
++COMPILE.JAVAC += $(BOOTSTRAP_JAVAC_FLAGS)
++
+ SUM = /usr/bin/sum
+
+ # 'gmake MAKE_VERBOSE=y' gives all the gory details.
+ QUIETLY$(MAKE_VERBOSE) = @
+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
+
++# Settings for javac
++BOOT_SOURCE_LANGUAGE_VERSION = 6
++BOOT_TARGET_CLASS_VERSION = 6
++JAVAC_FLAGS = -g -encoding ascii
++BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++
+ # With parallel makes, print a message at the end of compilation.
+ ifeq ($(findstring j,$(MFLAGS)),j)
+ COMPILE_DONE = && { echo Done with $<; }
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/solaris/makefiles/sa.make
+--- a/make/solaris/makefiles/sa.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/solaris/makefiles/sa.make Sat Sep 12 12:50:07 2009 +0100
+@@ -67,8 +67,8 @@
+ $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+- $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+- $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
++ $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
++ $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
+
+ $(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/solaris/makefiles/top.make
+--- a/make/solaris/makefiles/top.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/solaris/makefiles/top.make Sat Sep 12 12:50:07 2009 +0100
+@@ -24,7 +24,7 @@
+
+ # top.make is included in the Makefile in the build directories.
+ # It DOES NOT include the vm dependency info in order to be faster.
+-# It's main job is to implement the incremental form of make lists.
++# Its main job is to implement the incremental form of make lists.
+ # It also:
+ # -builds and runs adlc via adlc.make
+ # -generates JVMTI source and docs via jvmti.make (JSR-163)
+@@ -112,7 +112,7 @@
+ # make makeDeps: (and zap the cached db files to force a nonincremental run)
+
+ $(GENERATED)/$(MakeDepsClass): $(MakeDepsSources)
+- @$(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -g -d $(GENERATED) $(MakeDepsSources)
++ @$(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources)
+ @echo Removing $(Incremental_Lists) to force regeneration.
+ @rm -f $(Incremental_Lists)
+ @$(CDG) echo >$(Cached_plat)
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/windows/makefiles/generated.make
+--- a/make/windows/makefiles/generated.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/windows/makefiles/generated.make Sat Sep 12 12:50:07 2009 +0100
+@@ -91,7 +91,7 @@
+ classes/MakeDeps.class: $(MakeDepsSources)
+ if exist classes rmdir /s /q classes
+ mkdir classes
+- $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -g -d classes $(MakeDepsSources)
++ $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -d classes $(MakeDepsSources)
+
+ !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
+
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/windows/makefiles/jvmti.make
+--- a/make/windows/makefiles/jvmti.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/windows/makefiles/jvmti.make Sat Sep 12 12:50:07 2009 +0100
+@@ -68,10 +68,10 @@
+ @if not exist $(JvmtiOutDir) mkdir $(JvmtiOutDir)
+
+ $(JvmtiGenClass): $(JvmtiGenSource)
+- $(COMPILE_JAVAC) -g -d $(JvmtiOutDir) $(JvmtiGenSource)
++ $(COMPILE_JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
+
+ $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
+- @$(COMPILE_JAVAC) -g -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
++ @$(COMPILE_JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
+
+ $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
+ @echo Generating $@
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/windows/makefiles/rules.make
+--- a/make/windows/makefiles/rules.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/windows/makefiles/rules.make Sat Sep 12 12:50:07 2009 +0100
+@@ -29,7 +29,7 @@
+ RUN_JAVAP=$(BootStrapDir)\bin\javap
+ RUN_JAVAH=$(BootStrapDir)\bin\javah
+ RUN_JAR=$(BootStrapDir)\bin\jar
+-COMPILE_JAVAC=$(BootStrapDir)\bin\javac
++COMPILE_JAVAC=$(BootStrapDir)\bin\javac $(BOOTSTRAP_JAVAC_FLAGS)
+ COMPILE_RMIC=$(BootStrapDir)\bin\rmic
+ BOOT_JAVA_HOME=$(BootStrapDir)
+ !else
+@@ -37,11 +37,17 @@
+ RUN_JAVAP=javap
+ RUN_JAVAH=javah
+ RUN_JAR=jar
+-COMPILE_JAVAC=javac
++COMPILE_JAVAC=javac $(BOOTSTRAP_JAVAC_FLAGS)
+ COMPILE_RMIC=rmic
+ BOOT_JAVA_HOME=
+ !endif
+
++# Settings for javac
++BOOT_SOURCE_LANGUAGE_VERSION=6
++BOOT_TARGET_CLASS_VERSION=6
++JAVAC_FLAGS=-g -encoding ascii
++BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++
+ ProjectFile=vm.vcproj
+
+ !if "$(MSC_VER)" == "1200"
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/windows/makefiles/sa.make
+--- a/make/windows/makefiles/sa.make Thu Sep 10 09:04:41 2009 -0400
++++ b/make/windows/makefiles/sa.make Sat Sep 12 12:50:07 2009 +0100
+@@ -55,9 +55,9 @@
+ $(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\)
+ @if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR)
+ @echo ...Building sa-jdi.jar
+- @echo ...$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) ....
+- @$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\)
+- @$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\)
++ @echo ...$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) ....
++ @$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\)
++ @$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\)
+ $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES)
+ $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
+diff -r 682194ca1d8d -r 0fc81f0a8ca8 make/windows/projectfiles/common/Makefile
+--- a/make/windows/projectfiles/common/Makefile Thu Sep 10 09:04:41 2009 -0400
++++ b/make/windows/projectfiles/common/Makefile Sat Sep 12 12:50:07 2009 +0100
+@@ -179,6 +179,6 @@
+ $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class: $(MakeDepsSources)
+ @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes
+ @mkdir $(HOTSPOTBUILDSPACE)\classes
+- @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\MakeDeps -g -d $(HOTSPOTBUILDSPACE)/classes $(MakeDepsSources)
++ @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\MakeDeps -d $(HOTSPOTBUILDSPACE)/classes $(MakeDepsSources)
+
+ FORCE:
diff -r 906953e7c9af -r 911fc7449289 patches/hotspot/original/6873059-javac-versioning-hotspot.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/6873059-javac-versioning-hotspot.patch Tue Mar 30 20:37:12 2010 +0100
@@ -0,0 +1,245 @@
+# HG changeset patch
+# User andrew
+# Date 1252756207 -3600
+# Node ID 0fc81f0a8ca8642c9e4b6901fa23b59c29ac81d7
+# Parent 682194ca1d8d5e705da06c5974ffcda76b0a7add
+6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
+Summary: The build fails if the bootstrap JDK defaults to <1.5
+Reviewed-by: jcoomes
+
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make
+--- openjdk.orig/hotspot/make/linux/makefiles/jvmti.make 2010-03-29 21:25:49.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/jvmti.make 2010-03-29 21:30:06.000000000 +0100
+@@ -70,10 +70,10 @@
+ both = $(JvmtiGenClass) $(JvmtiSrcDir)/jvmti.xml $(JvmtiSrcDir)/jvmtiLib.xsl
+
+ $(JvmtiGenClass): $(JvmtiGenSource)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiGenSource)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
+
+ $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
+
+ $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
+ @echo Generating $@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2010-03-29 21:25:49.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/rules.make 2010-03-29 21:30:06.000000000 +0100
+@@ -122,12 +122,20 @@
+ endif
+ endif
+
++COMPILE.JAVAC += $(BOOTSTRAP_JAVAC_FLAGS)
++
+ SUM = /usr/bin/sum
+
+ # 'gmake MAKE_VERBOSE=y' gives all the gory details.
+ QUIETLY$(MAKE_VERBOSE) = @
+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
+
++# Settings for javac
++BOOT_SOURCE_LANGUAGE_VERSION = 6
++BOOT_TARGET_CLASS_VERSION = 6
++JAVAC_FLAGS = -g -encoding ascii
++BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++
+ # With parallel makes, print a message at the end of compilation.
+ ifeq ($(findstring j,$(MFLAGS)),j)
+ COMPILE_DONE = && { echo Done with $<; }
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/linux/makefiles/sa.make
+--- openjdk.orig/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:25:48.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:30:06.000000000 +0100
+@@ -74,8 +74,8 @@
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
+
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/top.make openjdk/hotspot/make/linux/makefiles/top.make
+--- openjdk.orig/hotspot/make/linux/makefiles/top.make 2010-03-29 21:25:49.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/top.make 2010-03-29 21:30:06.000000000 +0100
+@@ -24,7 +24,7 @@
+
+ # top.make is included in the Makefile in the build directories.
+ # It DOES NOT include the vm dependency info in order to be faster.
+-# It's main job is to implement the incremental form of make lists.
++# Its main job is to implement the incremental form of make lists.
+ # It also:
+ # -builds and runs adlc via adlc.make
+ # -generates JVMTI source and docs via jvmti.make (JSR-163)
+@@ -116,7 +116,7 @@
+ # make makeDeps: (and zap the cached db files to force a nonincremental run)
+
+ $(GENERATED)/$(MakeDepsClass): $(MakeDepsSources)
+- @$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -g -d $(GENERATED) $(MakeDepsSources)
++ @$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources)
+ @echo Removing $(Incremental_Lists) to force regeneration.
+ @rm -f $(Incremental_Lists)
+ @$(CDG) echo >$(Cached_plat)
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/jvmti.make openjdk/hotspot/make/solaris/makefiles/jvmti.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/jvmti.make 2010-02-17 03:11:04.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/jvmti.make 2010-03-29 21:30:06.000000000 +0100
+@@ -69,10 +69,10 @@
+ both = $(JvmtiGenClass) $(JvmtiSrcDir)/jvmti.xml $(JvmtiSrcDir)/jvmtiLib.xsl
+
+ $(JvmtiGenClass): $(JvmtiGenSource)
+- $(QUIETLY) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiGenSource)
++ $(QUIETLY) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
+
+ $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
+- $(QUIETLY) $(COMPILE.JAVAC) -g -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
++ $(QUIETLY) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
+
+ $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
+ @echo Generating $@
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2010-03-29 21:25:49.000000000 +0100
++++ openjdk/hotspot/make/solaris/makefiles/rules.make 2010-03-29 21:30:06.000000000 +0100
+@@ -122,12 +122,20 @@
+ endif
+ endif
+
++COMPILE.JAVAC += $(BOOTSTRAP_JAVAC_FLAGS)
++
+ SUM = /usr/bin/sum
+
+ # 'gmake MAKE_VERBOSE=y' gives all the gory details.
+ QUIETLY$(MAKE_VERBOSE) = @
+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
+
++# Settings for javac
++BOOT_SOURCE_LANGUAGE_VERSION = 6
++BOOT_TARGET_CLASS_VERSION = 6
++JAVAC_FLAGS = -g -encoding ascii
++BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++
+ # With parallel makes, print a message at the end of compilation.
+ ifeq ($(findstring j,$(MFLAGS)),j)
+ COMPILE_DONE = && { echo Done with $<; }
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/sa.make openjdk/hotspot/make/solaris/makefiles/sa.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/sa.make 2010-02-17 03:11:04.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/sa.make 2010-03-29 21:30:06.000000000 +0100
+@@ -67,8 +67,8 @@
+ $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+- $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+- $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
++ $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
++ $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
+
+ $(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/top.make openjdk/hotspot/make/solaris/makefiles/top.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/top.make 2010-02-17 03:11:04.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/top.make 2010-03-29 21:30:06.000000000 +0100
+@@ -24,7 +24,7 @@
+
+ # top.make is included in the Makefile in the build directories.
+ # It DOES NOT include the vm dependency info in order to be faster.
+-# It's main job is to implement the incremental form of make lists.
++# Its main job is to implement the incremental form of make lists.
+ # It also:
+ # -builds and runs adlc via adlc.make
+ # -generates JVMTI source and docs via jvmti.make (JSR-163)
+@@ -112,7 +112,7 @@
+ # make makeDeps: (and zap the cached db files to force a nonincremental run)
+
+ $(GENERATED)/$(MakeDepsClass): $(MakeDepsSources)
+- @$(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -g -d $(GENERATED) $(MakeDepsSources)
++ @$(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources)
+ @echo Removing $(Incremental_Lists) to force regeneration.
+ @rm -f $(Incremental_Lists)
+ @$(CDG) echo >$(Cached_plat)
+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/generated.make openjdk/hotspot/make/windows/makefiles/generated.make
+--- openjdk.orig/hotspot/make/windows/makefiles/generated.make 2010-02-17 03:11:04.000000000 +0000
++++ openjdk/hotspot/make/windows/makefiles/generated.make 2010-03-29 21:30:06.000000000 +0100
+@@ -91,7 +91,7 @@
+ classes/MakeDeps.class: $(MakeDepsSources)
+ if exist classes rmdir /s /q classes
+ mkdir classes
+- $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -g -d classes $(MakeDepsSources)
++ $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -d classes $(MakeDepsSources)
+
+ !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
+
+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/jvmti.make openjdk/hotspot/make/windows/makefiles/jvmti.make
+--- openjdk.orig/hotspot/make/windows/makefiles/jvmti.make 2010-02-17 03:11:04.000000000 +0000
++++ openjdk/hotspot/make/windows/makefiles/jvmti.make 2010-03-29 21:30:06.000000000 +0100
+@@ -68,10 +68,10 @@
+ @if not exist $(JvmtiOutDir) mkdir $(JvmtiOutDir)
+
+ $(JvmtiGenClass): $(JvmtiGenSource)
+- $(COMPILE_JAVAC) -g -d $(JvmtiOutDir) $(JvmtiGenSource)
++ $(COMPILE_JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
+
+ $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
+- @$(COMPILE_JAVAC) -g -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
++ @$(COMPILE_JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
+
+ $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
+ @echo Generating $@
+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make 2010-02-17 03:11:04.000000000 +0000
++++ openjdk/hotspot/make/windows/makefiles/rules.make 2010-03-29 21:30:42.000000000 +0100
+@@ -29,7 +29,7 @@
+ RUN_JAVAP=$(BootStrapDir)\bin\javap
+ RUN_JAVAH=$(BootStrapDir)\bin\javah
+ RUN_JAR=$(BootStrapDir)\bin\jar
+-COMPILE_JAVAC=$(BootStrapDir)\bin\javac
++COMPILE_JAVAC=$(BootStrapDir)\bin\javac $(BOOTSTRAP_JAVAC_FLAGS)
+ COMPILE_RMIC=$(BootStrapDir)\bin\rmic
+ BOOT_JAVA_HOME=$(BootStrapDir)
+ !else
+@@ -37,11 +37,17 @@
+ RUN_JAVAP=javap
+ RUN_JAVAH=javah
+ RUN_JAR=jar
+-COMPILE_JAVAC=javac
++COMPILE_JAVAC=javac $(BOOTSTRAP_JAVAC_FLAGS)
+ COMPILE_RMIC=rmic
+ BOOT_JAVA_HOME=
+ !endif
+
++# Settings for javac
++BOOT_SOURCE_LANGUAGE_VERSION=6
++BOOT_TARGET_CLASS_VERSION=6
++JAVAC_FLAGS=-g -encoding ascii
++BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++
+ !if "$(MSC_VER)" == "1200"
More information about the distro-pkg-dev
mailing list