--- a/ChangeLog	Tue Apr 06 23:13:17 2010 +0100
+++ b/ChangeLog	Wed Apr 07 22:05:47 2010 +0100
@@ -1,3 +1,10 @@
+2010-04-07  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/openjdk/6879689-hotspot_warning_fix.patch,
+	* patches/security/20100330/6633872.patch,
+	* Makefile.am:
+	Remove upstreamed patches.
+
 2010-04-06  Deepak Bhole <dbhole@redhat.com>
 
 	* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc

--- a/Makefile.am	Tue Apr 06 23:13:17 2010 +0100
+++ b/Makefile.am	Wed Apr 07 22:05:47 2010 +0100
@@ -294,7 +294,6 @@
 	patches/icedtea-disable-cc-incompatible-sanity-checks.patch \
 	patches/icedtea-explicit-target-arch.patch \
 	patches/icedtea-gcc-stack-markings.patch \
-	patches/openjdk/6879689-hotspot_warning_fix.patch \
 	patches/icedtea-no-precompiled.patch \
 	patches/icedtea-linux-separate-debuginfo.patch \
 	patches/icedtea-parisc.patch \
@@ -308,8 +307,7 @@
 	patches/icedtea-jtreg-httpTest.patch \
 	patches/openjdk/6873059-javac-versioning-corba.patch \
 	patches/hotspot/$(HSBUILD)/6873059-javac-versioning-hotspot.patch \
-	patches/openjdk/6873059-javac-versioning-jdk.patch \
-	patches/security/20100330/6633872.patch
+	patches/openjdk/6873059-javac-versioning-jdk.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \

--- a/patches/openjdk/6879689-hotspot_warning_fix.patch	Tue Apr 06 23:13:17 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1252396876 -3600
-# Node ID 5fdbe2cdf565f5d2c5c6bc8686a8eb792903e30e
-# Parent  6ab1d6ece8bd7e0fb9bc16c2a1e03ca6b5402426
-6879689: Fix warning about ignored return value when compiling with -O2
-Summary: Store the return value of fwrite and check it matches the size of the array.
-Reviewed-by: twisti, dholmes
-
-diff -r 6ab1d6ece8bd -r 5fdbe2cdf565 src/share/vm/adlc/archDesc.cpp
---- openjdk.orig/hotspot/src/share/vm/adlc/archDesc.cpp	Mon Aug 17 15:03:39 2009 -0700
-+++ openjdk/hotspot/src/share/vm/adlc/archDesc.cpp	Tue Sep 08 09:01:16 2009 +0100
-@@ -1031,7 +1031,8 @@
- //---------------------------addSUNcopyright-------------------------------
- // output SUN copyright info
- void ArchDesc::addSunCopyright(char* legal, int size, FILE *fp) {
--  fwrite(legal, size, 1, fp);
-+  size_t count = fwrite(legal, 1, size, fp);
-+  assert(count == (size_t) size, "copyright info truncated");
-   fprintf(fp,"\n");
-   fprintf(fp,"// Machine Generated File.  Do Not Edit!\n");
-   fprintf(fp,"\n");

--- a/patches/security/20100330/6633872.patch	Tue Apr 06 23:13:17 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-diff -r fd831ae629ff src/share/classes/sun/misc/SharedSecrets.java
---- openjdk.orig/jdk/src/share/classes/sun/misc/SharedSecrets.java	Tue Apr 06 11:57:39 2010 +0100
-+++ openjdk/jdk/src/share/classes/sun/misc/SharedSecrets.java	Tue Apr 06 21:30:03 2010 +0100
-@@ -29,6 +29,7 @@
- import java.io.Console;
- import java.io.File;
- import java.io.FileDescriptor;
-+import java.security.ProtectionDomain;
- 
- /** A repository of "shared secrets", which are a mechanism for
-     calling implementation-private methods in another package without
-@@ -118,6 +119,9 @@
- 
-     public static JavaSecurityProtectionDomainAccess
-         getJavaSecurityProtectionDomainAccess() {
--            return javaSecurityProtectionDomainAccess;
-+        if (javaSecurityProtectionDomainAccess == null)
-+            unsafe.ensureClassInitialized(ProtectionDomain.class);
-+
-+        return javaSecurityProtectionDomainAccess;
-     }
- }