[x264-devel] arm: Skip using gas-preprocessor for iOS on arm as well

[Martin Storsjö]

x264 | branch: master | Martin Storsjö <martin at martin.st> | Fri Mar 24 11:33:37 2017 +0200| [d13705191cdcbcd10d87524dbb0c26ba998d8dcc] | committer: Henrik Gramner

arm: Skip using gas-preprocessor for iOS on arm as well

The few constructs that differ can easily be handled within the
source itself - tested to be working since at least Xcode 6.

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

 common/arm/asm.S | 11 ++++++++++-
 configure        |  4 +---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/common/arm/asm.S b/common/arm/asm.S
index 62a5e578..5fc1b14b 100644
--- a/common/arm/asm.S
+++ b/common/arm/asm.S
@@ -28,6 +28,7 @@
 
 .syntax unified
 
+#ifndef __APPLE__
 #if   HAVE_NEON
         .arch           armv7-a
 #elif HAVE_ARMV6T2
@@ -37,6 +38,7 @@
 #endif
 
 .fpu neon
+#endif
 
 #ifdef PREFIX
 #   define EXTERN_ASM _
@@ -50,6 +52,12 @@
 #   define ELF @
 #endif
 
+#ifdef __MACH__
+#   define MACH
+#else
+#   define MACH @
+#endif
+
 #if HAVE_AS_FUNC
 #   define FUNC
 #else
@@ -99,7 +107,8 @@ ELF     .size   \name, . - \name
 .if HAVE_SECTION_DATA_REL_RO && \relocate
         .section        .data.rel.ro
 .else
-        .section        .rodata
+ELF     .section        .rodata
+MACH    .const_data
 .endif
         .align          \align
 \name:
diff --git a/configure b/configure
index 9751def8..5935bdb4 100755
--- a/configure
+++ b/configure
@@ -762,16 +762,14 @@ case $host_cpu in
         ;;
     arm*)
         ARCH="ARM"
+        AS="${AS-${CC}}"
         if [ "$SYS" = MACOSX ] ; then
-            AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch arm -- ${CC}}"
             ASFLAGS="$ASFLAGS -DPREFIX -DPIC"  # apple's ld doesn't support movw/movt relocations at all
             # build for armv7 by default
             if ! echo $CFLAGS | grep -Eq '\-arch' ; then
                 CFLAGS="$CFLAGS -arch armv7"
                 LDFLAGS="$LDFLAGS -arch armv7"
             fi
-        else
-            AS="${AS-${CC}}"
         fi
         ;;
     aarch64)