--- a/ChangeLog	Thu Apr 24 17:32:06 2014 +0100
+++ b/ChangeLog	Wed Jun 04 14:49:24 2014 +0100
@@ -1,3 +1,31 @@
+2014-06-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* INSTALL: Replace documentation of
+	--with-abs-install-dir with --prefix.
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.5pre06 tag.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(ICEDTEA_ENV): Set INSTALL_LOCATION to prefix.
+	* NEWS: Updated.
+	* configure.ac: Bump to pre06. Drop abs-install-dir
+	option and use prefix in ABS_CLIENT_LIBJVM_SO and
+	ABS_SERVER_LIBJVM_SO instead.
+	* hotspot.map: Update to icedtea-2.5pre06 tag.
+	* patches/boot/jaxws-langtools-dependency.patch:
+	Regenerated.
+	* tapset/hotspot.stp.in,
+	* tapset/hotspot_jni.stp.in,
+	* tapset/jstack.stp.in:
+	Replace ABS_JAVA_HOME_DIR with prefix.
+
 2014-04-24  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	Use of -fdevirtualize on macroAssembler_x86.o (via -O2)

--- a/INSTALL	Thu Apr 24 17:32:06 2014 +0100
+++ b/INSTALL	Wed Jun 04 14:49:24 2014 +0100
@@ -69,7 +69,7 @@
 There is currently no install target.  IcedTea ends up in
 openjdk.build when the build completes.
 
