--- a/ChangeLog	Fri May 24 20:07:27 2019 +0100
+++ b/ChangeLog	Sat May 25 21:04:45 2019 +0100
@@ -1,3 +1,31 @@
+2019-05-25  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump to icedtea-3.13.0pre01.
+	* patches/pr3724.patch: Removed as now included
+	upstream.
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-3.13.0pre01 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): Drop pr3724.patch.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DETERMINE_VERSION): Update JDK_UPDATE_VERSION to 222.
+	and set BUILD_VERSION to b01.
+	* configure.ac: Bump to 3.13.0pre01.
+	* hotspot.map.in: Update to icedtea-3.13.0pre01 tag.
+
 2019-05-24  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump shenandoah to aarch64-shenandoah-jdk8u222-b01.

--- a/Makefile.am	Fri May 24 20:07:27 2019 +0100
+++ b/Makefile.am	Sat May 25 21:04:45 2019 +0100
@@ -1,20 +1,20 @@
 # Dependencies
 
-CORBA_CHANGESET = fa1553d2f23e
-JAXP_CHANGESET = 7a977b82f34c
-JAXWS_CHANGESET = 752d9e54c69a
-JDK_CHANGESET = bfaa5c6df4a8
-LANGTOOLS_CHANGESET = fb494039358f
-OPENJDK_CHANGESET = f0482b9b7f7b
-NASHORN_CHANGESET = 93462e8b4f4f
-
-CORBA_SHA256SUM = 5ce6b01dd0b1608d6cf293eec3a51c2b0ad6567cc8b0ff8e7834016603bab9e8
-JAXP_SHA256SUM = 24ee541b347bbaf948db050fe9bbd2a47ecb07974c98bbe3e3aca79c4ccb3433
-JAXWS_SHA256SUM = e3e96176392415126733e38042ca06660933d3549a3c9829643b8c688233bceb
-JDK_SHA256SUM = df05b344ec32de2736c4ea12e274a6967d9844f228e5994cdf5d953ab3c4cd35
-LANGTOOLS_SHA256SUM = 52cc44f48b782aac4a1afb3326ead961665f9cd3bb855086d709ae8b8db5340a
-OPENJDK_SHA256SUM = b19b2f33dc9d8e1619cc59b4e3ffe7129698016f468f8759e81d04583c692e0c
-NASHORN_SHA256SUM = 434fa40c57ab1c6416b65aecc187cbf9b16cf1d90e5e68f1333563a60e0fdbb1
+CORBA_CHANGESET = 1c3cdc66dde5
+JAXP_CHANGESET = 9862aa380ee4
+JAXWS_CHANGESET = 4677dd9c02e9
+JDK_CHANGESET = 5e1641ac146b
+LANGTOOLS_CHANGESET = 78399e0f6ae4
+OPENJDK_CHANGESET = abf5011267ae
+NASHORN_CHANGESET = a4ff0302c55d
+
+CORBA_SHA256SUM = e5caa3a60669afaab23a9ef4d77bea4f63c8f711f55f9e1343ae3b0ecb71e33c
+JAXP_SHA256SUM = 81a99546a810cf5955a1bc80207a524facdc7b2fa0e586fbab68a6ca647260ed
+JAXWS_SHA256SUM = eda322bf7de10bde80e771e4a452a20ddf0dbab35ec601dba5a3e4ddb3b5ee5e
+JDK_SHA256SUM = 04f89d6d0927e7034b642b51569947c3a8090ee79de01c208ae23bde4eb50fc0
+LANGTOOLS_SHA256SUM = 652e3412ee64491614dc2c6765e35999010b8f3e1635b9d5298e1946487e6fbc
+OPENJDK_SHA256SUM = b115085d6bd2c042ad55f31a127bf524d883997d906ce07e1c32cf0183542236
+NASHORN_SHA256SUM = f0eae99912b46a1021e705b5705cd5bf8a2dba590cdebb7c73d844e06b7f1e13
 
 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`"
@@ -395,9 +395,6 @@
 	patches/hotspot/$(HSBUILD)/8222286-pr3727-s390-shenandoah.patch \
 	patches/hotspot/$(HSBUILD)/pr3519-return_value-02.patch
 endif
-else
-ICEDTEA_PATCHES += \
-	patches/pr3724.patch
 endif
 
 if BUILD_CACAO

--- a/NEWS	Fri May 24 20:07:27 2019 +0100
+++ b/NEWS	Sat May 25 21:04:45 2019 +0100
@@ -12,14 +12,48 @@
 
 New in release 3.13.0 (2019-07-XX):
 
-* Shenandoah
+* Import of OpenJDK 8 u222 build 01
+  - S8022879: TEST_BUG: sun/nio/cs/MalformedSurrogates.java fails intermittently
+  - S8025209: Intermittent test failure java/net/Socket/asyncClose/AsyncClose.java
+  - S8030690: TEST_BUG java/nio/Buffer/Chars.java fails intermittently
+  - S8031563: TEST_BUG: java/nio/channels/Selector/ChangingInterests.java failed once
+  - S8031666: TEST_BUG: java/net/ipv6tests/UdpTest.java failed because of SocketTimeoutException
+  - S8048782: OpenJDK: PiscesCache : xmax/ymax rounding up can cause RasterFormatException
   - S8055814: [TESTBUG] runtime/NMT/NMTWithCDS.java fails with product builds due to missing UnlockDiagnosticVMOptions
+  - S8073078: java/nio/file/FileStore/Basic.java sensitive to NFS configuration
+  - S8129988: JSSE should create a single instance of the cacerts KeyStore
+  - S8137231: sun/security/rsa/SpecTest.java timeout with Agent error: java.lang.Exception
   - S8150013: ParNew: Prune nmethods scavengable list.
+  - S8151225: Mark SpecTest.java as intermittently failing
   - S8154156: PPC64: improve array copy stubs by using vector instructions
+  - S8156035: Remove intermittent key from sun/security/rsa/SpecTest.java
+  - S8157287: java/nio/file/FileStore/Basic.java failed with "java.nio.file.AccessDeniedException : /zones/zoneone/root "
+  - S8192854: FONTCONFIG_CFLAGS missing from spec.gmk.in
+  - S8202768: [macos] Appkit thread slows when any Window Manager active
+  - S8203627: Swing applications with JRadioButton and JCheckbox fail to render correctly when using GTK3 and the GTK L&F
+  - S8205916: [test] Fix jdk/tools/launcher/RunpathTest to handle both, RPATH and RUNPATH
+  - S8206955: MethodHandleProxies.asInterfaceInstance does not support default methods
+  - S8207760: SAXException: Invalid UTF-16 surrogate detected: d83c ?
   - S8209951: Problematic sparc intrinsic: com.sun.crypto.provider.CipherBlockChaining
   - S8213825: assert(false) failed: Non-balanced monitor enter/exit! Likely JNI locking
+  - S8214109: XToolkit is not correctly displayed color on 16-bit high color setting
+  - S8214111: There is no icon in all JOptionPane target image
+  - S8214112: The whole text in target JPasswordField image are not selected
+  - S8214252: Expanded & Collapsed nodes of a JTree look the same on GTK3
+  - S8214253: Tooltip is transparent rather than having a black background
+  - S8217263: Automate DashOffset test
   - S8217597: [TESTBUG] old version docker does not support --cpus
+  - S8218469: JSlider display issue with slider for GTKLookAndFeel
+  - S8218470: JScrollBar display issue with GTKLookAndFeel
+  - S8218472: JProgressBar display issue with GTKLookAndFeel
+  - S8218473: JOptionPane display issue with GTKLookAndFeel
+  - S8218479: JTextPane display issue with GTKLookAndFeel
+  - S8220349: The fix done for JDK-8214253 have caused issues in JTree behaviour
   - S8220718: Missing ResourceMark in nmethod::metadata_do
+  - S8221789: make reconfigure broken (jdk8u only)
+  - S8222965: Backport of JDK-8129988 broke the build
+  - S8222975: Fix 'release' file to reflect actual repo checkin used to compile JDK
+* Shenandoah
   - [backport] 8210879: ClassLoaderStatsClosure does raw oop comparison
   - [backport] 8216973: Kick up cleanup phases in the right places
   - [backport] 8217043: Shenandoah: SIGSEGV in Type::meet_helper() at barrier expansion time

--- a/acinclude.m4	Fri May 24 20:07:27 2019 +0100
+++ b/acinclude.m4	Sat May 25 21:04:45 2019 +0100
@@ -2089,8 +2089,8 @@
   AC_MSG_CHECKING([which branch and release of IcedTea is being built])
   JAVA_VER=1.8.0
   JAVA_VENDOR=openjdk
-  JDK_UPDATE_VERSION=212
-  BUILD_VERSION=b04
+  JDK_UPDATE_VERSION=222
+  BUILD_VERSION=b01
   COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION}
   OPENJDK_VER=${JAVA_VER}_${COMBINED_VERSION}
   ICEDTEA_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's#pre.*##')

--- a/configure.ac	Fri May 24 20:07:27 2019 +0100
+++ b/configure.ac	Sat May 25 21:04:45 2019 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.13.0pre00], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [3.13.0pre01], [distro-pkg-dev@openjdk.java.net])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])

--- a/hotspot.map.in	Fri May 24 20:07:27 2019 +0100
+++ b/hotspot.map.in	Sat May 25 21:04:45 2019 +0100
@@ -1,4 +1,4 @@
 # version type(drop/hg) url changeset sha256sum
-default drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 3f9a60eb8ef0 073ebc2f2e0301e0f2c17bb0e9d7340a0ed1f003c9706109f25ecefeeedc67f6
+default drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ d861794ddc0f 08e64cc3a8b7066c0846883462fd0f680d35abfc811b65cb75df4d1a0d08dec6
 shenandoah drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ a33c11783e6b a9a12280e16c9a84c8315aeb8d67a3843f2f3110509cb10292af5cf63b78fb7e
 aarch32 drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 57f4048a925b 921202baed30726dc833c94817e07a4baa7d3b1e9129af032b09bd7f0e3bcfd1

--- a/patches/pr3724.patch	Fri May 24 20:07:27 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User roland
-# Date 1554911223 -3600
-#      Wed Apr 10 16:47:03 2019 +0100
-# Node ID 5f929b75d93ca63ca29cc1324fb50dac67a231a6
-# Parent  5174c702c7e30e0b047b89d2163736a5fd79861b
-8213419, PR3724: [AArch64] C2 may hang in MulLNode::Ideal()/MulINode::Ideal() with gcc 8.2.1
-Reviewed-by: kvn, dlong, aph
-
-diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp
---- openjdk.orig/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp
-@@ -320,29 +320,6 @@
-   enum operation { uxtb, uxth, uxtw, uxtx, sxtb, sxth, sxtw, sxtx };
- };
- 
--// abs methods which cannot overflow and so are well-defined across
--// the entire domain of integer types.
--static inline unsigned int uabs(unsigned int n) {
--  union {
--    unsigned int result;
--    int value;
--  };
--  result = n;
--  if (value < 0) result = -result;
--  return result;
--}
--static inline unsigned long uabs(unsigned long n) {
--  union {
--    unsigned long result;
--    long value;
--  };
--  result = n;
--  if (value < 0) result = -result;
--  return result;
--}
--static inline unsigned long uabs(long n) { return uabs((unsigned long)n); }
--static inline unsigned long uabs(int n) { return uabs((unsigned int)n); }
--
- // Addressing modes
- class Address VALUE_OBJ_CLASS_SPEC {
-  public: