From: Janne Grunau Date: Sun, 20 Jul 2014 11:08:17 +0000 (+0200) Subject: arm: set .arch/.fpu from asm.S X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6e8971021d2a12505cb2ad9ea677dfc8af676919;p=x264 arm: set .arch/.fpu from asm.S --- diff --git a/common/arm/asm.S b/common/arm/asm.S index 273a79c9..66568589 100644 --- a/common/arm/asm.S +++ b/common/arm/asm.S @@ -28,6 +28,16 @@ .syntax unified +#if HAVE_NEON + .arch armv7-a +#elif HAVE_ARMV6T2 + .arch armv6t2 +#elif HAVE_ARMV6 + .arch armv6 +#endif + +.fpu neon + #ifdef PREFIX # define EXTERN_ASM _ #else diff --git a/common/arm/cpu-a.S b/common/arm/cpu-a.S index 9ae6b14e..7fc273a1 100644 --- a/common/arm/cpu-a.S +++ b/common/arm/cpu-a.S @@ -25,7 +25,6 @@ #include "asm.S" -.fpu neon .align 2 // done in gas because .fpu neon overrides the refusal to assemble diff --git a/common/arm/dct-a.S b/common/arm/dct-a.S index c5490bdb..9e7d75f1 100644 --- a/common/arm/dct-a.S +++ b/common/arm/dct-a.S @@ -25,8 +25,6 @@ #include "asm.S" -.fpu neon - .section .rodata .align 4 diff --git a/common/arm/deblock-a.S b/common/arm/deblock-a.S index 21f44a7b..2d0ef9ff 100644 --- a/common/arm/deblock-a.S +++ b/common/arm/deblock-a.S @@ -25,8 +25,6 @@ #include "asm.S" -.fpu neon - .macro h264_loop_filter_start ldr ip, [sp] ldr ip, [ip] diff --git a/common/arm/mc-a.S b/common/arm/mc-a.S index 330b8529..3a16d0db 100644 --- a/common/arm/mc-a.S +++ b/common/arm/mc-a.S @@ -27,7 +27,6 @@ #include "asm.S" -.fpu neon .text // note: prefetch stuff assumes 64-byte cacheline, true for the Cortex-A8 diff --git a/common/arm/pixel-a.S b/common/arm/pixel-a.S index ddf396d4..7889d461 100644 --- a/common/arm/pixel-a.S +++ b/common/arm/pixel-a.S @@ -25,7 +25,6 @@ #include "asm.S" -.fpu neon .section .rodata .align 4 diff --git a/common/arm/predict-a.S b/common/arm/predict-a.S index ca28ff8f..8af861bd 100644 --- a/common/arm/predict-a.S +++ b/common/arm/predict-a.S @@ -26,8 +26,6 @@ #include "asm.S" -.fpu neon - .section .rodata .align 4 diff --git a/common/arm/quant-a.S b/common/arm/quant-a.S index b8c6ba33..374796c7 100644 --- a/common/arm/quant-a.S +++ b/common/arm/quant-a.S @@ -25,8 +25,6 @@ #include "asm.S" -.fpu neon - .section .rodata .align 4 pmovmskb_byte: