--- a/ChangeLog	Wed Apr 23 22:32:19 2014 +0100
+++ b/ChangeLog	Wed Apr 30 15:42:11 2014 +0100
@@ -1,3 +1,24 @@
+2014-04-30  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.6pre03 tag.
+	(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 pre03.
+	* hotspot.map: Update to icedtea-2.6pre03 tag.
+	* patches/boot/jaxws-langtools-dependency.patch:
+	Regenerated.
+
 2014-04-23  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR1742: Allow SunEC provider to be built with changes

--- a/Makefile.am	Wed Apr 23 22:32:19 2014 +0100
+++ b/Makefile.am	Wed Apr 30 15:42:11 2014 +0100
@@ -4,19 +4,19 @@
 BUILD_VERSION = b13
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 8293bea019e3
-JAXP_CHANGESET = a0138328f7db
-JAXWS_CHANGESET = ad282d85bae9
-JDK_CHANGESET = 6f22501ca73c
-LANGTOOLS_CHANGESET = 2040d4afc898
-OPENJDK_CHANGESET = 07a06f112424
+CORBA_CHANGESET = 35fa09c49527
+JAXP_CHANGESET = 33912ce9492d
+JAXWS_CHANGESET = ef698865ff56
+JDK_CHANGESET = 068d2b78bd73
+LANGTOOLS_CHANGESET = 2950924c2b80
+OPENJDK_CHANGESET = edf01342f3cb
 
-CORBA_SHA256SUM = b2b5b2afd249f1cc848ef876a143e8a1d33e8b672926ac217e0533761c4d85c3
-JAXP_SHA256SUM = 4be537603478482b22517940ff4677258eceb3f4f859c97ef8e8ed97a11d8337
-JAXWS_SHA256SUM = 398c4498799ad7e9c49eb059a2fd3f34f96a7b7240cc76c192222ba462e21dff
-JDK_SHA256SUM = 59171abadaf0f7332a8a8813b930b603cd25c8fad1a20efb96d092906b1ae9e0
-LANGTOOLS_SHA256SUM = 9d03b8c5b7452c712e7793882c16112db407eec9d36055ffe7f8f3312c3a9e54
-OPENJDK_SHA256SUM = ee7f094dddae85f3a7c9d49616e0b747fec84d402d46b98731a5f9fe66c88250
+CORBA_SHA256SUM = 2aa4e5c18084eaaacecc3c5e0104286cb15053145b5c71be91f7a2c2e6d2f828
+JAXP_SHA256SUM = 0c93de8873e4609ae0e191541c3e8331addb657a491ed1ba36d9268bb2fe23f2
+JAXWS_SHA256SUM = 28991aa42190e391d45d4c79e8fca955249c3cf4b95a1783b8a36179b998c13a
+JDK_SHA256SUM = aeeb18019359df6cd23ef479cfddea2ed9940572c265a65c70d15403cdc78151
+LANGTOOLS_SHA256SUM = 5f0179d4d9f55276ceff7f151d203b96698cde1b250430c4963f2a3a8525fd7e
+OPENJDK_SHA256SUM = 5585a7ffce369a3f6dbbcadb86852a5a28ce0b2b0734fd734cedec611156ecc8
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab

--- a/NEWS	Wed Apr 23 22:32:19 2014 +0100
+++ b/NEWS	Wed Apr 30 15:42:11 2014 +0100
@@ -132,6 +132,25 @@
   - S8038481: CMM Testing: Min/MaxHeapFreeRatio flags should be manageable through the API
   - S8038640: new hotspot build - hs24.80-b06
   - S8038785: hot workaround fix for a crash in C2 compiler at Node::rematerialize
+* PPC & AIX port
+  - Fix handling of scalar replaced objects.
+  - New files for template interpreter
+  - PPC64: Support for ABI_ELFv2.
+  - S016696: PPC64 (part 4): add relocation for trampoline stubs
+  - S8016491: PPC64 (part 2): Clean up PPC defines.
+  - S8016586: PPC64 (part 3): basic changes for PPC64
+  - 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
 * Bug fixes
   - PR1737: Support prefixed variants of GNU tools used on *BSD systems
   - Fix accidental reversion of PR1188 for armel
@@ -139,6 +158,9 @@
   - PR1742: Allow SunEC provider to be built with changes in NSS >= 3.16.1
   - Remove unused hgforest script
   - Red Hat local: Fix for repo with path statting with / .
+  - S8041658: Use of -fdevirtualize on macroAssembler_x86.o (via -O2) with gcc 4.9.0 creates broken VM
+  - Extend S8041658 to all files in the HotSpot build.
+  - PR1753: Ant does not respect JAVA_HOME/jdk.home setting
 
 New in release 2.5.0 (2014-XX-XX):
 

--- a/configure.ac	Wed Apr 23 22:32:19 2014 +0100
+++ b/configure.ac	Wed Apr 30 15:42:11 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6pre02], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6pre03], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 

--- a/hotspot.map	Wed Apr 23 22:32:19 2014 +0100
+++ b/hotspot.map	Wed Apr 30 15:42:11 2014 +0100
@@ -1,3 +1,3 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 138ef7288fd4 ab58d30c191974d5824d120896dcc89aff1f897fe74d9d35bdd4ba6169132127
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 4ab69c6e4c85 03dad0749d7d81e3d5f9d76f9f8aa4d412d9d7ae3f6261efaefad0133ccc3428
 aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c

--- a/patches/boot/jaxws-langtools-dependency.patch	Wed Apr 23 22:32:19 2014 +0100
+++ b/patches/boot/jaxws-langtools-dependency.patch	Wed Apr 30 15:42:11 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-04-30 13:33:12.468199995 +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-04-30 13:32:03.203168981 +0100
++++ openjdk-boot/jaxws/build.xml	2014-04-30 13:33:12.468199995 +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-04-30 13:33:43.148656691 +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)