[x264-devel] arm: set .arch/.fpu from asm.S

[Janne Grunau]

x264 | branch: master | Janne Grunau <janne-x264 at jannau.net> | Sun Jul 20 13:08:17 2014 +0200| [6e8971021d2a12505cb2ad9ea677dfc8af676919] | committer: Fiona Glaser

arm: set .arch/.fpu from asm.S

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

 common/arm/asm.S       |   10 ++++++++++
 common/arm/cpu-a.S     |    1 -
 common/arm/dct-a.S     |    2 --
 common/arm/deblock-a.S |    2 --
 common/arm/mc-a.S      |    1 -
 common/arm/pixel-a.S   |    1 -
 common/arm/predict-a.S |    2 --
 common/arm/quant-a.S   |    2 --
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/common/arm/asm.S b/common/arm/asm.S
index 273a79c..6656858 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 9ae6b14..7fc273a 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 c5490bd..9e7d75f 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 21f44a7..2d0ef9f 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 330b852..3a16d0d 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 ddf396d..7889d46 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 ca28ff8..8af861b 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 b8c6ba3..374796c 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: