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

diff --git a/common/arm/asm.S b/common/arm/asm.S
index 273a79c97f174d1018c43ab22f2007a99e9c5ff2..665685898fa4e128667def40ae11af0ef91a4a53 100644 (file)
--- 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 9ae6b14ee1f0e88fdb6889c4ab60dbf9a741606c..7fc273a1e7143654e98e2a8fa24722491195f0a5 100644 (file)
--- 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 c5490bdbf2ff260c06a8c5c3080f734fef9cfb42..9e7d75f1f4c2712af3aed4a51d063e2559397cef 100644 (file)
--- 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 21f44a7b415973b6d6756045aedb22e1e6fe0eec..2d0ef9ffbfc8db4bfdfff883493e5e7fe5a19d1d 100644 (file)
--- 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 330b852937b01b31739eaf36724366ca71092c0d..3a16d0db5031987cd07a7e8902ffbf47f91a53ad 100644 (file)
--- 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 ddf396d486cfc15c4b47914ecc63bf40fc1cd595..7889d46184d37ca16fd2dfd08982cce820bdf2b0 100644 (file)
--- 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 ca28ff8f3573c61849875eebf6b84ccafba5b6ea..8af861bd8e490b31ec7cfe4b5fda149aa68a190d 100644 (file)
--- 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 b8c6ba33488543b90bed39f0430d42163cd2fbf6..374796c7ec4b674269fe09a760a4bce3e911913a 100644 (file)
--- 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: