[x264-devel] commit: Fix compilation on ARM (David Conrad )

git version control git at videolan.org
Mon Feb 15 10:07:50 CET 2010


x264 | branch: master | David Conrad <lessen42 at gmail.com> | Mon Feb 15 01:02:46 2010 -0800| [781d300ab73671bb2176ef2c3e6c0f2df425cee9] | committer: Jason Garrett-Glaser 

Fix compilation on ARM

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=781d300ab73671bb2176ef2c3e6c0f2df425cee9
---

 configure |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 5288351..25f5458 100755
--- a/configure
+++ b/configure
@@ -442,10 +442,10 @@ if [ $asm = yes -a $ARCH = ARM ] ; then
     # set flags so neon is built by default
     echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-mfloat-abi)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
 
-    if  cc_check '' '' '__asm__("rev ip, ip");' ; then      define HAVE_ARMV6   && ASFLAGS="$ASFLAGS -DHAVE_ARMV6"
-        cc_check '' '' '__asm__("movt r0, #0");'         && define HAVE_ARMV6T2 && ASFLAGS="$ASFLAGS -DHAVE_ARMV6T2"
-        cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON    && ASFLAGS="$ASFLAGS -DHAVE_NEON"
-        ASFLAGS="$ASFLAGS -c"
+    if  cc_check '' '' '__asm__("rev ip, ip");' ; then      define HAVE_ARMV6
+        cc_check '' '' '__asm__("movt r0, #0");'         && define HAVE_ARMV6T2
+        cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
+        ASFLAGS="$ASFLAGS $CFLAGS -c"
     else
         echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS."
         echo "If you really want to run on such a CPU, configure with --disable-asm."



More information about the x264-devel mailing list