Mercurial > hg > release > icedtea6-1.12
changeset 2993:6b16bd8e8e34
PR1402: Support glibc < 2.17 with AArch64 patch
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>
* NEWS: Updated.
* patches/aarch64.patch:
Define EM_AARCH64 for legacy systems
with glibc earlier than 2.17.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Wed, 24 Apr 2013 08:26:15 +0100 |
| parents | 65bf53d7a416 |
| children | db270ea37a50 |
| files | ChangeLog NEWS patches/aarch64.patch |
| diffstat | 3 files changed, 32 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Apr 17 13:14:23 2013 +0100 +++ b/ChangeLog Wed Apr 24 08:26:15 2013 +0100 @@ -1,3 +1,16 @@ +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 + * NEWS: Updated. + * patches/aarch64.patch: + Define EM_AARCH64 for legacy systems + with glibc earlier than 2.17. + 2013-04-17 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Improve listing for S8004987 and
--- a/NEWS Wed Apr 17 13:14:23 2013 +0100 +++ b/NEWS Wed Apr 24 08:26:15 2013 +0100 @@ -45,7 +45,7 @@ - S8009305, CVE-2013-0401: Improve AWT data transfer - S8009699, CVE-2013-2421: Methodhandle lookup - S8009814, CVE-2013-1488: Better driver management - - S8009857. CVE-2013-2422: Problem with plugin + - S8009857, CVE-2013-2422: Problem with plugin * Backports - S7197906: BlockOffsetArray::power_to_cards_back() needs to handle > 32 bit shifts - S7036559: ConcurrentHashMap footprint and contention improvements @@ -63,6 +63,7 @@ - PR1339: Simplify the rhino class rewriter to avoid use of concurrency - PR1336: Bootstrap failure on Fedora 17/18 - PR1319: Correct #ifdef to #if + - PR1402: Support glibc < 2.17 with AArch64 patch New in release 1.12.4 (2013-03-04):
--- a/patches/aarch64.patch Wed Apr 17 13:14:23 2013 +0100 +++ b/patches/aarch64.patch Wed Apr 24 08:26:15 2013 +0100 @@ -1,6 +1,19 @@ ---- 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 +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 + ++ ++#ifndef EM_AARCH64 ++#define EM_AARCH64 183 /* ARM AARCH64 */ ++#endif ++ + //////////////////////////////////////////////////////////////////////////////// + // global variables + julong os::Linux::_physical_memory = 0; +@@ -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"}, @@ -10,7 +23,7 @@ }; #if (defined IA32) -@@ -1926,6 +1927,8 @@ void * os::dll_load(const char *filename +@@ -1893,6 +1899,8 @@ static Elf32_Half running_arch_code=EM_68K; #elif (defined SH) static Elf32_Half running_arch_code=EM_SH;