# HG changeset patch
# User Andrew John Hughes <gnu.andrew@redhat.com>
# Date 1463408189 -3600
# Node ID 01e3d9c141e6adc6afed04f9d240723426d87a47
# Parent  60be25a84f2dd2bce8ff277cc3854cca1b3f7931
PR2957: Build bootstrap code (rt-class-files.stamp) using bootstrap flags (source/target 1.5)

2016-05-13  Andrew John Hughes  <gnu.andrew@redhat.com>

	PR2957: Build bootstrap code (rt-class-files.stamp)
	using bootstrap flags (source/target 1.5)
	* Makefile.am:
	(IT_BOOT_LANGUAGE_SOURCE_VERSION): Introduce
	and set to 5.
	(IT_BOOT_CLASS_TARGET_VERSION): Likewise.
	(IT_BOOT_JAVACFLAGS): Same as IT_JAVACFLAGS
	but using IT_BOOT_CLASS_TARGET_VERSION and
	IT_BOOT_LANGUAGE_SOURCE_VERSION.
	(rt-class-files): Use IT_BOOT_JAVACFLAGS.
	* NEWS: Updated.

diff -r 60be25a84f2d -r 01e3d9c141e6 ChangeLog
--- a/ChangeLog	Fri May 13 14:02:18 2016 +0100
+++ b/ChangeLog	Mon May 16 15:16:29 2016 +0100
@@ -1,3 +1,17 @@
+2016-05-13  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	PR2957: Build bootstrap code (rt-class-files.stamp)
+	using bootstrap flags (source/target 1.5)
+	* Makefile.am:
+	(IT_BOOT_LANGUAGE_SOURCE_VERSION): Introduce
+	and set to 5.
+	(IT_BOOT_CLASS_TARGET_VERSION): Likewise.
+	(IT_BOOT_JAVACFLAGS): Same as IT_JAVACFLAGS
+	but using IT_BOOT_CLASS_TARGET_VERSION and
+	IT_BOOT_LANGUAGE_SOURCE_VERSION.
+	(rt-class-files): Use IT_BOOT_JAVACFLAGS.
+	* NEWS: Updated.
+
 2016-05-13  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR2954: ecj/override.patch is missing new
diff -r 60be25a84f2d -r 01e3d9c141e6 Makefile.am
--- a/Makefile.am	Fri May 13 14:02:18 2016 +0100
+++ b/Makefile.am	Mon May 16 15:16:29 2016 +0100
@@ -169,6 +169,9 @@
 IT_LANGUAGE_SOURCE_VERSION=6
 IT_CLASS_TARGET_VERSION=6
 IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
+IT_BOOT_LANGUAGE_SOURCE_VERSION=5
+IT_BOOT_CLASS_TARGET_VERSION=5
+IT_BOOT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_BOOT_LANGUAGE_SOURCE_VERSION) -target $(IT_BOOT_CLASS_TARGET_VERSION)
 
 # Conditional defintions
 
@@ -2857,7 +2860,7 @@
 if BOOTSTRAPPING
 	mkdir -p lib/rt
 	if echo $(ICEDTEA_BOOTSTRAP_CLASSES) | grep '\S' &> /dev/null ; then \
-	  $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \
+	  $(BOOT_DIR)/bin/javac $(IT_BOOT_JAVACFLAGS) -d lib/rt \
             -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
             -sourcepath $(SOURCEPATH_DIRS) \
 	    -bootclasspath \'\' @rt-source-files.txt ; \
diff -r 60be25a84f2d -r 01e3d9c141e6 NEWS
--- a/NEWS	Fri May 13 14:02:18 2016 +0100
+++ b/NEWS	Mon May 16 15:16:29 2016 +0100
@@ -28,6 +28,7 @@
   - PR2083: Add support for building Zero on AArch64
   - PR2849: wget not required when downloading is disabled
   - PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java
+  - PR2957: Build bootstrap code (rt-class-files.stamp) using bootstrap flags (source/target 1.5)
 
 New in release 1.13.11 (2016-05-05):