-Most targets in IcedTea creat stamp files in the stamps directory to
+Most targets in IcedTea create stamp files in the stamps directory to
 determine what and when dependencies were compiled.  Each target has a
 corresponding clean-x target which removes the output and the stamp
 file, allowing it to be rebuilt.  For example, stamps/rt.stamp (alias
@@ -82,6 +82,7 @@
 The build process may be modified by passing the following options
 to configure:
 
+* --prefix: The final install location of the j2sdk-image.
 * --disable-docs: Don't build the Javadoc documentation.
 * --disable-bootstrap: Perform a quick (no bootstrap) build using an installed
   copy of IcedTea6 or IcedTea7.  If a directory is not specified, a check against
@@ -172,7 +173,6 @@
 * --with-jamvm-src-zip: Specify the location of a JamVM tarball to avoid downloading.
 * --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option.
 * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
-* --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
 * --with-llvm-config: Specify the location of the llvm-config binary.
 * --with-version-suffix: Appends the given text to the JDK version output.
 * --with-project: Build an OpenJDK project from the following: icedtea, jdk7, closures, cvmi, cacaiocavallo,

--- a/Makefile.am	Thu Apr 24 17:32:06 2014 +0100
+++ b/Makefile.am	Wed Jun 04 14:49:24 2014 +0100
@@ -4,18 +4,18 @@
 BUILD_VERSION = b15
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = fc55c94710a4
-JAXP_CHANGESET = 89656c61a515
-JAXWS_CHANGESET = 9639895f6950
-JDK_CHANGESET = 6cb22bfdd98b
-LANGTOOLS_CHANGESET = 1b5335c79bc1
+CORBA_CHANGESET = 1650f85c0dee
+JAXP_CHANGESET = 49ca8c230020
+JAXWS_CHANGESET = 3a7c902a4390
+JDK_CHANGESET = 575b3a2fa6c9
+LANGTOOLS_CHANGESET = 853f886673d8
 OPENJDK_CHANGESET = 716796f6c6f0
 
-CORBA_SHA256SUM = aad1eca7c95e30d21f9831af74c4dc9695c40e93974f69bb9b66b7dcc44adffc
-JAXP_SHA256SUM = 6f5fa329d5c0e00d567ac0b4e3c65bb2902f0d4c9a680deba1f13d8fa0678b59
-JAXWS_SHA256SUM = f88276b593562b2b2e6c45cc6d682617e765e13a6a817b25662e8a08e1b5c998
-JDK_SHA256SUM = 180ec5ef8e0df9459412cf42eeecaa7eeb53e792035ce6ad4ddaada1c9f3084f
-LANGTOOLS_SHA256SUM = 7413148a6d6f77c1d6f99cee61240995035263f953ee1ce1aef4d3c461b83e4b
+CORBA_SHA256SUM = 11503511cac59fa9d18d955b0db1de2217723be3e3b997a5485aa19ca0353c5a
+JAXP_SHA256SUM = b65e71685224d288be7f9656372463944dcb56f1e0688d94b78f1b1616e34af8
+JAXWS_SHA256SUM = b879454336dba2a27bb61528e80ba242a5e2cda657fd5096f8242a8b9c8331ce
+JDK_SHA256SUM = abe758688db8a41b338eb09ce2e3b84e205e271ae51f76de39528ed84a49a70a
+LANGTOOLS_SHA256SUM = 2d6f659521792661cdc3156cfa6efaebc84a77548d613a66331805ff0fbe8115
 OPENJDK_SHA256SUM = 7c8142b0981d4f47818754a1e1d15d9a99c351eadd173c8af7248f5163413dc7
 
 CACAO_VERSION = e215e36be9fc
@@ -518,7 +518,8 @@
 	PCSC_LIBS="${PCSC_LIBS}" \
 	PCSC_CFLAGS="${PCSC_CFLAGS}" \
 	COMPRESS_JARS="${ENABLE_JAR_COMPRESSION}" \
-	ARM32JIT="${ARM32JIT_STATUS}"
+	ARM32JIT="${ARM32JIT_STATUS}" \
+	INSTALL_LOCATION="${prefix}"
 
 if ENABLE_CACAO
 ICEDTEA_ENV += \

--- a/NEWS	Thu Apr 24 17:32:06 2014 +0100
+++ b/NEWS	Wed Jun 04 14:49:24 2014 +0100
@@ -229,6 +229,7 @@
   - S8007607: security native code doesn't always use malloc, realloc, and calloc correctly
   - S8008509: 6588413 changed JNIEXPORT visibility for GCC on HSX, jdk's jni_md.h needs similar change
   - S8014307: Memory leak ... security/jgss/wrapper/GSSLibStub.c
+  - S8038392, RH1064383: Generating prelink cache breaks JAVA 'jinfo' utility normal behavior
 * Bug fixes
   - Fix implicit function declarations in j2secmod_md.c introduced by 7103549.
   - PR1617: Include defs.make in vm.make so zeroshark.make is included
@@ -259,6 +260,12 @@
   - Fix merge duplication in com.sun.script.javascript.RhinoTopLevel
   - S8041658: Use of -fdevirtualize on macroAssembler_x86.o (via -O2) with gcc 4.9.0 creates broken VM
   - Extend 8041658 to all files in the HotSpot build.
+  - Correct placement of S8041658 fix
+  - PR1753: Ant does not respect JAVA_HOME/jdk.home setting
+  - PR1757: register_method usage in sharkCompiler.cpp needs to be adjusted following S7196199
+  - PR1781: NSS PKCS11 provider fails to handle multipart AES encryption
+  - RH1059925: RFE: Version Java libraries to allow using multiple Java versions with Linux capabilities enabled
+  - RH905128: [CRASH] OpenJDK-1.7.0 while using NSS security provider and kerberos
 * PPC & AIX port
   - Add AIX-specific build instructions to README-ppc.html
   - Added AIX as testing platform for more jtreg tests written in shell-script
@@ -335,6 +342,7 @@
   - Fixed JTreg failure from java/util/ResourceBundle/Control/ExpirationTest.sh
   - Fixed memory handling/bookkeeping of mmaped memory on AIX
   - Fixed sun/nio/ch implementation on AIX
+  - Fix handling of scalar replaced objects.
   - Fix IA64 preprocessor conditionals on AIX!!!
   - Fix iconv encoding problem on AIX < 7.1 in SplashConvertStringAlloc
   - Fix JTreg failure from java/nio/charset/Charset/NIOCharsetAvailabilityTest.java
@@ -375,6 +383,7 @@
   - Memory ordering as required for platforms with weak memory ordering (PPC)
   - Memory ordering: introduce functions to specify platform properties.
   - method handles: some smaller fixes and extensions for ppc
+  - New files for template interpreter
   - New HS24 JSR292 implementation for PPC64
   - opto: adapt assertion in postaloc.cpp for ppc.
   - opto: Basic fixes for the ppc C2 port
@@ -425,6 +434,7 @@
   - PPC specific C2 flags: add macro PD_C2_FLAGS to global flag definitions.
   - PPC specific flags: add macro PD_FLAGS to global flag definitions.
   - ppc: support for g1, cOops
+  - PPC64: Support for ABI_ELFv2.
   - Propagate HOTSPOT_BUILD_JOBS and PARALLEL_COMPILE_JOBS from the top-level make to the corresponding sub-makes.
   - Recent changes to ppc files, especially to ppc.ad file.
   - Recent improvements by SAP.
@@ -441,7 +451,22 @@
   - S8003853 opto: specify offset of IC load in java_to_interp stub.
   - S8005055: pass outputStream to more opto debug routines
   - S8006971 rt: Improve handling of memory ordering in taskqueue.hpp.
+  - S8016491: PPC64 (part 2): Clean up PPC defines.
+  - S8016586: PPC64 (part 3): basic changes for PPC64
+  - S8016696: PPC64 (part 4): add relocation for trampoline stubs
+  - S8017313: PPC64 (part 6): stack handling improvements
+  - S8017317: PPC64 (part 7): cppInterpreter: implement support for biased locking
+  - S8019517: PPC64 (part 102): cppInterpreter: implement G1 support
   - S8019929: PPC64 (part 107): Extend ELF-decoder to support PPC64 function descriptor tables
+  - S8019973: PPC64 (part 11): Fix IA64 preprocessor conditionals on AIX.
+  - S8024344: PPC64 (part 112): C argument in register AND stack slot.
+  - S8024468: PPC64 (part 201): cppInterpreter: implement bytecode profiling
+  - S8033168: PPC64: gcc 4.8 warning in output_c.cpp
+  - S8035396: Introduce accessor for tmp_oop in frame.
+  - S8036767: PPC64: Support for little endian execution model
+  - S8036976: PPC64: implement the template interpreter
+  - S8037915: PPC64/AIX: Several smaller fixes
+  - S8042309: Some bugfixes for the ppc64 port
   - Several NIO fixes for AIX to pass JCK tests
   - shared assembler: fix DelayedConstant.
   - shared: Basic non-functional fixes needed for the ppc port.

--- a/configure.ac	Thu Apr 24 17:32:06 2014 +0100
+++ b/configure.ac	Wed Jun 04 14:49:24 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5pre05], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.5pre06], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
@@ -305,19 +305,8 @@
 AC_LANG_POP([C++])
 AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$SDT_H_FOUND = xyes])
 
