Commit 35690321 authored by Måns Rullgård's avatar Måns Rullgård

ARM: disable inline asm for armcc

Originally committed as revision 17831 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1e65f62e
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/common.h" #include "libavutil/common.h"
#if HAVE_INLINE_ASM
# define MULL MULL # define MULL MULL
static inline av_const int MULL(int a, int b, unsigned shift) static inline av_const int MULL(int a, int b, unsigned shift)
{ {
...@@ -108,4 +110,6 @@ static inline av_const int mid_pred(int a, int b, int c) ...@@ -108,4 +110,6 @@ static inline av_const int mid_pred(int a, int b, int c)
return m; return m;
} }
#endif /* HAVE_INLINE_ASM */
#endif /* AVCODEC_ARM_MATHOPS_H */ #endif /* AVCODEC_ARM_MATHOPS_H */
...@@ -134,7 +134,7 @@ extern const uint32_t ff_inverse[256]; ...@@ -134,7 +134,7 @@ extern const uint32_t ff_inverse[256];
);\ );\
ret;\ ret;\
}) })
#elif HAVE_ARMV6 #elif HAVE_ARMV6 && HAVE_INLINE_ASM
static inline av_const int FASTDIV(int a, int b) static inline av_const int FASTDIV(int a, int b)
{ {
int r, t; int r, t;
...@@ -145,7 +145,7 @@ static inline av_const int FASTDIV(int a, int b) ...@@ -145,7 +145,7 @@ static inline av_const int FASTDIV(int a, int b)
: "=&r"(r), "=&r"(t) : "r"(a), "r"(b), "r"(ff_inverse)); : "=&r"(r), "=&r"(t) : "r"(a), "r"(b), "r"(ff_inverse));
return r; return r;
} }
#elif ARCH_ARM #elif ARCH_ARM && HAVE_INLINE_ASM
static inline av_const int FASTDIV(int a, int b) static inline av_const int FASTDIV(int a, int b)
{ {
int r, t; int r, t;
......
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