[pocl] 03/06: fix arm64 detection

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository pocl.

commit f623949938925999dbe3b8a81bfcfc4d73178296
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Apr 27 10:09:47 2016 +0200

    fix arm64 detection
---
 debian/changelog                                   |  1 +
 .../patches/fix-configure-for-debian-archs.patch   | 28 +++++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb3cd91..1fb2438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pocl (0.11-2) UNRELEASED; urgency=medium
   * Drop superfluous B-D.
   * Fix testsuite failure on i386.  (Closes: #822563)
   * Switch back target cpu to pentium3 on any-i386.
+  * Fix arm64 detection.  (Closes: #787686)
 
  -- Andreas Beckmann <anbe at debian.org>  Mon, 25 Apr 2016 14:39:14 +0200
 
diff --git a/debian/patches/fix-configure-for-debian-archs.patch b/debian/patches/fix-configure-for-debian-archs.patch
index e68892b..ae93225 100644
--- a/debian/patches/fix-configure-for-debian-archs.patch
+++ b/debian/patches/fix-configure-for-debian-archs.patch
@@ -2,19 +2,22 @@ Description: Fix architecture name for ARM on Debian
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -958,6 +958,11 @@
-     HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
-     CL_DEVICE_ADDRESS_BITS=64
+@@ -953,6 +953,14 @@ case $host_cpu in
+     # for compiling kernels for ARM envs without usable math libs.
+     CL_DEVICE_ADDRESS_BITS=32
      ;;
++
 +  aarch64*)
 +    AC_MSG_NOTICE([using the aarch64 optimized kernel lib for the native device])
 +    HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
++    CLANG_MARCH_FLAG=mcpu
 +    CL_DEVICE_ADDRESS_BITS=64
 +    ;;
-   i?86)
-     AC_MSG_NOTICE([using the x86 32bit optimized kernel lib for the native device])
++
+   amd64|x86_64)
+     AC_MSG_NOTICE([using the x86_64 optimized kernel lib for the native device])
      HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
-@@ -975,7 +980,7 @@
+@@ -975,7 +983,7 @@ case $host_cpu in
      AC_MSG_NOTICE([using the ppc64 optimized kernel lib for the native device])
      HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
      llc_triple="powerpc64-unknown-linux-gnu"
@@ -23,3 +26,16 @@ Description: Fix architecture name for ARM on Debian
      #TODO: not all PowerPCs have Altivec?
      HOST_LLC_FLAGS="$HOST_LLC_FLAGS -mattr=altivec"
      CLANG_MARCH_FLAG="mcpu"
+@@ -1001,6 +1009,12 @@ case $host_cpu in
+     CL_DEVICE_ADDRESS_BITS=32
+     ;;
+ 
++  mips64el*)
++    llc_triple="mips64el-unknown-linux-gnuabi64"
++    CLANG_MARCH_FLAG=mcpu
++    CL_DEVICE_ADDRESS_BITS=64
++    ;;
++
+   mips*)
+     llc_triple="mips-unknown-linux-gnu"
+     CLANG_MARCH_FLAG=mcpu

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git