From: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Date: Wed, 20 Aug 2014 20:52:49 +0000 (-0300)
Subject: Fix AArch64/arm64 detection.
X-Git-Tag: archive/raspbian/4%4.8.6+git64-g5dc8b2b+dfsg-3+deb8u2+rpi1~47
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0776f86c41a93844917cb92c0a51264f412fea55;p=qt4-x11.git

Fix AArch64/arm64 detection.

The detection needs to go before arm, else the system will detect AArch64/arm64
as arm.

This patch comes from Wookey, he has agreed to put it under BSD or Expat
to allow it's inclusion in here:
<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255>

Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797

Gbp-Pq: Name aarch64_arm64_fix_arch_detection.patch
---

diff --git a/configure b/configure
index a9ba7c8cc..eb88b72ad 100755
--- a/configure
+++ b/configure
@@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
     	fi
     	CFG_HOST_ARCH=s390
     	;;
-    *:*:arm*)
+    *:*:aarch64*|*:*:arm64*)
         if [ "$OPT_VERBOSE" = "yes" ]; then
-            echo "    ARM (arm)"
+            echo "    AArch64 (aarch64)"
         fi
-        CFG_HOST_ARCH=arm
+        CFG_HOST_ARCH=aarch64
         ;;
-    *:*:aarch64*)
+    *:*:arm*)
         if [ "$OPT_VERBOSE" = "yes" ]; then
-            echo "    AArch64 (aarch64)"
+            echo "    ARM (arm)"
         fi
-        CFG_HOST_ARCH=aarch64
+        CFG_HOST_ARCH=arm
         ;;
     Linux:*:sparc*)
         if [ "$OPT_VERBOSE" = "yes" ]; then