-AC_MSG_CHECKING([for absolute java home install dir])
-AC_ARG_WITH([abs-install-dir],
-	      [AS_HELP_STRING([--with-abs-install-dir], 
-			      [The absolute path where the j2sdk-image dir will be installed])],
-	      [if test "x${withval}" = x; then
-		 ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"
-	       else
-		 ABS_JAVA_HOME_DIR="${withval}"
-	       fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"])
-AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}])
-ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so"
-ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so"
-AC_SUBST(ABS_JAVA_HOME_DIR)
+ABS_CLIENT_LIBJVM_SO="${prefix}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so"
+ABS_SERVER_LIBJVM_SO="${prefix}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so"
 AC_SUBST(ABS_CLIENT_LIBJVM_SO)
 AC_SUBST(ABS_SERVER_LIBJVM_SO)
 AC_CONFIG_FILES([tapset/hotspot.stp])

--- a/hotspot.map	Thu Apr 24 17:32:06 2014 +0100
+++ b/hotspot.map	Wed Jun 04 14:49:24 2014 +0100
@@ -1,3 +1,3 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot df3f0e040c01 69aa69e5417933a62052389c2daf00a02224de719b2c69f0309cfcd4a8679797
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot 3017276776bf 8e111a2364e5127c6ae2043a605a5ea8ec6220684a325fd3a69d1df4ae93868a
 aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c

