diff -Nur icedtea6-1.4-orig/HACKING icedtea6-1.4/HACKING --- icedtea6-1.4-orig/HACKING 2009-01-20 10:35:02.000000000 -0600 +++ icedtea6-1.4/HACKING 2009-02-11 12:17:09.000000000 -0600 @@ -45,7 +45,6 @@ * icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones. * icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora. * icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly. -* icedtea-sparc-trapsfix.patch: Include traps.h from correct directory. * icedtea-ssl.patch: Add casts to AlgorithmParameterSpec in sun.security.ssl package. * icedtea-static-libstdc++.patch: Don't use static C++ on PPC64. * icedtea-sunsrc.patch: Remove service property files from TOOLS list. diff -Nur icedtea6-1.4-orig/Makefile.am icedtea6-1.4/Makefile.am --- icedtea6-1.4-orig/Makefile.am 2009-01-20 10:33:30.000000000 -0600 +++ icedtea6-1.4/Makefile.am 2009-02-11 12:16:07.000000000 -0600 @@ -580,8 +580,7 @@ ICEDTEA_PATCHES += \ patches/hotspot/$(HSBUILD)/icedtea-sparc64-linux.patch \ - patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch + patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -Nur icedtea6-1.4-orig/Makefile.in icedtea6-1.4/Makefile.in --- icedtea6-1.4-orig/Makefile.in 2009-01-26 08:01:23.000000000 -0600 +++ icedtea6-1.4/Makefile.in 2009-02-11 11:19:07.000000000 -0600 @@ -589,7 +589,6 @@ $(am__append_12) \ patches/hotspot/$(HSBUILD)/icedtea-sparc64-linux.patch \ patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \ $(am__append_13) $(am__append_14) $(am__append_15) \ $(am__append_16) $(DISTRIBUTION_PATCHES) \ patches/icedtea-demo-swingapplet.patch \ diff -Nur icedtea6-1.4-orig/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch icedtea6-1.4/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch --- icedtea6-1.4-orig/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch 2008-12-15 11:16:15.000000000 -0600 +++ icedtea6-1.4/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,21 +0,0 @@ -diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp ---- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-08-04 08:40:18.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-08-09 01:29:51.000000000 +0100 -@@ -25,7 +25,16 @@ - #include "incls/_precompiled.incl" - #include "incls/_assembler_linux_sparc.cpp.incl" - --#include <asm-sparc/traps.h> -+/* Headers for 32bit sparc with a 32bit userland end up in asm/ -+ * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/ -+ * There is no traps.h in asm-sparc64/ -+ */ -+ -+#if defined(__sparc__) && defined(__arch64__) -+# include <asm-sparc/traps.h> -+#else -+# include <asm/traps.h> -+#endif - - void MacroAssembler::read_ccr_trap(Register ccr_save) { - // No implementation diff -Nur icedtea6-1.4-orig/patches/hotspot/original/icedtea-sparc-trapsfix.patch icedtea6-1.4/patches/hotspot/original/icedtea-sparc-trapsfix.patch --- icedtea6-1.4-orig/patches/hotspot/original/icedtea-sparc-trapsfix.patch 2008-12-15 11:16:15.000000000 -0600 +++ icedtea6-1.4/patches/hotspot/original/icedtea-sparc-trapsfix.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,21 +0,0 @@ -diff -up openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp ---- openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD 2008-05-28 11:49:06.000000000 -0500 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-05-28 11:51:56.000000000 -0500 -@@ -25,7 +25,16 @@ - #include "incls/_precompiled.incl" - #include "incls/_assembler_linux_sparc.cpp.incl" - --#include <asm-sparc/traps.h> -+/* Headers for 32bit sparc with a 32bit userland end up in asm/ -+ * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/ -+ * There is no traps.h in asm-sparc64/ -+ */ -+ -+#if defined(__sparc__) && defined(__arch64__) -+# include <asm-sparc/traps.h> -+#else -+# include <asm/traps.h> -+#endif - - bool MacroAssembler::needs_explicit_null_check(intptr_t offset) { - // Since the linux kernel resides at the low end of diff -Nur icedtea6-1.4-orig/patches/icedtea-sparc.patch icedtea6-1.4/patches/icedtea-sparc.patch --- icedtea6-1.4-orig/patches/icedtea-sparc.patch 2008-12-15 11:16:15.000000000 -0600 +++ icedtea6-1.4/patches/icedtea-sparc.patch 2009-02-11 11:21:05.000000000 -0600 @@ -67,7 +67,7 @@ +#include "incls/_precompiled.incl" +#include "incls/_assembler_linux_sparc.cpp.incl" + -+#include <asm-sparc/traps.h> ++#include <asm/traps.h> + +bool MacroAssembler::needs_explicit_null_check(intptr_t offset) { + // Since the linux kernel resides at the low end of