--- a/ChangeLog	Wed Dec 10 03:07:35 2014 +0000
+++ b/ChangeLog	Wed Dec 10 03:09:52 2014 +0000
@@ -1,3 +1,22 @@
+2014-12-09  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am,
+	(CORBA_CHANGESET): Update to icedtea-2.6pre14.
+	(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.6.0pre14.
+	* hotspot.map.in: Update to icedtea-2.6.0pre14.
+
 2014-12-05  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2124: Synchronise elliptic curves in

--- a/Makefile.am	Wed Dec 10 03:07:35 2014 +0000
+++ b/Makefile.am	Wed Dec 10 03:09:52 2014 +0000
@@ -4,19 +4,19 @@
 BUILD_VERSION = b03
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 9b3eb26f177e
-JAXP_CHANGESET = a2841c1a7f29
-JAXWS_CHANGESET = 26d6f6067c7b
-JDK_CHANGESET = 13bd267f397d
-LANGTOOLS_CHANGESET = a072de9f83ed
-OPENJDK_CHANGESET = f16c298d91bd
+CORBA_CHANGESET = 646234c2fd7b
+JAXP_CHANGESET = 35cfccb24a9c
+JAXWS_CHANGESET = 8b238b2b6e64
+JDK_CHANGESET = ccdc37cdfaa8
+LANGTOOLS_CHANGESET = ecf2ec173dd2
+OPENJDK_CHANGESET = 97260abdb038
 
-CORBA_SHA256SUM = 001997f9596e41d2c361dc019642a7be048f4bf75b2259b094b773d8d12dae46
-JAXP_SHA256SUM = c934bb74ab133b2bc22d185a5baeb261b1a218efc3a2d7afaa984ac38bbe8124
-JAXWS_SHA256SUM = 3408bfb69278457dd04bceae98150c78db2279bdf9c2476290df3113b68eb074
-JDK_SHA256SUM = a357a526cb26401b9189dee0ebf5ae5d4e161658aa9832614c8a7195f1613357
-LANGTOOLS_SHA256SUM = d9e94b444f32c98e4dd497c5e93e3f5293c4017c8f496d2f9ac296dad8369f6b
-OPENJDK_SHA256SUM = f16181caef7cc8aa8c9b6a53f955ffa5b4f944c79455cb9e88f22be9751a03bb
+CORBA_SHA256SUM = e3dc32bd3a6cbbee37ce7c324b7f765509bfb50990c709316b2807c68ab0d6e6
+JAXP_SHA256SUM = 20f8125ec5835be8d5f263d8a5301e24a5343b291955059afe427959d9043ec8
+JAXWS_SHA256SUM = 6d2b6a749556c98e7c84254096c65a925b4a13d0274d899ded697cf8f15549cf
+JDK_SHA256SUM = 648182d695f3b2df6ebc4ed821bd2406bf60c3f84d6539303e7291520583444c
+LANGTOOLS_SHA256SUM = cbf56a6eeff2dac6b04a7573fc1aa97e68e5b84184cb9354115161e2dc60acfc
+OPENJDK_SHA256SUM = c7907fd5d56d6436930133c79698dc75720c9814406a35b6f7706ec5aa077dc7
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 

--- a/NEWS	Wed Dec 10 03:07:35 2014 +0000
+++ b/NEWS	Wed Dec 10 03:09:52 2014 +0000
@@ -321,11 +321,20 @@
   - PR2094, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
   - PR2123: SunEC provider crashes when built using system NSS
   - PR2124: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
+  - PR2135: Race condition in SunEC provider with system NSS
 * CACAO
   - PR2032: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3
 * AArch64 port
   - Use the IcedTea7 fork version rather than the one based on HotSpot 25.
   - Add arch-specific processing of tmp1 register needed for d/f2i
+  - Add char_array_equals intrinsic
+  - Add CNEG and CNEGW to macro assembler.
+  - Add frame anchor fences.
+  - Add missing instruction synchronization barriers and cache flushes.
+  - Add some memory barriers for object creation and runtime calls.
+  - Add support for AES Intrinsics
+  - Add support for pipeline scheduling
+  - Add support for String.indexOf intrinsic
   - Added make rules to allow aarch64-x86 hybrid build to progress
   - Added missing aarch64-specific include
   - Added missing aarch64-specific make file
@@ -340,25 +349,37 @@
   - Add rules to assemble .S files
   - Add support for storing aarch64 call format
   - Add wrapper method to avoid dependency on not yet defined code buffer class
-  - Aded missing endif
+  - Added missing endif
+  - Allow for 0x400 aligned offsets for byte_map_base
   - Array load must only read 32 bits
+  - A more efficient sequence for C1_MacroAssembler::float_cmp.
   - Backout 8c8b5e62e624 and instead move .S rule from zeroshark.make to rules.make
   - Backout additional changes made in ec6a6772fed6, which revert parts of the PPC/AIX port and IcedTea fixes.
+  - Call ICache::invalidate_range() from Relocation::pd_set_data_value().
   - Changed klass oop encode to heap oop encode
   - Changed Method* to methodOop
-  - Corrcted type
   - Correct assert to allow for AArch64
+  - Correct for difference in include hierarchy
+  - Correct typos
   - Corrected error in disassembler code
   - Corrected include
   - Corrected include path
+  - Corrected type
   - Corrected typo
   - Correct includes
   - Correct Method to methdoOopDesc
+  - Define uabs().  Use it everywhere an absolute value is wanted.
   - Defn of BIND does not need to use __ macro
+  - Delete dead code.
+  - Disassembler library should be built as hsdis-aarch64.so
   - Don't test arraycopy routines when using AArch64 simulator
   - Emit_int64 is renamed
+  - Ensure byte_map_base can be loaded using adrp with no need for following ldr
   - Ensure C1 static call stub employs absolute move to allow patching
   - Ensure C2 static calls use correct call adddress in static stub reloc
+  - Ensure perm gen size is not rounded down to zero
+  - Ensure rmethod is reloaded from stack when interpreter makes non leaf VM call
+  - Ensure we pick up hsdis-aarch64.so if BUILTIN_SIM is true
   - Fix couple of mistakes in generate of method handle dispatch
   - Fix cut and paste-o in header
   - Fixed another typo
@@ -371,6 +392,7 @@
   - Fix relocations
   - Fix several small typos
   - Fix some typos
+  - Fix thinko in Atomic::xchg_ptr.
   - Fix typo
   - Fix up aarch64-specific patching code
   - Fix up crc32 support
@@ -381,11 +403,14 @@
   - Make aarch64-x86 hybrid build use correct paths
   - Make hsdis handle aarch64 native case
   - Make static stubs load methodOop in cpool to avoid problems at GC
+  - Miscellaneous bug fixes.
   - Missing change needed to support aarch64 build
   - Modified make files to support aarch64 build
   - Modified shared src to support full aarch64 backport
   - Moved fields which need access from java to top level
+  - Need to actually return the adapter code size
   - Need to pass CFLAGS when assembling .S files using CC_COMPILE
+  - Need to use class handle not class
   - Provide missing CRC32 methods
   - Reload rcpool register after a VM call in case a permgen GC has moved the cache
   - Relocated aarch64 vtable generate code to conform to jdk7
@@ -399,6 +424,7 @@
   - Remove support for volatile load/store rules in ad file
   - Renamed emit_int32 to emit_long and added local emit_long64 in place of missing emit_int64
   - Restored missing open brace
+  - Restored several load_heap_oop calls lost in translation
   - Restore working x86 build
   - Reverted aarch64 architecture description (ad) file to conform to jdk7
   - Reverted aarch64 c1_xxx files to conform to jdk7
@@ -422,14 +448,19 @@
   - Reverted os_cpu/linux_aarch64 code to conform to jdk7
   - Reverted reloc info code to conform to jdk7
   - Revert Method:: etc to methodOopDesc:: etc
+  - Scripts to build aarch64-x86 hybrid and aarch64 native debug images
   - Some errors revealed when building debug image
   - Temporarily disable running test_gamma
+  - Tidy up allocation prefetch
   - Use correct post-increment size in repne_scanw
   - Use membar rules and delete special case volatile rules
   - Use method register to access counter increment field
   - Use movoop in C1 ic_call to keep verifier happy
+  - Use os::malloc to allocate the register map.
   - Use the correct return value from the VM resolve call
+  - Use TLS for ThreadLocalStorage::thread()
   - Various changes to accommodate inclusion of ppc port in icedtea7
+  - Various concurrency fixes.
   - Work around weird compiler issue
 
 New in release 2.5.3 (2014-10-14):

--- a/configure.ac	Wed Dec 10 03:07:35 2014 +0000
+++ b/configure.ac	Wed Dec 10 03:09:52 2014 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.0pre13], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.0pre14], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])

--- a/hotspot.map.in	Wed Dec 10 03:07:35 2014 +0000
+++ b/hotspot.map.in	Wed Dec 10 03:09:52 2014 +0000
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ c6fa18ed8a01 09f028b1cfc7b6aba133f3a1914c876d1a0712cf446dee6ea42a0f30b4e8fe02
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1d3d9e81c8e1 96672ee57de0414408c0cb506c13a289bc6e0574f0679e68329efcf24a0bbde6