--- a/ChangeLog	Sun Aug 07 21:57:47 2016 +0100
+++ b/ChangeLog	Mon Aug 08 05:33:32 2016 +0100
@@ -1,3 +1,14 @@
+2016-08-07  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	Bump shenandoah to aarch64-shenandoah-jdk8u102-b14.
+	* patches/hotspot/shenandoah/6425769-pr2859.patch,
+	* patches/hotspot/shenandoah/8148752-pr2943.patch:
+	Removed as applied upstream in 8u102.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Drop above patches.
+	* hotspot.map.in: Update shenandoah to
+	aarch64-shenandoah-jdk8u102-b14 tag.
+
 2016-08-07  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	Bump to icedtea-3.2.0pre02.

--- a/Makefile.am	Sun Aug 07 21:57:47 2016 +0100
+++ b/Makefile.am	Mon Aug 08 05:33:32 2016 +0100
@@ -339,12 +339,10 @@
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
-	patches/hotspot/$(HSBUILD)/6425769-pr2859.patch \
 	patches/hotspot/$(HSBUILD)/8038392-rh1064383.patch \
 	patches/hotspot/$(HSBUILD)/8041658.patch \
 	patches/hotspot/$(HSBUILD)/8087218-pr2740.patch \
 	patches/hotspot/$(HSBUILD)/8145096-pr2854.patch \
-	patches/hotspot/$(HSBUILD)/8148752-pr2943.patch \
 	patches/hotspot/$(HSBUILD)/8154210.patch \
 	patches/hotspot/$(HSBUILD)/8158260-pr2991-rh1341258.patch \
 	patches/hotspot/$(HSBUILD)/8159244-pr3074.patch \

--- a/hotspot.map.in	Sun Aug 07 21:57:47 2016 +0100
+++ b/hotspot.map.in	Mon Aug 08 05:33:32 2016 +0100
@@ -1,3 +1,3 @@
 # version type(drop/hg) url changeset sha256sum
 default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ ac19c2e28a51 1ff703de1c644b16d78abb7f29af9a3687efaa7959b0d9e5efb398355120edf3
-shenandoah drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ a98d8f47604b c33699057a157f769760d78f26dd9c6cc04b5a9ead1cc765acc31cbd4ed9a8fb
+shenandoah drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ d0f52d39d1cd be2df27470ec8a6a8667c291ecedb779dfaad8c2cd254a84ababde143228118f

--- a/patches/hotspot/shenandoah/6425769-pr2859.patch	Sun Aug 07 21:57:47 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1450425347 -3600
-#      Fri Dec 18 08:55:47 2015 +0100
-# Node ID 9a57d01ddf0309b4250ad6767dd4cc26b5c8626f
-# Parent  5f2728295878fc80d8d14b4304abe9629e6893cd
-6425769, PR2859: Allow specifying an address to bind JMX remote connector
-Reviewed-by: jbachorik, dfuchs
-
-diff -r 5f2728295878 -r 9a57d01ddf03 src/share/vm/services/diagnosticCommand.cpp
---- openjdk/hotspot/src/share/vm/services/diagnosticCommand.cpp	Fri Apr 01 04:06:33 2016 +0100
-+++ openjdk/hotspot/src/share/vm/services/diagnosticCommand.cpp	Fri Dec 18 08:55:47 2015 +0100
-@@ -437,6 +437,10 @@
-   ("config.file",
-    "set com.sun.management.config.file", "STRING", false),
- 
-+  _jmxremote_host
-+  ("jmxremote.host",
-+   "set com.sun.management.jmxremote.host", "STRING", false),
-+
-   _jmxremote_port
-   ("jmxremote.port",
-    "set com.sun.management.jmxremote.port", "STRING", false),
-@@ -516,6 +520,7 @@
- 
-   {
-     _dcmdparser.add_dcmd_option(&_config_file);
-+    _dcmdparser.add_dcmd_option(&_jmxremote_host);
-     _dcmdparser.add_dcmd_option(&_jmxremote_port);
-     _dcmdparser.add_dcmd_option(&_jmxremote_rmi_port);
-     _dcmdparser.add_dcmd_option(&_jmxremote_ssl);
-@@ -586,6 +591,7 @@
-     }
- 
-     PUT_OPTION(_config_file);
-+    PUT_OPTION(_jmxremote_host);
-     PUT_OPTION(_jmxremote_port);
-     PUT_OPTION(_jmxremote_rmi_port);
-     PUT_OPTION(_jmxremote_ssl);
-diff -r 5f2728295878 -r 9a57d01ddf03 src/share/vm/services/diagnosticCommand.hpp
---- openjdk/hotspot/src/share/vm/services/diagnosticCommand.hpp	Fri Apr 01 04:06:33 2016 +0100
-+++ openjdk/hotspot/src/share/vm/services/diagnosticCommand.hpp	Fri Dec 18 08:55:47 2015 +0100
-@@ -280,6 +280,7 @@
-   // com.sun.management is omitted
- 
-   DCmdArgument<char *> _config_file;
-+  DCmdArgument<char *> _jmxremote_host;
-   DCmdArgument<char *> _jmxremote_port;
-   DCmdArgument<char *> _jmxremote_rmi_port;
-   DCmdArgument<char *> _jmxremote_ssl;

