Mercurial > hg > release > icedtea6-1.9
changeset 2057:16c6dc1a966e
Remove 6873059 fixes which are now upstream.
2010-04-11 Andrew John Hughes <ahughes@redhat.com>
* patches/hotspot/original/6873059-javac-versioning-hotspot.patch,
* patches/openjdk/6873059-javac-versioning-corba.patch,
* patches/openjdk/6873059-javac-versioning-jdk.patch:
Removed, upstreamed.
* Makefile.am:
Move 6873059 to hs17-specific block.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Sun, 11 Apr 2010 23:37:34 +0100 |
| parents | 18c52f572f18 |
| children | 8dea2e0c2bdd |
| files | ChangeLog Makefile.am patches/hotspot/original/6873059-javac-versioning-hotspot.patch patches/openjdk/6873059-javac-versioning-corba.patch patches/openjdk/6873059-javac-versioning-jdk.patch |
| diffstat | 5 files changed, 12 insertions(+), 286 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Apr 11 23:33:30 2010 +0100 +++ b/ChangeLog Sun Apr 11 23:37:34 2010 +0100 @@ -1,3 +1,12 @@ +2010-04-11 Andrew John Hughes <ahughes@redhat.com> + + * patches/hotspot/original/6873059-javac-versioning-hotspot.patch, + * patches/openjdk/6873059-javac-versioning-corba.patch, + * patches/openjdk/6873059-javac-versioning-jdk.patch: + Removed, upstreamed. + * Makefile.am: + Move 6873059 to hs17-specific block. + 2010-04-11 Andrew John Hughes <ahughes@redhat.com> Support hs17.
--- a/Makefile.am Sun Apr 11 23:33:30 2010 +0100 +++ b/Makefile.am Sun Apr 11 23:37:34 2010 +0100 @@ -299,12 +299,12 @@ patches/extensions/netx.patch \ patches/extensions/netx-dist.patch \ patches/extensions/netx-umask.patch \ - patches/icedtea-jtreg-httpTest.patch \ - patches/hotspot/$(HSBUILD)/6873059-javac-versioning-hotspot.patch + patches/icedtea-jtreg-httpTest.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ - patches/openjdk/6896472-missing_libjsig.patch + patches/openjdk/6896472-missing_libjsig.patch \ + patches/hotspot/$(HSBUILD)/6873059-javac-versioning-hotspot.patch endif if WITH_RHINO
--- a/patches/hotspot/original/6873059-javac-versioning-hotspot.patch Sun Apr 11 23:33:30 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,245 +0,0 @@ -# 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 ---- openjdk.orig/hotspot/make/linux/makefiles/jvmti.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/linux/makefiles/rules.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/linux/makefiles/sa.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/linux/makefiles/top.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/solaris/makefiles/jvmti.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/solaris/makefiles/rules.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/solaris/makefiles/sa.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/solaris/makefiles/top.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/windows/makefiles/generated.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/windows/makefiles/jvmti.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/windows/makefiles/rules.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/windows/makefiles/sa.make Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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 ---- openjdk.orig/hotspot/make/windows/projectfiles/common/Makefile Thu Sep 10 09:04:41 2009 -0400 -+++ openjdk/hotspot/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:
--- a/patches/openjdk/6873059-javac-versioning-corba.patch Sun Apr 11 23:33:30 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1250728138 -3600 -# Node ID 8001ba2bf10d8f6f9f26bf3684e9fd06ddb145ba -# Parent 175bd68779546078dbdb6dacd7f0aced79ed22b1 -6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk javac -Summary: The bootstrap javac currently uses the default source and targets of the boot javac -Reviewed-by: jjg, ohair - -diff -r 175bd6877954 -r 8001ba2bf10d make/common/shared/Defs-java.gmk ---- openjdk.orig/corba/make/common/shared/Defs-java.gmk Fri Aug 14 08:49:25 2009 -0700 -+++ openjdk/corba/make/common/shared/Defs-java.gmk Thu Aug 20 01:28:58 2009 +0100 -@@ -179,7 +179,9 @@ - ifeq ($(COMPILER_WARNINGS_FATAL), true) - BOOT_JAVACFLAGS += -Werror - endif --BOOT_JAVACFLAGS += -encoding ascii -+BOOT_SOURCE_LANGUAGE_VERSION = 6 -+BOOT_TARGET_CLASS_VERSION = 6 -+BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) - - BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS) - BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
--- a/patches/openjdk/6873059-javac-versioning-jdk.patch Sun Apr 11 23:33:30 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/common/shared/Defs-java.gmk openjdk/jdk/make/common/shared/Defs-java.gmk ---- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2010-03-29 23:19:08.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs-java.gmk 2010-03-29 23:22:38.000000000 +0100 -@@ -186,7 +186,10 @@ - ifeq ($(COMPILER_WARNINGS_FATAL), true) - BOOT_JAVACFLAGS += -Werror - endif --BOOT_JAVACFLAGS += -encoding ascii -+ -+BOOT_SOURCE_LANGUAGE_VERSION = 6 -+BOOT_TARGET_CLASS_VERSION = 6 -+BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) - - BOOT_JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) -