ARM: disable inline asm for armcc

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17831 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/arm/mathops.h b/libavcodec/arm/mathops.h
index 0d8e0442419913f7c07970f56016873fd8f97791..2da9c1cab3844d247d00decfa5f83fa45b5c499f 100644 (file)
--- a/libavcodec/arm/mathops.h
+++ b/libavcodec/arm/mathops.h
@@ -25,6 +25,8 @@
 #include <stdint.h>
 #include "libavutil/common.h"
 
+#if HAVE_INLINE_ASM
+
 #   define MULL MULL
 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)
     return m;
 }
 
+#endif /* HAVE_INLINE_ASM */
+
 #endif /* AVCODEC_ARM_MATHOPS_H */

diff --git a/libavutil/internal.h b/libavutil/internal.h
index f5f769e2c08ce0622a2aa2d35d2eb9bca66b265e..4191aa8e520c116326e99e53caca7559a5da08b7 100644 (file)
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -134,7 +134,7 @@ extern const uint32_t ff_inverse[256];
             );\
         ret;\
     })
-#elif HAVE_ARMV6
+#elif HAVE_ARMV6 && HAVE_INLINE_ASM
 static inline av_const int FASTDIV(int a, int b)
 {
     int r, t;
@@ -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));
     return r;
 }
-#elif ARCH_ARM
+#elif ARCH_ARM && HAVE_INLINE_ASM
 static inline av_const int FASTDIV(int a, int b)
 {
     int r, t;