/hg/release/icedtea6-1.11: PR1402: Support glibc < 2.17 with AAr...

[andrew at icedtea.classpath.org]

changeset fa4c6fc68ea1 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=fa4c6fc68ea1
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 21:35:30 2013 +0100

	PR1402: Support glibc < 2.17 with AArch64 patch

	2013-04-17  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS: Updated.
		* patches/aarch64.patch:
		Define EM_AARCH64 for legacy systems
		with glibc earlier than 2.17.


diffstat:

 ChangeLog             |   8 ++++++++
 NEWS                  |   7 ++++++-
 patches/aarch64.patch |  19 ++++++++++++++++---
 3 files changed, 30 insertions(+), 4 deletions(-)

diffs (73 lines):

diff -r 82628dc4d2d4 -r fa4c6fc68ea1 ChangeLog
--- a/ChangeLog	Wed Apr 17 13:14:23 2013 +0100
+++ b/ChangeLog	Wed Apr 17 21:35:30 2013 +0100
@@ -1,3 +1,11 @@
+2013-04-17  Andrew John Hughes  <gnu.andrew at 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 at redhat.com>
 
 	* NEWS: Improve listing for S8004987 and
diff -r 82628dc4d2d4 -r fa4c6fc68ea1 NEWS
--- a/NEWS	Wed Apr 17 13:14:23 2013 +0100
+++ b/NEWS	Wed Apr 17 21:35:30 2013 +0100
@@ -11,6 +11,11 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release 1.11.11 (2013-04-XX):
+
+* Bug fixes
+  - PR1402: Support glibc < 2.17 with AArch64 patch
+
 New in release 1.11.10 (2013-04-17):
 
 * New features
@@ -46,7 +51,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
diff -r 82628dc4d2d4 -r fa4c6fc68ea1 patches/aarch64.patch
--- a/patches/aarch64.patch	Wed Apr 17 13:14:23 2013 +0100
+++ b/patches/aarch64.patch	Wed Apr 17 21:35:30 2013 +0100
@@ -1,6 +1,19 @@
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
+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
-@@ -1893,7 +1893,8 @@ void * os::dll_load(const char *filename
+@@ -124,6 +124,11 @@
+ #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
+ 
+ #define LARGEPAGES_BIT (1 << 6)
++
++#ifndef EM_AARCH64
++#define EM_AARCH64	183		/* ARM AARCH64 */
++#endif
++
+ ////////////////////////////////////////////////////////////////////////////////
+ // global variables
+ julong os::Linux::_physical_memory = 0;
+@@ -1885,7 +1890,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
+@@ -1918,6 +1924,8 @@
      static  Elf32_Half running_arch_code=EM_68K;
    #elif  (defined SH)
      static  Elf32_Half running_arch_code=EM_SH;