[vlc-devel] commit: Don't reinvent __arm__ ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat Jan 31 23:02:38 2009 +0200| [14e329dd139cf0b18bc3f8768cd976f7e8b4bcad] | committer: Rémi Denis-Courmont 

Don't reinvent __arm__

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=14e329dd139cf0b18bc3f8768cd976f7e8b4bcad
---

 configure.ac                       |    5 -----
 modules/codec/wmafixed/bitstream.h |    2 +-
 modules/codec/wmafixed/wmadeci.c   |    2 +-
 modules/codec/wmafixed/wmafixed.h  |    4 ++--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0869ef8..20d92bc 100644
--- 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 118f1a2..0d5328a 100644
--- 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 90074eb..29a4e48 100644
--- 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 b60d0e6..8314cc6 100644
--- 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,