[x264-devel] arm: Always unconditionally declare .arch armv7-a

[Martin Storsjö]

x264 | branch: master | Martin Storsjö <martin at martin.st> | Thu May  4 22:00:51 2017 +0300| [0aed59e74808f1cd22ee47c055a8eb4f367b2f55] | committer: Henrik Gramner

arm: Always unconditionally declare .arch armv7-a

We already unconditionally declare .fpu neon and try to build all the
neon codepaths (but only execute them conditionally based on a runtime
check).

This fixes builds targeting armv6, where the rbit instruction isn't
available. This instruction is only used within a neon function in
any case, so there's little point in emulating it.

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

 common/arm/asm.S | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/common/arm/asm.S b/common/arm/asm.S
index c46b61b1..0472d115 100644
--- a/common/arm/asm.S
+++ b/common/arm/asm.S
@@ -29,14 +29,7 @@
 .syntax unified
 
 #ifndef __APPLE__
-#if   HAVE_NEON
-        .arch           armv7-a
-#elif HAVE_ARMV6T2
-        .arch           armv6t2
-#elif HAVE_ARMV6
-        .arch           armv6
-#endif
-
+.arch armv7-a
 .fpu neon
 #endif