--- a/ChangeLog	Thu Oct 30 23:06:45 2014 +0000
+++ b/ChangeLog	Fri Nov 07 16:07:54 2014 +0000
@@ -1,3 +1,38 @@
+2014-11-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* INSTALL: Updated.
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.6pre10.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(ICEDTEA_PATCHES): Only apply SystemTap GC
+	patch to AArch64 port, as it's now in the main
+	IcedTea7 forest.
+	(TEST_IN_BUILD): New variable, set in accordance
+	with the ENABLE_QUEENS conditional.
+	(ICEDTEA_ENV): Pass user setting of TEST_IN_BUILD.
+	(ICEDTEA_ENV_BOOT): Override above with false for
+	bootstrap builds. Worksaround an issue with not
+	being able to link to the OpenJDK 6 VM.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_ENABLE_QUEENS_TEST): New
+	--disable-hotspot-test-in-build option which allows
+	the Queens test (test_gamma) to be toggled by the
+	user.
+	* configure.ac: Bump to 2.6.0pre10. Call
+	IT_ENABLE_QUEENS_TEST.
+	* hotspot.map.in: Update to icedtea-2.6.0pre10.
+
 2014-06-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* INSTALL: Replace documentation of

--- a/INSTALL	Thu Oct 30 23:06:45 2014 +0000
+++ b/INSTALL	Fri Nov 07 16:07:54 2014 +0000
@@ -181,6 +181,7 @@
 * --disable-jar-compression: Don't compress the OpenJDK JAR files.
 * --disable-downloading: Don't download tarballs if not available; fail instead.
 * --disable-bootstrap-tools: Use javac and javah from langtools, not the bootstrap JDK.
+* --disable-hotspot-test-in-build: Turn off the Queens test. Always turned off for bootstrapping.
 
 Other options may be supplied which enable or disable new features.
 These are documented fully in the relevant section below.

--- a/Makefile.am	Thu Oct 30 23:06:45 2014 +0000
+++ b/Makefile.am	Fri Nov 07 16:07:54 2014 +0000
@@ -4,19 +4,19 @@
 BUILD_VERSION = b02
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 4e8ca30ec092
-JAXP_CHANGESET = f59ee5163710
-JAXWS_CHANGESET = 39dd7bed2325
-JDK_CHANGESET = 1ceeb31e72ca
-LANGTOOLS_CHANGESET = 55486a406d9f
-OPENJDK_CHANGESET = 7faf56bdd783
+CORBA_CHANGESET = 1a346ad4e322
+JAXP_CHANGESET = 603009854864
+JAXWS_CHANGESET = 70a94bce8d6e
+JDK_CHANGESET = 33a33bbea1ae
+LANGTOOLS_CHANGESET = cf836e0ed10d
+OPENJDK_CHANGESET = 200124c2f78d
 
-CORBA_SHA256SUM = 8f134db97bde4da9de8c6cd2d3b7a356c29d5c209c4b6a67afac222125438966
-JAXP_SHA256SUM = 1bcdad1094b62c311d207631225ae421ea2e9d19260d74e431260c19247d2c52
-JAXWS_SHA256SUM = c85fed9f2458c12938d2a1c6fee0b302e87231b79d5eabb04aaba6b24ee252cd
-JDK_SHA256SUM = 2e80ff20774b750abfc662ecb54f4c4738e0a38192453c40c2d7ced393ba2a42
-LANGTOOLS_SHA256SUM = 3ef96c11ea2720b3c9e2a0ff7951cb4db2d5e6db45aa6f7762617b1a694e7650
-OPENJDK_SHA256SUM = 301bcd38fa62237e62e9ec2c30a43f36b0c25ad666a8b855ff1d8b0e68d05a2f
+CORBA_SHA256SUM = 6bbf09732d6a9be121d2a5c35e080324096702dd51fc60e13f1f34f214b2c99c
+JAXP_SHA256SUM = da4d472957b4f067b84ae1fe95f0ba95b62172c847ac1bf8cd826b62304c1926
+JAXWS_SHA256SUM = e04ac70c852471e36e6cf18352f720411e310df5393ac05ee9f45ce7a8ca7685
+JDK_SHA256SUM = f85e1e35b1c06e858712d1543928eae2169b4d6e02a7c266074b4a344b09d613
+LANGTOOLS_SHA256SUM = b351d1ac749817fff2618cf115a5484d78feecc35c46e180c7192b3596b60ef5
+OPENJDK_SHA256SUM = b7bfea4e2d9df2a0d1c4095bb820e04ba8d54e9ffea247742ea129bea8e9373a
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -268,11 +268,6 @@
 	patches/cacao/ignore-tests.patch
 endif
 
-if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += \
-	patches/systemtap_gc.patch
-endif
-
 if ENABLE_NSS
 ICEDTEA_PATCHES += patches/nss-config.patch \
 	patches/rh1022017.patch
