[polyml] 01/02: Backport arm64 support from upstream

[James Clarke]

This is an automated email from the git hooks/post-receive script.

jrtc27-guest pushed a commit to branch master
in repository polyml.

commit 5abe21a8ee61bcf646ffac79dd8a9691a6786f86
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Mon Oct 19 22:37:23 2015 +0100

    Backport arm64 support from upstream
---
 debian/changelog          |  7 ++++++
 debian/patches/arm64.diff | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series     |  1 +
 3 files changed, 67 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 130c7bd..bb67b39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+polyml (5.5.2-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Backport upstream's arm64 support (Closes: #802341)
+
+ -- James Clarke <jrtc27 at jrtc27.com>  Mon, 19 Oct 2015 18:10:36 +0100
+
 polyml (5.5.2-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/arm64.diff b/debian/patches/arm64.diff
new file mode 100644
index 0000000..e06f6c2
--- /dev/null
+++ b/debian/patches/arm64.diff
@@ -0,0 +1,59 @@
+Description: Add support for 64-bit ARM using the interpreter.
+Origin: upstream, https://github.com/polyml/polyml/commit/6d84a491c4ec5fa95c085ddcc8f9cca84bbea870
+Author: Christian Neukirchen <chneukirchen at gmail.com>
+Author: David Matthews <dm at prolingua.co.uk>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/config.h.in
++++ b/config.h.in
+@@ -548,6 +548,9 @@
+ /* Define to 1 if the system has the type `_Bool'. */
+ #undef HAVE__BOOL
+ 
++/* Define if the host is an ARM (64 bit) */
++#undef HOSTARCHITECTURE_AARCH64
++
+ /* Define if the host is an ARM (32 bit) */
+ #undef HOSTARCHITECTURE_ARM
+ 
+--- a/configure
++++ b/configure
+@@ -21306,6 +21306,12 @@
+ 
+             polyarch=interpret
+             ;;
++      aarch64*)
++
++$as_echo "#define HOSTARCHITECTURE_AARCH64 1" >>confdefs.h
++
++            polyarch=interpret
++            ;;
+       ia64*)
+ 
+ $as_echo "#define HOSTARCHITECTURE_IA64 1" >>confdefs.h
+--- a/configure.ac
++++ b/configure.ac
+@@ -408,6 +408,10 @@
+             AC_DEFINE([HOSTARCHITECTURE_ARM], [1], [Define if the host is an ARM (32 bit)])
+             polyarch=interpret
+             ;;
++      aarch64*)
++            AC_DEFINE([HOSTARCHITECTURE_AARCH64], [1], [Define if the host is an ARM (64 bit)])
++            polyarch=interpret
++            ;;
+       ia64*)
+             AC_DEFINE([HOSTARCHITECTURE_IA64], [1], [Define if the host is Itanium])
+             polyarch=interpret
+--- a/libpolyml/elfexport.cpp
++++ b/libpolyml/elfexport.cpp
+@@ -344,6 +344,10 @@
+     directReloc = R_IA64_DIR64LSB;
+     fhdr.e_flags = EF_IA_64_ABI64;
+     useRela = true;
++#elif defined(HOSTARCHITECTURE_AARCH64)
++    fhdr.e_machine = EM_AARCH64;
++    directReloc = R_AARCH64_ABS64;
++    useRela = true;
+ #else
+ #error "No support for exporting on this architecture"
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 6a57440..467ccee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 polyc.1-fix.diff
+arm64.diff
 noexec-stack.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polyml.git