--- a/ChangeLog	Thu Apr 09 18:34:28 2015 +0100
+++ b/ChangeLog	Thu Apr 09 18:39:41 2015 +0100
@@ -1,3 +1,12 @@
+2015-04-09  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch,
+	* patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch,
+	* patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch:
+	Removed; upstreamed.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove above patches.
+
 2015-03-31  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch,

--- a/Makefile.am	Thu Apr 09 18:34:28 2015 +0100
+++ b/Makefile.am	Thu Apr 09 18:39:41 2015 +0100
@@ -595,9 +595,6 @@
 	patches/pr1904-icedtea_and_distro_versioning.patch \
 	patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \
 	patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch \
-	patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch \
-	patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch \
-	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 \

--- a/patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch	Thu Apr 09 18:34:28 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-# HG changeset patch
-# User prr
-# Date 1380312407 25200
-#      Fri Sep 27 13:06:47 2013 -0700
-# Node ID 993c08c0fcc7c6f404f708728679e6e707a95f8c
-# Parent  6a11347bf5dcf44fc72ed83b451b89bbc16aea03
-8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object
-Reviewed-by: jgodinez, vadim
-
-diff -r 7fc691671bf0 src/share/classes/sun/font/FreetypeFontScaler.java
---- openjdk/jdk/src/share/classes/sun/font/FreetypeFontScaler.java	Tue Jan 20 03:06:20 2015 +0000
-+++ openjdk/jdk/src/share/classes/sun/font/FreetypeFontScaler.java	Tue Jan 20 05:06:26 2015 +0000
-@@ -164,7 +164,7 @@
- 
-     public synchronized void dispose() {
-         if (nativeScaler != 0L) {
--            disposeNativeScaler(nativeScaler);
-+            disposeNativeScaler(font.get(), nativeScaler);
-             nativeScaler = 0L;
-         }
-     }
-@@ -185,7 +185,7 @@
- 
-     synchronized int getGlyphCode(char charCode) throws FontScalerException {
-         if (nativeScaler != 0L) {
--            return getGlyphCodeNative(nativeScaler, charCode);
-+            return getGlyphCodeNative(font.get(), nativeScaler, charCode);
-         }
-         return FontManager.getNullScaler().getGlyphCode(charCode);
-     }
-@@ -239,9 +239,9 @@
- 
-     private native long getLayoutTableCacheNative(long pScaler);
- 
--    private native void disposeNativeScaler(long pScaler);
-+    private native void disposeNativeScaler(Font2D font2D, long pScaler);
- 
--    private native int getGlyphCodeNative(long pScaler, char charCode);
-+    private native int getGlyphCodeNative(Font2D font, long pScaler, char charCode);
-     private native int getNumGlyphsNative(long pScaler);
-     private native int getMissingGlyphCodeNative(long pScaler);
- 
-diff -r 7fc691671bf0 src/share/native/sun/font/freetypeScaler.c
---- openjdk/jdk/src/share/native/sun/font/freetypeScaler.c	Tue Jan 20 03:06:20 2015 +0000
-+++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c	Tue Jan 20 05:06:26 2015 +0000
-@@ -884,13 +884,13 @@
-  */
- JNIEXPORT void JNICALL
- Java_sun_font_FreetypeFontScaler_disposeNativeScaler(
--        JNIEnv *env, jobject scaler, jlong pScaler) {
-+        JNIEnv *env, jobject scaler, jobject font2D, jlong pScaler) {
-     FTScalerInfo* scalerInfo = (FTScalerInfo *) jlong_to_ptr(pScaler);
-     
-     /* Freetype functions *may* cause callback to java
-        that can use cached values. Make sure our cache is up to date. 
-        NB: scaler context is not important at this point, can use NULL. */
--    int errCode = setupFTContext(env, scaler, scalerInfo, NULL);
-+    int errCode = setupFTContext(env, font2D, scalerInfo, NULL);
-     if (errCode) {
-         return;
-     }
-@@ -939,7 +939,8 @@
-  */
- JNIEXPORT jint JNICALL
- Java_sun_font_FreetypeFontScaler_getGlyphCodeNative(
--        JNIEnv *env, jobject scaler, jlong pScaler, jchar charCode) {
-+        JNIEnv *env, jobject scaler,
-+        jobject font2D, jlong pScaler, jchar charCode) {
- 
-     FTScalerInfo* scalerInfo = (FTScalerInfo *) jlong_to_ptr(pScaler);
-     int errCode;
-@@ -952,7 +953,7 @@
-     /* Freetype functions *may* cause callback to java
-        that can use cached values. Make sure our cache is up to date.
-        Scaler context is not important here, can use NULL. */
--    errCode = setupFTContext(env, scaler, scalerInfo, NULL);
-+    errCode = setupFTContext(env, font2D, scalerInfo, NULL);
-     if (errCode) {
-         return 0;
-     }

--- a/patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch	Thu Apr 09 18:34:28 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-# HG changeset patch
-# User kevinw
-# Date 1393238800 0
-#      Mon Feb 24 10:46:40 2014 +0000
-# Node ID 7a4b0596c5395b5836faee96923b83444cc8a266
-# Parent  cdd84db3f8331071237232f532705ed8e2de4048
-8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters.
-Reviewed-by: sla, dsamersoff
-
-diff -r cdd84db3f833 -r 7a4b0596c539 agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java
---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java	Wed Nov 05 02:26:35 2014 +0000
-+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java	Mon Feb 24 10:46:40 2014 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2003, 2014, 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
-@@ -61,8 +61,9 @@
-     long h = 0;
-     int s = 0;
-     int len = buf.length;
-+    // Emulate the unsigned int in java_lang_String::hash_code
-     while (len-- > 0) {
--      h = 31*h + (0xFFL & buf[s]);
-+      h = 31*h + (0xFFFFFFFFL & buf[s]);
-       s++;
-     }
-     return h & 0xFFFFFFFFL;
-diff -r cdd84db3f833 -r 7a4b0596c539 test/serviceability/sa/jmap-hashcode/Test8028623.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/hotspot/test/serviceability/sa/jmap-hashcode/Test8028623.java	Mon Feb 24 10:46:40 2014 +0000
-@@ -0,0 +1,72 @@
-+/*
-+ * Copyright (c) 2014, 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.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 8028623
-+ * @summary Test hashing of extended characters in Serviceability Agent.
-+ * @library /testlibrary
-+ */
-+
-+import com.oracle.java.testlibrary.JDKToolLauncher;
-+import com.oracle.java.testlibrary.OutputBuffer;
-+import com.oracle.java.testlibrary.ProcessTools;
-+
-+import java.io.File;
-+
-+public class Test8028623 {
-+
-+  public static int à = 1;
-+  public static String dumpFile = "heap.out";
-+
-+  public static void main (String[] args) {
-+
-+    System.out.println(Ã);
-+
-+    try {
-+        int pid = ProcessTools.getProcessId();
-+        JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
-+                                              .addToolArg("-F")
-+                                              .addToolArg("-dump:live,format=b,file=" + dumpFile)
-+                                              .addToolArg(Integer.toString(pid));
-+        ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
-+        OutputBuffer output = ProcessTools.getOutput(pb);
-+        Process p = pb.start();
-+        int e = p.waitFor();
-+        System.out.println("stdout:");
-+        System.out.println(output.getStdout());
-+        System.out.println("stderr:");
-+        System.out.println(output.getStderr());
-+
-+        if (e != 0) {
-+            throw new RuntimeException("jmap returns: " + e);
-+        }
-+        if (! new File(dumpFile).exists()) {
-+            throw new RuntimeException("dump file NOT created: '" + dumpFile + "'");
-+        }
-+    } catch (Throwable t) {
-+        t.printStackTrace();
-+        throw new RuntimeException("Test failed with: " + t);
-+    }
-+  }
-+}

--- a/patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch	Thu Apr 09 18:34:28 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-# HG changeset patch
-# User kevinw
-# Date 1416851563 28800
-#      Mon Nov 24 09:52:43 2014 -0800
-# Node ID 2b280bce222a48a7e1b961f6eeb9a9375b50483d
-# Parent  94b076895e5dcb781379b85d7fbe522cd3347dfa
-8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge
-Reviewed-by: poonam
-
-diff -r 94b076895e5d -r 2b280bce222a test/serviceability/sa/jmap-hashcode/Test8028623.java
---- openjdk/hotspot/test/serviceability/sa/jmap-hashcode/Test8028623.java	Tue Oct 21 11:39:21 2014 -0700
-+++ openjdk/hotspot/test/serviceability/sa/jmap-hashcode/Test8028623.java	Mon Nov 24 09:52:43 2014 -0800
-@@ -26,6 +26,8 @@
-  * @bug 8028623
-  * @summary Test hashing of extended characters in Serviceability Agent.
-  * @library /testlibrary
-+ * @compile -encoding utf8 Test8028623.java
-+ * @run main Test8028623
-  */
- 
- import com.oracle.java.testlibrary.JDKToolLauncher;
-@@ -36,12 +38,12 @@
- 
- public class Test8028623 {
- 
--  public static int à = 1;
-+  public static int \u00CB = 1;
-   public static String dumpFile = "heap.out";
- 
-   public static void main (String[] args) {
- 
--    System.out.println(Ã);
-+    System.out.println(\u00CB);
- 
-     try {
-         int pid = ProcessTools.getProcessId();