--- a/patches/hotspot/shenandoah/8148752-pr2943.patch	Sun Aug 07 21:57:47 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-# HG changeset patch
-# User thartmann
-# Date 1455606693 -3600
-#      Tue Feb 16 08:11:33 2016 +0100
-# Node ID 76eca5cf31500ecb1d1807685729a7ea5c3780e7
-# Parent  a298e2a6f83a411385da1fed5b09c3ee52c71c31
-8148752, PR2943: Compiled StringBuilder code throws StringIndexOutOfBoundsException
-Summary: Fixed handling of long/double MH arguments in GraphBuilder::try_method_handle_inline().
-Reviewed-by: roland, shade, vlivanov, kvn, twisti
-
-diff -r a298e2a6f83a -r 76eca5cf3150 src/share/vm/opto/callGenerator.cpp
---- openjdk/hotspot/src/share/vm/opto/callGenerator.cpp	Wed Apr 20 04:04:43 2016 +0100
-+++ openjdk/hotspot/src/share/vm/opto/callGenerator.cpp	Tue Feb 16 08:11:33 2016 +0100
-@@ -829,17 +829,18 @@
-           }
-         }
-         // Cast reference arguments to its type.
--        for (int i = 0; i < signature->count(); i++) {
-+        for (int i = 0, j = 0; i < signature->count(); i++) {
-           ciType* t = signature->type_at(i);
-           if (t->is_klass()) {
--            Node* arg = kit.argument(receiver_skip + i);
-+            Node* arg = kit.argument(receiver_skip + j);
-             const TypeOopPtr* arg_type = arg->bottom_type()->isa_oopptr();
-             const Type*       sig_type = TypeOopPtr::make_from_klass(t->as_klass());
-             if (arg_type != NULL && !arg_type->higher_equal(sig_type)) {
-               Node* cast_obj = gvn.transform(new (C) CheckCastPPNode(kit.control(), arg, sig_type));
--              kit.set_argument(receiver_skip + i, cast_obj);
-+              kit.set_argument(receiver_skip + j, cast_obj);
-             }
-           }
-+          j += t->size();  // long and double take two slots
-         }
- 
-         // Try to get the most accurate receiver type
-diff -r a298e2a6f83a -r 76eca5cf3150 test/compiler/jsr292/LongReferenceCastingTest.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/hotspot/test/compiler/jsr292/LongReferenceCastingTest.java	Tue Feb 16 08:11:33 2016 +0100
-@@ -0,0 +1,75 @@
-+/*
-+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ *
-+ */
-+
-+import java.lang.invoke.*;
-+
-+/**
-+ * @test
-+ * @bug 8148752
-+ * @summary Test correct casting of MH arguments during inlining.
-+ * @run main LongReferenceCastingTest
-+ */
-+public class LongReferenceCastingTest {
-+    static final String MY_STRING = "myString";
-+    static final MethodHandle MH;
-+
-+    static {
-+        try {
-+            MethodHandles.Lookup lookup = MethodHandles.lookup();
-+            MethodType mt = MethodType.methodType(String.class, long.class, Object.class, String.class);
-+            MH = lookup.findVirtual(LongReferenceCastingTest.class, "myMethod", mt);
-+        } catch (Exception e) {
-+            throw new Error(e);
-+        }
-+    }
-+
-+    public String myMethod(long l, Object o, String s) {
-+        // The long argument occupies two stack slots, causing C2 to treat it as
-+        // two arguments and casting the fist one two long and the second one to Object.
-+        // As a result, Object o is casted to String and the o.toString() call is
-+        // inlined as String::toString(). We fail at runtime because 'o' is not a String.
-+        return o.toString();
-+    }
-+
-+    public String toString() {
-+        return MY_STRING;
-+    }
-+
-+    public static void main(String[] args) throws Exception {
-+        LongReferenceCastingTest test = new LongReferenceCastingTest();
-+        try {
-+            for (int i = 0; i < 20_000; ++i) {
-+                if (!test.invoke().equals(MY_STRING)) {
-+                    throw new RuntimeException("Invalid string");
-+                }
-+            }
-+        } catch (Throwable t) {
-+            throw new RuntimeException("Test failed", t);
-+        }
-+    }
-+
-+    public String invoke() throws Throwable {
-+        return (String) MH.invokeExact(this, 0L, (Object)this, MY_STRING);
-+    }
-+}