Remove more dead patches

[Gary Benson]

Hi all,

This commit removes the ancient workaround I mentioned before from
IcedTea7, and another dead patch that is not required to build Zero.

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 21376f9eed89 -r 2deccfc8b64f ChangeLog
--- a/ChangeLog	Thu Dec 03 13:53:28 2009 +0000
+++ b/ChangeLog	Thu Dec 03 16:39:28 2009 +0000
@@ -1,3 +1,10 @@
+2009-12-03  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-core-build.patch: Removed.
+	* patches/icedtea-zero-build.patch: Likewise.
+	* Makefile.am (ICEDTEA_PATCHES): Don't apply the above.
+	* HACKING: Document the above.
+
 2009-12-03  Gary Benson  <gbenson at redhat.com>
 
 	* patches/hotspot/icedtea-bytecodeInterpreter.patch: Removed.
diff -r 21376f9eed89 -r 2deccfc8b64f HACKING
--- a/HACKING	Thu Dec 03 13:53:28 2009 +0000
+++ b/HACKING	Thu Dec 03 16:39:28 2009 +0000
@@ -15,7 +15,6 @@
   Partially fixed by addition of discardMark() in OpenJDK7.
 * icedtea-copy-plugs.patch: Add IcedTea's 'plugs' for Java WebStart support, add
   cast to getAnnotation and trapAuthenticationFailure variable to com.sun.jmx.snmp.SnmpPduTrap.
-* icedtea-core-build.patch: Add support for building IcedTea core VM.
 * icedtea-debuginfo.patch: Add -g option to build to generate debugging information.
 * icedtea-demos.patch: Fix building of JVMTI demo.
 * icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
@@ -49,7 +48,6 @@
 * icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486).
 * icedtea-version.patch: Replace name and bug URL with IcedTea versions.
 * icedtea-webservices.patch: Add applet support.
-* icedtea-zero-build.patch: Add support for the zero assembler build.
 * icedtea-shark-build.patch: Add support for building the Shark JIT.
 * icedtea-alpha-fixes.patch: Fix build issues on alpha-linux.
 * icedtea-arch.patch: Add support for additional architectures.
@@ -198,3 +196,5 @@
 * icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485).
 * icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
 * icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
+* icedtea-core-build.patch: Add support for building IcedTea core VM.
+* icedtea-zero-build.patch: Add support for the zero assembler build.
diff -r 21376f9eed89 -r 2deccfc8b64f Makefile.am
--- a/Makefile.am	Thu Dec 03 13:53:28 2009 +0000
+++ b/Makefile.am	Thu Dec 03 16:39:28 2009 +0000
@@ -254,8 +254,6 @@
 	patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \
 	patches/icedtea-sunsrc.patch \
 	patches/icedtea-libraries.patch \
-	patches/icedtea-core-build.patch \
-	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
 	patches/icedtea-uname.patch \
diff -r 21376f9eed89 -r 2deccfc8b64f patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Thu Dec 03 13:53:28 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk	2009-07-15 17:35:01.000000000 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk	2009-07-23 17:41:01.000000000 +0100
-@@ -258,7 +258,12 @@
- # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
- # the library itself should not.
- #
--VM_NAME         = server
-+VM_NAME = $(shell for dir in server client core; do \
-+                    if [ -d $(BOOTDIR)/jre/lib/$(LIBARCH)/$$dir ]; then \
-+		      echo $$dir; \
-+		      break; \
-+		    fi; \
-+		  done)
- JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
- JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
- 
-diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk	2009-07-15 17:35:01.000000000 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk	2009-07-23 17:41:01.000000000 +0100
-@@ -282,7 +282,12 @@
- # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
- # the library itself should not.
- #
--VM_NAME         = server
-+VM_NAME = $(shell for dir in server client core; do \
-+                    if [ -d $(LIBDIR)/$(LIBARCH)/$$dir ]; then \
-+		      echo $$dir; \
-+		      break; \
-+		    fi; \
-+		  done)
- JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
- JAVALIB         = -ljava $(JVMLIB)
- 
diff -r 21376f9eed89 -r 2deccfc8b64f patches/icedtea-zero-build.patch
--- a/patches/icedtea-zero-build.patch	Thu Dec 03 13:53:28 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk	2009-04-14 18:31:09.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk	2009-04-14 20:32:47.000000000 +0100
-@@ -66,6 +66,11 @@
-   else
-     CXX            = $(COMPILER_PATH)g++$(GCC_SUFFIX)
-   endif
-+  ifdef ZERO_BUILD
-+    # zero
-+    REQUIRED_CC_VER = 3.2
-+    REQUIRED_GCC_VER = 3.2.*
-+  endif
-   # Option used to create a shared library
-   SHARED_LIBRARY_FLAG = -shared -mimpure-text
-   SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )