--- a/ChangeLog	Tue Jan 20 06:41:59 2015 +0000
+++ b/ChangeLog	Tue Jan 20 08:21:36 2015 +0000
@@ -1,3 +1,12 @@
+2015-01-19  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_SHA256SUM): Update for new b34 tarball.
+	(ICEDTEA_PATCHES): Add fix for PR2179.
+	* NEWS: Updated.
+	* patches/pr2179-avoid_x86_workaround_on_zero.patch:
+	Don't apply 8023956 when building Zero on x86.
+
 2015-01-19  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* Makefile.am:

--- a/Makefile.am	Tue Jan 20 06:41:59 2015 +0000
+++ b/Makefile.am	Tue Jan 20 08:21:36 2015 +0000
@@ -1,7 +1,7 @@
 # Dependencies
 
 OPENJDK_DATE = 20_jan_2015
-OPENJDK_SHA256SUM = c32e6f607eb08cda8cbedb9e10976b627c6e4a1fa1537d073e7630c99deacbb9
+OPENJDK_SHA256SUM = 9dc8f95d340e77ba2b64677c8ce4f2adf830478b972afdb7e00d4835208af6b5
 OPENJDK_VERSION = b34
 OPENJDK_URL = https://java.net/downloads/openjdk6/
 
@@ -608,7 +608,8 @@
 	patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch \
 	patches/pr2070-type_punning_warnings.patch \
 	patches/pr2082-s390_type_fixes.patch \
-	patches/pr2096-4096-bit_dh.patch
+	patches/pr2096-4096-bit_dh.patch \
+	patches/pr2179-avoid_x86_workaround_on_zero.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \

--- a/NEWS	Tue Jan 20 06:41:59 2015 +0000
+++ b/NEWS	Tue Jan 20 08:21:36 2015 +0000
@@ -39,6 +39,7 @@
   - OJ46: Fix lost Classpath exception
   - OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes.
   - OJ48: Fix substitution error.
+  - OJ49: Fix placement of 8023956 fix.
   - S4873188: Support TLS 1.1
   - S6364329: jstat displays "invalid argument count" with usage
   - S6461635: [TESTBUG] BasicTests.sh test fails intermittently
@@ -184,6 +185,7 @@
   - PR2083: Add support for building Zero on AArch64
   - PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
   - PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
+  - PR2179: Avoid x86 workaround when running Zero rather than a JIT
 
 New in release 1.13.5 (2014-10-14):
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr2179-avoid_x86_workaround_on_zero.patch	Tue Jan 20 08:21:36 2015 +0000
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User andrew
+# Date 1405461315 -3600
+#      Tue Jul 15 22:55:15 2014 +0100
+# Node ID fae3b09fe959294f7a091a6ecaae91daf1cb4f5c
+# Parent  a61c666945e741b9b69ba9b27f93eb0951dda696
+PR1868: Avoid x86 workaround when running Zero rather than a JIT
+Contributed-by: Matthias Klose <doko@ubuntu.com>
+
+diff -r a61c666945e7 -r fae3b09fe959 src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Tue Jun 03 17:16:46 2014 +0100
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Tue Jul 15 22:55:15 2014 +0100
+@@ -4925,7 +4925,7 @@
+ 
+   Linux::capture_initial_stack(JavaThread::stack_size_at_create());
+ 
+-#if defined(IA32)
++#if defined(IA32) && !defined(ZERO)
+   workaround_expand_exec_shield_cs_limit();
+ #endif
+ 
+diff -r a61c666945e7 -r fae3b09fe959 src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+--- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Tue Jun 03 17:16:46 2014 +0100
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Tue Jul 15 22:55:15 2014 +0100
+@@ -880,7 +880,7 @@
+  * updates (JDK-8023956).
+  */
+ void os::workaround_expand_exec_shield_cs_limit() {
+-#if defined(IA32)
++#if defined(IA32) && !defined(ZERO)
+   size_t page_size = os::vm_page_size();
+   /*
+    * Take the highest VA the OS will give us and exec