--- a/AUTHORS	Tue Apr 16 17:11:46 2013 +0100
+++ b/AUTHORS	Tue Apr 23 21:42:04 2013 +0100
@@ -2,6 +2,7 @@
 Please keep this list in alphabetical order.
 
 Lillian Angel <langel@redhat.com>
+Alexis Ballier <aballier@gentoo.org>
 Alon Bar-Lev <alon.barlev@gmail.com>
 Gary Benson <gbenson@redhat.com>
 Tania Bento <tbento@redhat.com>
@@ -18,6 +19,7 @@
 Andrew John Hughes <gnu_andrew@member.fsf.org, gnu.andrew@redhat.com>
 Tomas Hurka <tomas.hurka@sun.com>
 Ioana Ivan <iivan@redhat.com>
+C. K. Jester-Young (cky944@gmail.com)
 Matthias Klose <doko@ubuntu.com>
 Francis Kung <fkung@redhat.com>
 Denis Lila <dlila@redhat.com>
@@ -32,6 +34,7 @@
 Mark Reinhold <mr@sun.com>
 Bernhard Rosenkränzer <bero@arklinux.org>
 Marc Schoenefeld <mschoene@redhat.com>
+Andreas Schwab <schwab@suse.cz>
 Keith Seitz <keiths@redhat.com>
 Andrew Su <asu@redhat.com, andrew.su@utoronto.ca>
 Joshua Sumali <jsumali@redhat.com>
@@ -39,6 +42,7 @@
 Christian Thalinger <twisti@complang.tuwien.ac.at>
 Dalibor Topic <robilad@kaffe.org>
 Arnaud Vandyck <avdyk@debian.org>
+Torsten Werner (mail.twerner@googlemail.com)
 Mark Wielaard <mark@klomp.org>
 Yi Zhan <yi.zhan@intel.com>
 

--- a/ChangeLog	Tue Apr 16 17:11:46 2013 +0100
+++ b/ChangeLog	Tue Apr 23 21:42:04 2013 +0100
@@ -1,3 +1,17 @@
+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.
+
 2013-03-11  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR1339: Simplify the rewriter, avoiding concurrency.

--- a/Makefile.am	Tue Apr 16 17:11:46 2013 +0100
+++ b/Makefile.am	Tue Apr 23 21:42:04 2013 +0100
@@ -548,6 +548,9 @@
 	patches/fix_get_stack_bounds_leak.patch \
 	patches/openjdk/7197906-handle_32_bit_shifts.patch
 
+# Needs to be after the addition of SH support to the original HotSpot
+ICEDTEA_PATCHES += patches/aarch64.patch
+
 if WITH_RHINO
 ICEDTEA_PATCHES += \
 	patches/rhino.patch

--- a/NEWS	Tue Apr 16 17:11:46 2013 +0100
+++ b/NEWS	Tue Apr 23 21:42:04 2013 +0100
@@ -14,6 +14,7 @@
 
 * New features
   - JAXP, JAXWS & JAF supplied as patches rather than drops to aid subsequent patching.
+  - PR1380: Add AArch64 support to Zero
 * Security fixes
   - S6657673, CVE-2013-1518: Issues with JAXP
   - S7200507: Refactor Introspector internals

--- a/THANKYOU	Tue Apr 16 17:11:46 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-The following have made minor contributions to the IcedTea
-project, such as testing, bug submission, or minor patches. See also
-the AUTHORS file, which lists people who have submitted major
-patches. If your name does not appear on either list, but should, let
-us know. Please keep this list in alphabetic order.
-
-Alexis Ballier (aballier@gentoo.org)
-Alon Bar-Lev (alon.barlev@gmail.com)
-C. K. Jester-Young  (cky944@gmail.com)
-Torsten Werner (mail.twerner@googlemail.com)
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/aarch64.patch	Tue Apr 23 21:42:04 2013 +0100
@@ -0,0 +1,21 @@
+--- 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