From: Adam Borowski <kilobyte@angband.pl>
Date: Thu, 15 Jul 2021 12:06:22 +0000 (+0100)
Subject: Properly detect x32.
X-Git-Tag: archive/raspbian/2%0.160.3011+gitcde9a93-2.1+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=079ad21a6de058fa55cf7984c807250ce1c0f316;p=x264.git

Properly detect x32.

As usually, x32 gets mistaken for amd64 (both are x86-64 ABIs after all).
This version doesn't use any assembly yet, a proper port is needed.

Gbp-Pq: Name properly_detect_x32.patch
---

diff --git a/common/common.h b/common/common.h
index 8bc5c26..50fd8ea 100644
--- a/common/common.h
+++ b/common/common.h
@@ -802,7 +802,7 @@ static ALWAYS_INLINE int x264_predictor_clip( int16_t (*dst)[2], int16_t (*mvc)[
     return cnt;
 }
 
-#if ARCH_X86 || ARCH_X86_64
+#if ARCH_X86 || ARCH_X86_64 || ARCH_X32
 #include "x86/util.h"
 #endif
 
diff --git a/configure b/configure
index 3a5e060..ec0932c 100755
--- a/configure
+++ b/configure
@@ -721,6 +721,10 @@ esac
 
 LDFLAGS="$LDFLAGS $libm"
 
+case `$CC -dumpmachine` in
+    *gnux32) host_cpu=x32
+esac
+
 stack_alignment=4
 case $host_cpu in
     i*86)
@@ -777,6 +781,10 @@ case $host_cpu in
             ASFLAGS="$ASFLAGS -f elf64"
         fi
         ;;
+    x32)
+        ARCH="X32"
+        CFLAGS="$CFLAGS -fPIC"
+        ;;
     powerpc*)
         ARCH="PPC"
         if [ $asm = auto ] ; then