view patches/aarch64.patch @ 2988:1c641a995625

PR1380: Add AArch64 support to Zero 2013-04-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (ICEDTEA_PATCHES): Add patch after SH patch. * NEWS: Updated. * AUTHORS: Add Andreas and merge in THANKYOU. * THANKYOU: Removed. 2013-03-22 Andreas Schwab <schwab@suse.cz> PR1380: Add AArch64 support to Zero * patches/aarch64.patch: Add Zero support for AArch64.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Tue, 23 Apr 2013 21:42:04 +0100
parents
children 6b16bd8e8e34
line wrap: on
line source

--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
@@ -1893,7 +1893,8 @@ void * os::dll_load(const char *filename
     {EM_MIPS,        EM_MIPS,    ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
     {EM_PARISC,      EM_PARISC,  ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
     {EM_68K,         EM_68K,     ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
-    {EM_SH,          EM_SH,      ELFCLASS32, ELFDATA2LSB, (char*)"SH"} /* Support little endian only*/
+    {EM_SH,          EM_SH,      ELFCLASS32, ELFDATA2LSB, (char*)"SH"}, /* Support little endian only*/
+    {EM_AARCH64,     EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"} /* Support little endian only*/
   };
 
   #if  (defined IA32)
@@ -1926,6 +1927,8 @@ void * os::dll_load(const char *filename
     static  Elf32_Half running_arch_code=EM_68K;
   #elif  (defined SH)
     static  Elf32_Half running_arch_code=EM_SH;
+  #elif  (defined AARCH64)
+    static  Elf32_Half running_arch_code=EM_AARCH64;
   #else
     #error Method os::dll_load requires that one of following is defined:\
          IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, SH