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

Martin Storsjö martin at martin.st
Thu May 4 13:36:11 CEST 2017


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.
---
This patch was suggested as a fix in
https://mailman.videolan.org/pipermail/x264-devel/2017-April/012143.html.
I never heard back from the original reporter, but I was able to reproduce
the issue, and this fixes it for me.
---
 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 62a5e57..ec5ef2c 100644
--- a/common/arm/asm.S
+++ b/common/arm/asm.S
@@ -28,14 +28,7 @@
 
 .syntax unified
 
-#if   HAVE_NEON
-        .arch           armv7-a
-#elif HAVE_ARMV6T2
-        .arch           armv6t2
-#elif HAVE_ARMV6
-        .arch           armv6
-#endif
-
+.arch armv7-a
 .fpu neon
 
 #ifdef PREFIX
-- 
2.1.4



More information about the x264-devel mailing list