/hg/release/icedtea6-1.7: Look for merged sparc kernel headers i...

[doko at icedtea.classpath.org]

changeset 00dce3629da2 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=00dce3629da2
author: doko at ubuntu.com
date: Sun Jan 17 00:34:54 2010 +0100

	Look for merged sparc kernel headers in asm/

	2010-01-17 Matthias Klose <doko at ubuntu.com>

	 * patches/icedtea-sparc-trapsfix.patch: Merged sparc headers
	are located in asm/.


diffstat:

2 files changed, 11 insertions(+), 15 deletions(-)
ChangeLog                            |    7 ++++++-
patches/icedtea-sparc-trapsfix.patch |   19 +++++--------------

diffs (51 lines):

diff -r 882587aab813 -r 00dce3629da2 ChangeLog
--- a/ChangeLog	Sat Jan 16 02:12:30 2010 +0000
+++ b/ChangeLog	Sun Jan 17 00:34:54 2010 +0100
@@ -1,3 +1,8 @@ 2010-01-16 Andrew John Hughes  <ahughes@
+2010-01-17  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-sparc-trapsfix.patch: Merged sparc headers
+	are located in asm/.
+
 2010-01-16 Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
@@ -55,7 +60,7 @@ 2010-01-16 Andrew John Hughes  <ahughes@
 
 2010-01-15  Edward Nevill <ed at camswl.com>
 
-        * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
 	Implement is_allocatable to make build word with hs16
 
 2010-01-14  Matthias Klose  <doko at ubuntu.com>
diff -r 882587aab813 -r 00dce3629da2 patches/icedtea-sparc-trapsfix.patch
--- a/patches/icedtea-sparc-trapsfix.patch	Sat Jan 16 02:12:30 2010 +0000
+++ b/patches/icedtea-sparc-trapsfix.patch	Sun Jan 17 00:34:54 2010 +0100
@@ -1,21 +1,12 @@ diff -Nru openjdk.orig/hotspot/src/os_cp
-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