From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Thu, 27 Sep 2018 20:03:40 +0000 (+0100)
Subject: properly_detect_x32
X-Git-Tag: archive/raspbian/2%0.155.2917+git0a84d98-2+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9782abbdf9e2786b3fdf60c0283ad6765b5d4e60;p=x264.git

properly_detect_x32


Gbp-Pq: Name properly_detect_x32.patch
---

diff --git a/common/common.h b/common/common.h
index b1f83ef..2366212 100644
--- a/common/common.h
+++ b/common/common.h
@@ -800,7 +800,7 @@ static int ALWAYS_INLINE 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 f71e3e2..0e44b0b 100755
--- a/configure
+++ b/configure
@@ -702,6 +702,10 @@ esac
 
 LDFLAGS="$LDFLAGS $libm"
 
+case `$CC -dumpmachine` in
+    *gnux32) host_cpu=x32
+esac
+
 stack_alignment=4
 case $host_cpu in
     i*86)
@@ -758,6 +762,10 @@ case $host_cpu in
             ASFLAGS="$ASFLAGS -f elf64"
         fi
         ;;
+    x32)
+        ARCH="X32"
+        CFLAGS="$CFLAGS -fPIC"
+        ;;
     powerpc*)
         ARCH="PPC"
         if [ $asm = auto ] ; then