Mercurial > hg > release > icedtea6-1.11
changeset 2894:1fd1d5a12471
Fix aarch64 patch to apply against older HotSpot.
2013-04-17 Andrew John Hughes <gnu.andrew@redhat.com>
* patches/aarch64.patch:
Fix to apply against older HotSpot.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Wed, 17 Apr 2013 21:39:49 +0100 |
parents | fa4c6fc68ea1 |
children | 7877650b6ba6 |
files | ChangeLog patches/aarch64.patch |
diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Apr 17 21:35:30 2013 +0100 +++ b/ChangeLog Wed Apr 17 21:39:49 2013 +0100 @@ -1,3 +1,8 @@ +2013-04-17 Andrew John Hughes <gnu.andrew@redhat.com> + + * patches/aarch64.patch: + Fix to apply against older HotSpot. + 2013-04-17 Andrew John Hughes <gnu.andrew@redhat.com> PR1402: Support glibc < 2.17 with AArch64 patch
--- a/patches/aarch64.patch Wed Apr 17 21:35:30 2013 +0100 +++ b/patches/aarch64.patch Wed Apr 17 21:39:49 2013 +0100 @@ -1,10 +1,10 @@ -diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp -@@ -124,6 +124,11 @@ +diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-04-17 21:37:18.637869465 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-04-17 21:38:30.075026650 +0100 +@@ -127,6 +127,11 @@ #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF) + #define SEC_IN_NANOSECS 1000000000LL - #define LARGEPAGES_BIT (1 << 6) + +#ifndef EM_AARCH64 +#define EM_AARCH64 183 /* ARM AARCH64 */ @@ -13,7 +13,7 @@ //////////////////////////////////////////////////////////////////////////////// // global variables julong os::Linux::_physical_memory = 0; -@@ -1885,7 +1890,8 @@ +@@ -1860,7 +1865,8 @@ {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"}, {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}, @@ -23,7 +23,7 @@ }; #if (defined IA32) -@@ -1918,6 +1924,8 @@ +@@ -1893,6 +1899,8 @@ static Elf32_Half running_arch_code=EM_68K; #elif (defined SH) static Elf32_Half running_arch_code=EM_SH;