--- a/ChangeLog	Thu Jul 21 22:45:04 2016 +0100
+++ b/ChangeLog	Fri Jul 22 14:13:50 2016 +0100
@@ -1,3 +1,29 @@
+2016-07-21  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	Bump to icedtea-3.1.0pre04.
+	* patches/pr3094.patch:
+	Removed as applied upstream.
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-3.1.0pre04 tag.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(NASHORN_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(NASHORN_SHA256SUM): Likewise.
+	(ICEDTEA_PATCHES): Remove pr3094 backport
+	now applied upstream.
+	* NEWS: Updated.
+	* configure.ac: Bump to 3.1.0pre04.
+	* hotspot.map.in: Update to icedtea-3.1.0pre04 tag.
+
 2016-07-21  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR3079: Provide option to build Shenandoah on x86_64

--- a/Makefile.am	Thu Jul 21 22:45:04 2016 +0100
+++ b/Makefile.am	Fri Jul 22 14:13:50 2016 +0100
@@ -4,21 +4,21 @@
 BUILD_VERSION = b14
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = d920107a9fd4
-JAXP_CHANGESET = 5c97913ea9f7
-JAXWS_CHANGESET = 82ec7b3637db
-JDK_CHANGESET = aab729e0626a
-LANGTOOLS_CHANGESET = ff680965fa8c
-OPENJDK_CHANGESET = a161af8a08eb
-NASHORN_CHANGESET = 2417a5bf2b15
-
-CORBA_SHA256SUM = f5d147fa93d42f7bcd1399333c123b7ddbc369707ca1ebfc2db0078a8bd11240
-JAXP_SHA256SUM = d5da8f017de517665f228606a8c49a48dcd4ee881f6a619f0ec5a297820eea86
-JAXWS_SHA256SUM = 6ca78d91139cf035e8bf79997ef386f1037e940a1b4e498280406fd2a66779e2
-JDK_SHA256SUM = b3a4fb8e2ed9cdc6fd2d761ae7a740b619bed43de8f78363695661e20882cefa
-LANGTOOLS_SHA256SUM = 71271890422ea55a994e8cf9a93cd089f326d613a5897663ba5a70e05f45514e
-OPENJDK_SHA256SUM = 3fd511e872d35d3c82f9cf2f301a89214e27ea81e2d5ad8ff2ccf0fd4b4e9994
-NASHORN_SHA256SUM = c930badb6481d98ffbe919108440a3cd675b6f61bc862a880933d3e07b282b26
+CORBA_CHANGESET = b74e7245e405
+JAXP_CHANGESET = 0de4d7e1996f
+JAXWS_CHANGESET = 9812eb7e305e
+JDK_CHANGESET = ee0b65b8fd10
+LANGTOOLS_CHANGESET = fc69984700e1
+OPENJDK_CHANGESET = 6517c9e186c5
+NASHORN_CHANGESET = 68145b690b18
+
+CORBA_SHA256SUM = 09911ffa934ef93da8d2b6c1ea9985f742289f8d9358dd6890a657a5c01e8858
+JAXP_SHA256SUM = 5436ee8451cd14e5f263a3eab9b5cd18d35f940c97aec3e0f5c1e22fc34c31af
+JAXWS_SHA256SUM = 6601617778efdf42b882cd6c918eec0ac854da7bbe730af45855e0ac27b488d7
+JDK_SHA256SUM = 4f78f29d385725807759a4400d8d8202f3b378bd0e242026d7e33ffbc2245502
+LANGTOOLS_SHA256SUM = 921956c0064232015d5905af9f05bfec0ca901d00ec7967ea4c4314ac4730d15
+OPENJDK_SHA256SUM = 18c07b4d6c36084f8a2a727dd95823535674ebb423921dc9b1c20642548909d0
+NASHORN_SHA256SUM = d67f211a1f0c65051044aa395579d5bd2f4640f1e99736153349b7657ca96bd0
 
 HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
 HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
@@ -332,8 +332,7 @@
 # Patch list
 
 ICEDTEA_PATCHES = \
-	patches/override-redirect-metacity.patch \
-	patches/pr3094.patch
+	patches/override-redirect-metacity.patch
 
 # Conditional patches
 

--- a/NEWS	Thu Jul 21 22:45:04 2016 +0100
+++ b/NEWS	Fri Jul 22 14:13:50 2016 +0100
@@ -119,6 +119,10 @@
   - S8014212, PR2866: Robot captures black screen
   - S8029339, PR1061: Custom MultiResolution image support on HiDPI displays
   - S8031145, PR3077: Re-examine closed i18n tests to see it they can be moved to the jdk repository.
+  - S8034856, PR3095: gcc warnings compiling src/solaris/native/sun/security/pkcs11
+  - S8034857, PR3095: gcc warnings compiling src/solaris/native/sun/management
+  - S8035054, PR3095: JarFacade.c should not include ctype.h
+  - S8035287, PR3095: gcc warnings compiling various libraries files
   - S8038631, PR3077: Create wrapper for awt.Robot with additional functionality
   - S8039279, PR3077: Move awt tests to openjdk repository
   - S8041561, PR3077: Inconsistent opacity behaviour between JCheckBox and JRadioButton
@@ -182,15 +186,19 @@
   - S8158260, PR2991, RH1341258: PPC64: unaligned Unsafe.getInt can lead to the generation of illegal instructions
   - S8159244, PR3074: Partially initialized string object created by C2's string concat optimization may escape
   - S8159690, PR3077: [TESTBUG] Mark headful tests with @key headful.
+  - S8160294, PR2882, PR3095: Some client libraries cannot be built with GCC 6
 * Bug fixes
   - PR1958: GTKLookAndFeel does not honor gtk-alternative-button-order
   - PR2822: Feed LIBS & CFLAGS into configure rather than make to avoid re-discovery by OpenJDK configure
   - PR2932: Support ccache in a non-automagic manner
+  - PR2933: Support ccache 3.2 and later
   - PR2964: Set system defaults based on OS
   - PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
+  - PR3078: Remove duplicated line dating back to 6788347 and 6894807
   - PR3083, RH1346460: Regression in SSL debug output without an ECC provider
   - PR3089: Remove old memory limits patch
   - PR3090: SystemTap is heavily confused by multiple JDKs
+  - PR3095: Fix warnings in URLClassPath.c
   - PR3096: Remove dead --disable-optimizations option
 * AArch64 port
   - S8145320, PR3078: Create unsafe_arraycopy and generic_arraycopy for AArch64
@@ -226,6 +234,7 @@
   - S8158913, PR3078: aarch64: SEGV running Spark terasort
   - S8159052, PR3078: aarch64: optimise unaligned copies in pd_disjoint_words and pd_conjoint_words
   - S8159063, PR3078: aarch64: optimise unaligned array copy long
+  - PR3078: Cleanup remaining differences from aarch64/jdk8u tree
 
 New in release 3.0.1 (2016-04-23):
 

--- a/configure.ac	Thu Jul 21 22:45:04 2016 +0100
+++ b/configure.ac	Fri Jul 22 14:13:50 2016 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.1.0pre03], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [3.1.0pre04], [distro-pkg-dev@openjdk.java.net])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])

