--- a/ChangeLog	Fri Dec 12 18:20:34 2014 +0000
+++ b/ChangeLog	Fri Dec 12 20:03:13 2014 +0000
@@ -1,3 +1,38 @@
+2014-12-12  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.5.4pre02.
+	(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.
+	* NEWS: Updated.
+	* configure.ac: Bump to 2.5.4pre02. Call
+	* hotspot.map.in: Update to icedtea-2.5.4pre02.
+
+2014-11-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* INSTALL: Updated.
+	(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. Works around an issue with not
+	being able to link to the OpenJDK 6 VM.
+	* 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: Call IT_ENABLE_QUEENS_TEST.
+
 2014-10-16  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* Makefile.am,

--- a/INSTALL	Fri Dec 12 18:20:34 2014 +0000
+++ b/INSTALL	Fri Dec 12 20:03:13 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	Fri Dec 12 18:20:34 2014 +0000
+++ b/Makefile.am	Fri Dec 12 20:03:13 2014 +0000
@@ -4,19 +4,19 @@
 BUILD_VERSION = b14
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 3b13d5123ab2
-JAXP_CHANGESET = d5fcf3403d56
-JAXWS_CHANGESET = ac4697fab02d
-JDK_CHANGESET = c25a41237d27
-LANGTOOLS_CHANGESET = 6bbb3de3efa5
-OPENJDK_CHANGESET = 39495d637282
+CORBA_CHANGESET = 946d8c68cc64
+JAXP_CHANGESET = bd7f82f68cf1
+JAXWS_CHANGESET = 686552a98cae
+JDK_CHANGESET = cc61d8104f31
+LANGTOOLS_CHANGESET = 622e6cf4c032
+OPENJDK_CHANGESET = f94395c841f4
 
-CORBA_SHA256SUM = 70279cf5eb118d60b8b3eec8572917d5d2c3ef5ee3a58b7b820976767b654870
-JAXP_SHA256SUM = 207b735e1418b935212f4a282fb2e140f6c680337e3bbc91d5e01c7a0e0b8f51
-JAXWS_SHA256SUM = d331df4d1cb53c88b491d813dfda56f7d5c14e2fb3d00cdef58071c651710803
-JDK_SHA256SUM = a6ec5b73da8ae61ecbbd8710e293d3641571be2bd5d88c8ac8e8a4eacc3f2335
-LANGTOOLS_SHA256SUM = bbd2b3ce6cfaab1c654888e69c42ed74987200d914cc33a728f4fb4196eff469
-OPENJDK_SHA256SUM = 90153aa1d34878acd354336eb018952f283ca46e908852e8bc88a44adb68337b
+CORBA_SHA256SUM = 25a968346d3ef2770e39871237661796d993c080557b0b1961f5ad0360b9b4eb
+JAXP_SHA256SUM = ea04b339d7630bc56343a28ce9b3370b06c9e4cdc1ee2e839b5d52cef0f01ed0
+JAXWS_SHA256SUM = a15642120bcfa6e0407c0d75a1250b7d5b75074416450bdcfcaee0b5d9e4ed61
+JDK_SHA256SUM = 6add81916bf68410fe63d64dcc4e233f999dc0d31f74a42939ac05b6993ad047
+LANGTOOLS_SHA256SUM = e4406c3a3f680e98ce34f857a4997cd72c739b080ad02929670fc584ca522338
+OPENJDK_SHA256SUM = 77bff21ea4cdc8ea05dfde1c1fb33d6b7f8a56355e68054c971933511cbc68ad
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -438,6 +438,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)" \
@@ -521,7 +527,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 += \
@@ -610,7 +617,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	Fri Dec 12 18:20:34 2014 +0000
+++ b/NEWS	Fri Dec 12 20:03:13 2014 +0000
@@ -18,7 +18,9 @@
   - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec
   - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems
   - S7169142: CookieHandler does not work with localhost
+  - S7172012, PR2067: Make test-in-build an option (Queens)
   - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations
+  - S8000897, RH1155012: VM crash in CompileBroker
   - S8001105: findVirtual of Object[].clone produces internal error
   - S8005232: (JEP-149) Class Instance size reduction
   - S8012026: [macosx] Component.getMousePosition() does not work in an applet on MacOS
@@ -27,6 +29,7 @@
   - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition
   - S8026792: HOTSPOT: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated.
   - S8027359: XML parser returns incorrect parsing results
+  - S8028623, PR2112, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters.
   - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings
   - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions
   - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException
@@ -43,6 +46,12 @@
   - S8044603: Increment minor version of HSx for 7u71 and initialize the build number
   - S8050485: super() in a try block in a ctor causes VerifyError
   - S8057184: JCK8's api/javax_swing/JDesktopPane/descriptions.html#getset failed with GTKLookAndFeel on Linux and Solaris
+  - S8067364, PR2145, RH114622: Printing to Postscript doesn't support dieresis
+* Bug fixes
+  - PR2069: Type-punning warnings still evident on RHEL 5
+  - PR2094, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
+  - PR2123: SunEC provider crashes when built using system NSS
+  - PR2135: Race condition in SunEC provider with system NSS
 
 New in release 2.5.3 (2014-10-14):
 

--- a/acinclude.m4	Fri Dec 12 18:20:34 2014 +0000
+++ b/acinclude.m4	Fri Dec 12 20:03:13 2014 +0000
@@ -2846,3 +2846,26 @@
     fi
   fi
 ])
+ 
+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	Fri Dec 12 18:20:34 2014 +0000
+++ b/configure.ac	Fri Dec 12 20:03:13 2014 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5.4pre01], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.5.4pre02], [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	Fri Dec 12 18:20:34 2014 +0000
+++ b/hotspot.map.in	Fri Dec 12 20:03:13 2014 +0000
@@ -1,3 +1,3 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ cc04abb12fea 677944ba1dbf14a879fc1e38035aec55247a648d80a54646b387778b1a7f7f3e
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 7a4b0596c539 4e18aa918730808bf0477c99c1c00a485663e4b79da61199cd8b4b4f762c42f8
 aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 116bc9da35de b9e7f67079184310450c9b461b492f340aa7824c27079b430c8f25b58b327ec5