changeset in /hg/icedtea6: 2008-04-02 Gary Benson <gbenson at red...

[Gary Benson]

changeset bf41c62c449a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bf41c62c449a
description:
	2008-04-02  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-zero.patch: Workaround for arm.

diffstat:

2 files changed, 30 insertions(+)
ChangeLog                  |    4 ++++
patches/icedtea-zero.patch |   26 ++++++++++++++++++++++++++

diffs (44 lines):

diff -r fe9999ff0b5d -r bf41c62c449a ChangeLog
--- a/ChangeLog	Tue Apr 01 09:46:02 2008 -0400
+++ b/ChangeLog	Wed Apr 02 05:03:14 2008 -0400
@@ -1,3 +1,7 @@ 2008-04-01  Gary Benson  <gbenson at redhat
+2008-04-02  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-zero.patch: Workaround for arm.
+	
 2008-04-01  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-arm-uname.patch: New file.
diff -r fe9999ff0b5d -r bf41c62c449a patches/icedtea-zero.patch
--- a/patches/icedtea-zero.patch	Tue Apr 01 09:46:02 2008 -0400
+++ b/patches/icedtea-zero.patch	Wed Apr 02 05:03:14 2008 -0400
@@ -133,3 +133,29 @@ diff -ru openjdk/hotspot/src/share/vm/ut
       }
  
    STEP(140, "(printing VM operation)" )
+diff -r 789c601c8ba9 openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Tue Apr 01 14:49:28 2008 +0100
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Wed Apr 02 09:51:37 2008 +0100
+@@ -1690,7 +1690,8 @@ void * os::dll_load(const char *filename
+     {EM_SPARC32PLUS, EM_SPARC,   ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
+     {EM_SPARCV9,     EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
+     {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
+-    {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}
++    {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
++    {EM_ARM,         EM_ARM,     ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}
+   };
+ 
+   #if  (defined IA32)
+@@ -1707,9 +1708,11 @@ void * os::dll_load(const char *filename
+     static  Elf32_Half running_arch_code=EM_PPC64;
+   #elif  (defined __powerpc__)
+     static  Elf32_Half running_arch_code=EM_PPC;
++  #elif  (defined ARM)
++    static  Elf32_Half running_arch_code=EM_ARM;    
+   #else
+     #error Method os::dll_load requires that one of following is defined:\
+-         IA32, AMD64, IA64, __sparc, __powerpc__
++         IA32, AMD64, IA64, __sparc, __powerpc__, ARM
+   #endif
+ 
+   // Identify compatability class for VM's architecture and library's architecture