--- a/hotspot.map.in	Thu Jul 21 22:45:04 2016 +0100
+++ b/hotspot.map.in	Fri Jul 22 14:13:50 2016 +0100
@@ -1,3 +1,3 @@
 # version url changeset md5sum
-default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ ea6933324a7a 2fe149bb8b212f973c013bae36fcc6b589f88b3fb0886c48ef3921f85e216a78
+default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 0f47eef348e2 e41072fdf970b226267d3be19189ea980aeeffc5c3e34574bb5980af603cdd9f
 shenandoah drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ ec2e71f375b1 3a4579daab230b7cf8f05074a686e3a4a76184d87d6bc277d735543ad683b38e

--- a/patches/pr3094.patch	Thu Jul 21 22:45:04 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-diff -r bb14c5df7088 src/cpu/zero/vm/vm_version_zero.hpp
---- openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.hpp	Thu Jul 14 04:02:40 2016 +0100
-+++ openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.hpp	Fri Jul 15 17:17:17 2016 +0100
-@@ -1,6 +1,6 @@
- /*
-  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2007 Red Hat, Inc.
-+ * Copyright 2015 Red Hat, Inc.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -34,6 +34,7 @@
-   static const char* cpu_features() {
-     return "";
-   }
-+  static void initialize();
- };
- 
- #endif // CPU_ZERO_VM_VM_VERSION_ZERO_HPP