Mercurial > hg > release > icedtea6-1.8
changeset 1829:83256d3211dd
Look for merged sparc kernel headers in asm/
2010-01-17 Matthias Klose <doko@ubuntu.com>
* patches/icedtea-sparc-trapsfix.patch: Merged sparc headers
are located in asm/.
| author | doko@ubuntu.com |
|---|---|
| date | Sun, 17 Jan 2010 00:37:57 +0100 |
| parents | 327907cd1d5b |
| children | 8972093fe4f7 |
| files | ChangeLog patches/icedtea-sparc-trapsfix.patch |
| diffstat | 2 files changed, 10 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 16 02:12:30 2010 +0000 +++ b/ChangeLog Sun Jan 17 00:37:57 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-17 Matthias Klose <doko@ubuntu.com> + + * patches/icedtea-sparc-trapsfix.patch: Merged sparc headers + are located in asm/. + 2010-01-16 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4:
--- a/patches/icedtea-sparc-trapsfix.patch Sat Jan 16 02:12:30 2010 +0000 +++ b/patches/icedtea-sparc-trapsfix.patch Sun Jan 17 00:37:57 2010 +0100 @@ -1,21 +1,12 @@ -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 @@ +--- openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.orig 2010-01-16 23:19:45.703450297 +0000 ++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2010-01-16 23:21:23.942337146 +0000 +@@ -25,7 +25,8 @@ #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 ++// always found in asm/ with merged sparc/sparc64 headers ++#include <asm/traps.h> void MacroAssembler::read_ccr_trap(Register ccr_save) { // No implementation