Commit 14e329dd authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Don't reinvent __arm__

parent 997ae1dc
...@@ -1085,11 +1085,6 @@ case "${host_cpu}" in ...@@ -1085,11 +1085,6 @@ case "${host_cpu}" in
"") "")
ARCH=unknown ARCH=unknown
;; ;;
arm*)
dnl use arm assembly
VLC_ADD_CFLAGS([wma_fixed],[-DCPU_ARM])
ARCH="${host_cpu}"
;;
*) *)
ARCH="${host_cpu}" ARCH="${host_cpu}"
;; ;;
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef CPU_ARM #ifdef __arm__
#define CONFIG_ALIGN 1 #define CONFIG_ALIGN 1
#endif #endif
......
...@@ -90,7 +90,7 @@ VLC_TYPE vlcbuf4[VLCBUF4SIZE][2]; ...@@ -90,7 +90,7 @@ VLC_TYPE vlcbuf4[VLCBUF4SIZE][2];
* *
*/ */
#ifdef CPU_ARM #ifdef __arm__
static inline static inline
void vector_fmul_add_add(int32_t *dst, const int32_t *data, void vector_fmul_add_add(int32_t *dst, const int32_t *data,
const int32_t *window, int n) const int32_t *window, int n)
......
...@@ -49,7 +49,7 @@ int64_t fixdiv64(int64_t x, int64_t y); ...@@ -49,7 +49,7 @@ int64_t fixdiv64(int64_t x, int64_t y);
int32_t fixsqrt32(int32_t x); int32_t fixsqrt32(int32_t x);
long fsincos(unsigned long phase, int32_t *cos); long fsincos(unsigned long phase, int32_t *cos);
#ifdef CPU_ARM #ifdef __arm__
/*Sign-15.16 format */ /*Sign-15.16 format */
...@@ -138,7 +138,7 @@ static inline int32_t fixmul32b(int32_t x, int32_t y) ...@@ -138,7 +138,7 @@ static inline int32_t fixmul32b(int32_t x, int32_t y)
#endif #endif
#ifdef CPU_ARM #ifdef __arm__
static inline static inline
void CMUL(int32_t *x, int32_t *y, void CMUL(int32_t *x, int32_t *y,
int32_t a, int32_t b, int32_t a, int32_t b,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment