/hg/icedtea: PR icedtea/751: Make IcedTea7 bootstrap IcedTea7
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jul 5 05:49:13 PDT 2011
changeset 91be8105cfa7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=91be8105cfa7
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jul 05 13:48:51 2011 +0100
PR icedtea/751: Make IcedTea7 bootstrap IcedTea7
2011-07-05 Andrew John Hughes <ahughes at redhat.com>
PR icedtea/751
* Makefile.am: (ICEDTEA_BOOT_PATCHES): Include compile-for-7
patch if javac supports diamond. This makes the HotSpot
build use source/target 7, allowing it to compile the JDK
code it depends on.
* javac.in: Add -XDignore.symbol.file=true when using javac to
avoid numerous proprietary warnings.
* patches/boot/compile-for-7.patch: Set
SOURCE_LANGUAGE_VERSION/TARGET_CLASS_VERSION use 7 in
HotSpot instead of 6.
* patches/boot/hotspot-jdk-dependency.patch: Include the *nix-
specific code in solaris/classes.
diffstat:
ChangeLog | 17 +++++++++++++
Makefile.am | 2 +
javac.in | 3 +-
patches/boot/compile-for-7.patch | 39 +++++++++++++++++++++++++++++++
patches/boot/hotspot-jdk-dependency.patch | 4 +-
5 files changed, 62 insertions(+), 3 deletions(-)
diffs (109 lines):
diff -r 9ec64ff41e91 -r 91be8105cfa7 ChangeLog
--- a/ChangeLog Wed Jun 29 18:16:57 2011 +0100
+++ b/ChangeLog Tue Jul 05 13:48:51 2011 +0100
@@ -1,3 +1,20 @@
+2011-07-05 Andrew John Hughes <ahughes at redhat.com>
+
+ PR icedtea/751
+ * Makefile.am:
+ (ICEDTEA_BOOT_PATCHES): Include compile-for-7
+ patch if javac supports diamond. This makes
+ the HotSpot build use source/target 7, allowing
+ it to compile the JDK code it depends on.
+ * javac.in: Add -XDignore.symbol.file=true
+ when using javac to avoid numerous proprietary
+ warnings.
+ * patches/boot/compile-for-7.patch:
+ Set SOURCE_LANGUAGE_VERSION/TARGET_CLASS_VERSION
+ use 7 in HotSpot instead of 6.
+ * patches/boot/hotspot-jdk-dependency.patch:
+ Include the *nix-specific code in solaris/classes.
+
2011-06-29 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
diff -r 9ec64ff41e91 -r 91be8105cfa7 Makefile.am
--- a/Makefile.am Wed Jun 29 18:16:57 2011 +0100
+++ b/Makefile.am Tue Jul 05 13:48:51 2011 +0100
@@ -398,6 +398,8 @@
if JAVAC_LACKS_DIAMOND
ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch
+else
+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7.patch
endif
ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES)
diff -r 9ec64ff41e91 -r 91be8105cfa7 javac.in
--- a/javac.in Wed Jun 29 18:16:57 2011 +0100
+++ b/javac.in Tue Jul 05 13:48:51 2011 +0100
@@ -20,7 +20,8 @@
push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'
unless grep {$_ eq '-bootclasspath'} @ARGV;
my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
-my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source', '-J-Xmx1024m');
+my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source',
+ '-XDignore.symbol.file=true', '-J-Xmx1024m');
# Work around ecj's inability to handle duplicate command-line
# options and unknown javac options.
diff -r 9ec64ff41e91 -r 91be8105cfa7 patches/boot/compile-for-7.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/compile-for-7.patch Tue Jul 05 13:48:51 2011 +0100
@@ -0,0 +1,42 @@
+diff -r f7e8b10f51c6 make/linux/makefiles/rules.make
+--- openjdk-boot/hotspot/make/linux/makefiles/rules.make Tue Jun 28 00:25:25 2011 +0100
++++ openjdk-boot/hotspot/make/linux/makefiles/rules.make Tue Jul 05 11:59:08 2011 +0100
+@@ -139,8 +139,8 @@
+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
+
+ # Settings for javac
+-BOOT_SOURCE_LANGUAGE_VERSION = 6
+-BOOT_TARGET_CLASS_VERSION = 6
++BOOT_SOURCE_LANGUAGE_VERSION = 7
++BOOT_TARGET_CLASS_VERSION = 7
+ JAVAC_FLAGS = -g -encoding ascii
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+diff -r f7e8b10f51c6 make/solaris/makefiles/rules.make
+--- openjdk-boot/hotspot/make/solaris/makefiles/rules.make Tue Jun 28 00:25:25 2011 +0100
++++ openjdk-boot/hotspot/make/solaris/makefiles/rules.make Tue Jul 05 11:59:08 2011 +0100
+@@ -131,8 +131,8 @@
+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
+
+ # Settings for javac
+-BOOT_SOURCE_LANGUAGE_VERSION = 6
+-BOOT_TARGET_CLASS_VERSION = 6
++BOOT_SOURCE_LANGUAGE_VERSION = 7
++BOOT_TARGET_CLASS_VERSION = 7
+ JAVAC_FLAGS = -g -encoding ascii
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+diff -r f7e8b10f51c6 make/windows/makefiles/rules.make
+--- openjdk-boot/hotspot/make/windows/makefiles/rules.make Tue Jun 28 00:25:25 2011 +0100
++++ openjdk-boot/hotspot/make/windows/makefiles/rules.make Tue Jul 05 11:59:08 2011 +0100
+@@ -43,8 +43,8 @@
+ !endif
+
+ # Settings for javac
+-BOOT_SOURCE_LANGUAGE_VERSION=6
+-BOOT_TARGET_CLASS_VERSION=6
++BOOT_SOURCE_LANGUAGE_VERSION=7
++BOOT_TARGET_CLASS_VERSION=7
+ JAVAC_FLAGS=-g -encoding ascii
+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
diff -r 9ec64ff41e91 -r 91be8105cfa7 patches/boot/hotspot-jdk-dependency.patch
--- a/patches/boot/hotspot-jdk-dependency.patch Wed Jun 29 18:16:57 2011 +0100
+++ b/patches/boot/hotspot-jdk-dependency.patch Tue Jul 05 13:48:51 2011 +0100
@@ -7,8 +7,8 @@
- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
$(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
More information about the distro-pkg-dev
mailing list