--- a/patches/boot/jaxws-langtools-dependency.patch	Thu Apr 24 17:32:06 2014 +0100
+++ b/patches/boot/jaxws-langtools-dependency.patch	Wed Jun 04 14:49:24 2014 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/jaxws/build.properties openjdk-boot/jaxws/build.properties
---- openjdk-boot.orig/jaxws/build.properties	2014-01-30 19:01:55.000000000 +0000
-+++ openjdk-boot/jaxws/build.properties	2014-01-31 20:04:24.425553307 +0000
+--- openjdk-boot.orig/jaxws/build.properties	2014-04-29 21:54:42.000000000 +0100
++++ openjdk-boot/jaxws/build.properties	2014-06-04 05:58:57.680029474 +0100
 @@ -28,7 +28,8 @@
  # other tools, and product versions of all the tools.
  # Override this path as needed, either on the command line or in 
@@ -23,8 +23,8 @@
    javac.memoryMaximumSize=${javac.memoryMaximumSize}${line.separator}\
    javac.source=${javac.source}${line.separator}\
 diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
---- openjdk-boot.orig/jaxws/build.xml	2014-01-31 20:03:12.768449571 +0000
-+++ openjdk-boot/jaxws/build.xml	2014-01-31 20:04:40.337798308 +0000
+--- openjdk-boot.orig/jaxws/build.xml	2014-06-04 05:57:06.998462083 +0100
++++ openjdk-boot/jaxws/build.xml	2014-06-04 05:58:57.684029530 +0100
 @@ -143,7 +143,7 @@
  	-->
          <javac
@@ -35,11 +35,11 @@
               destdir="${build.classes.dir}"
               memoryInitialSize="${javac.memoryInitialSize}"
 diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
---- openjdk-boot.orig/jaxws/make/Makefile	2014-01-30 19:01:55.000000000 +0000
-+++ openjdk-boot/jaxws/make/Makefile	2014-01-31 20:04:24.429553368 +0000
+--- openjdk-boot.orig/jaxws/make/Makefile	2014-04-29 21:54:42.000000000 +0100
++++ openjdk-boot/jaxws/make/Makefile	2014-06-04 05:59:33.928542955 +0100
 @@ -103,7 +103,7 @@
      ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-     ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
+     ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) -Djava.home=$(ALT_BOOTDIR)
    endif
 -  ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
 +  ANT_OPTIONS += -Dlangtools.dist=$(ALT_LANGTOOLS_DIST)

--- a/tapset/hotspot.stp.in	Thu Apr 24 17:32:06 2014 +0100
+++ b/tapset/hotspot.stp.in	Wed Jun 04 14:49:24 2014 +0100
@@ -23,7 +23,7 @@
  Currently only works with full path in process probes below.
  When things don't seem to work look if the correct
  jre/lib/[arch]/[client|server]/libjvm.so is used
- and exists under @ABS_JAVA_HOME_DIR@/.
+ and exists under @prefix@/.
  This version of hotspot.stp has been configured to instrument the
  libjvm.so for arch @INSTALL_ARCH_DIR@ installed at:
  @ABS_CLIENT_LIBJVM_SO@

--- a/tapset/hotspot_jni.stp.in	Thu Apr 24 17:32:06 2014 +0100
+++ b/tapset/hotspot_jni.stp.in	Wed Jun 04 14:49:24 2014 +0100
@@ -23,7 +23,7 @@
  Currently only works with full path in process probes below.
  When things don't seem to work look if the correct
  jre/lib/[arch]/[client|server]/libjvm.so is used
- and exists under @ABS_JAVA_HOME_DIR@/.
+ and exists under @prefix@/.
  This version of hotspot.stp has been configured to instrument the
  libjvm.so for arch @INSTALL_ARCH_DIR@ installed at:
  @ABS_CLIENT_LIBJVM_SO@

--- a/tapset/jstack.stp.in	Thu Apr 24 17:32:06 2014 +0100
+++ b/tapset/jstack.stp.in	Wed Jun 04 14:49:24 2014 +0100
@@ -34,7 +34,7 @@
  Currently only works with full path in process probes below.
  When things don't seem to work look if the correct
  jre/lib/[arch]/[client|server]/libjvm.so is used
- and exists under @ABS_JAVA_HOME_DIR@/.
+ and exists under @prefix@/.
  This version of jstack.stp has been configured to instrument the
  libjvm.so for arch @INSTALL_ARCH_DIR@ installed at:
  @ABS_CLIENT_LIBJVM_SO@