Don't reinvent __arm__

diff --git a/configure.ac b/configure.ac
index 0869ef82775183667248ff740d2ffbe745934dae..20d92bc8765be6411882a2eed50adca370879c4d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1085,11 +1085,6 @@ case "${host_cpu}" in
   "")
     ARCH=unknown
     ;;
-  arm*)
-    dnl use arm assembly
-    VLC_ADD_CFLAGS([wma_fixed],[-DCPU_ARM])
-    ARCH="${host_cpu}"
-    ;;
   *)
     ARCH="${host_cpu}"
     ;;

diff --git a/modules/codec/wmafixed/bitstream.h b/modules/codec/wmafixed/bitstream.h
index 118f1a2ce3189ff2719fbd610b6910333c541762..0d5328a1e167abcce16ad92269fd6542e3899670 100644 (file)
--- a/modules/codec/wmafixed/bitstream.h
+++ b/modules/codec/wmafixed/bitstream.h
@@ -32,7 +32,7 @@
 #include <inttypes.h>
 #include <stdlib.h>
 
-#ifdef CPU_ARM
+#ifdef __arm__
 #define CONFIG_ALIGN 1
 #endif
 

diff --git a/modules/codec/wmafixed/wmadeci.c b/modules/codec/wmafixed/wmadeci.c
index 90074eba5b1abbd84443e80628eceb415a86a7f1..29a4e48de2dd306e93d6a2da88af413211ce72ff 100644 (file)
--- a/modules/codec/wmafixed/wmadeci.c
+++ b/modules/codec/wmafixed/wmadeci.c
@@ -90,7 +90,7 @@ VLC_TYPE vlcbuf4[VLCBUF4SIZE][2];
  *
  */
 
-#ifdef CPU_ARM
+#ifdef __arm__
 static inline
 void vector_fmul_add_add(int32_t *dst, const int32_t *data,
                          const int32_t *window, int n)

diff --git a/modules/codec/wmafixed/wmafixed.h b/modules/codec/wmafixed/wmafixed.h
index b60d0e6869bfa46f1ef5e4a884fc5f370a96a5c0..8314cc67e7f2b971f8730b1c78ccfeb918087166 100644 (file)
--- a/modules/codec/wmafixed/wmafixed.h
+++ b/modules/codec/wmafixed/wmafixed.h
@@ -49,7 +49,7 @@ int64_t fixdiv64(int64_t x, int64_t y);
 int32_t fixsqrt32(int32_t x);
 long fsincos(unsigned long phase, int32_t *cos);
 
-#ifdef CPU_ARM
+#ifdef __arm__
 
 /*Sign-15.16 format */
 
@@ -138,7 +138,7 @@ static inline int32_t fixmul32b(int32_t x, int32_t y)
 
 #endif
 
-#ifdef CPU_ARM
+#ifdef __arm__
 static inline
 void CMUL(int32_t *x, int32_t *y,
           int32_t  a, int32_t  b,