@@ -301,6 +296,10 @@
 	patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch \
 	patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch \
 	patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch
+if ENABLE_SYSTEMTAP
+ICEDTEA_PATCHES += \
+	patches/systemtap_gc.patch
+endif
 endif
 
 ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -444,6 +443,12 @@
 ARM32JIT_STATUS=false
 endif
 
+if ENABLE_QUEENS
+TEST_IN_BUILD=true
+else
+TEST_IN_BUILD=false
+endif
+
 ICEDTEA_ENV = \
 	ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
 	ANT="$(ANT)" \
@@ -527,7 +532,8 @@
 	PCSC_CFLAGS="${PCSC_CFLAGS}" \
 	COMPRESS_JARS="${ENABLE_JAR_COMPRESSION}" \
 	ARM32JIT="${ARM32JIT_STATUS}" \
-	INSTALL_LOCATION="${prefix}"
+	INSTALL_LOCATION="${prefix}" \
+	TEST_IN_BUILD="${TEST_IN_BUILD}"
 
 if ENABLE_CACAO
 ICEDTEA_ENV += \
@@ -609,7 +615,8 @@
 	DISABLE_NIMBUS="true" \
 	NO_DOCS="true" \
 	ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)" \
-	XSLT="$(XSLTPROC)"
+	XSLT="$(XSLTPROC)" \
+	TEST_IN_BUILD="false"
 
 # Source files
 

--- a/NEWS	Thu Oct 30 23:06:45 2014 +0000
+++ b/NEWS	Fri Nov 07 16:07:54 2014 +0000
@@ -257,10 +257,15 @@
   - S8057564: JVM hangs at getAgentProperties after attaching to VM with lower
   - S8057813: Alterations to jdk_security3 test target
   - S8058936: hotspot/test/Makefile should use jtreg script from $JT_HOME/bin/jreg (instead of $JT_HOME/win32/bin/jtreg)
+* Backports
+  - S7172012, PR2067: Make test-in-build an option (Queens)
+  - S8000897, RH1155012: VM crash in CompileBroker
 * Bug fixes
   - PR1786: Allow x86 build to occur on x86_64 using a previously built x86_64 build
   - PR1846: Build fails when using IcedTea7 as bootstrap JDK with native ecj
   - PR1847: Synchronise javac.in with IcedTea6
+  - PR2060: Fix warnings found by Gentoo ebuild QA with gcc 4.9.1
+  - PR2069: Type-punning warnings still evident on RHEL 5
 * CACAO
   - PR2032: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3
 * AArch64 port

--- a/acinclude.m4	Thu Oct 30 23:06:45 2014 +0000
+++ b/acinclude.m4	Fri Nov 07 16:07:54 2014 +0000
@@ -2846,3 +2846,25 @@
   AC_SUBST([ICEDTEA_BRANCH])
 ])
 
+AC_DEFUN_ONCE([IT_ENABLE_QUEENS_TEST],
+[
+  AC_MSG_CHECKING([whether to run the HotSpot Queens test])
+  AC_ARG_ENABLE([hotspot-test-in-build],
+                [AS_HELP_STRING(--disable-hotspot-test-in-build,
+		don't run the Queens test after the HotSpot build [[default=yes]])],
+  [
+    case "${enableval}" in
+      yes)
+        enable_queens=yes
+        ;;
+      *)
+        enable_queens=no
+        ;;
+    esac
+  ],
+  [
+    enable_queens=yes
+  ])
+  AC_MSG_RESULT([$enable_queens])
+  AM_CONDITIONAL([ENABLE_QUEENS], test x"${enable_queens}" = "xyes")
+])

--- a/configure.ac	Thu Oct 30 23:06:45 2014 +0000
+++ b/configure.ac	Fri Nov 07 16:07:54 2014 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.0pre09], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.0pre10], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
@@ -153,6 +153,7 @@
 IT_BYTECODE7_CHECK
 IT_USE_BOOTSTRAP_TOOLS
 IT_CHECK_FOR_XBOOTCLASSPATH
+IT_ENABLE_QUEENS_TEST
 
 IT_FIND_RHINO_JAR
 IT_WITH_OPENJDK_SRC_ZIP

--- a/hotspot.map.in	Thu Oct 30 23:06:45 2014 +0000
+++ b/hotspot.map.in	Fri Nov 07 16:07:54 2014 +0000
@@ -1,3 +1,3 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4722cfd15c83 34c7a74382accfe66b6ff4d9868bb61daa4baa195e4aaa3cbf32f9ec9ecea31a
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ c8417820ac94 4c980d855addedf9a3494aa56b2ee47feea5fe8bddd43085fd3225b3ea44bd52
 aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 5b7dcf16fe5d 74b7d1e8eb76ab356135cbcb89474da9ba573516fc88024f40c56ff6cae31059