[FFmpeg-cvslog] r17831 - in trunk: libavcodec/arm/mathops.h libavutil/internal.h

[mru]

Author: mru
Date: Thu Mar  5 22:20:13 2009
New Revision: 17831

Log:
ARM: disable inline asm for armcc

Modified:
   trunk/libavcodec/arm/mathops.h
   trunk/libavutil/internal.h

Modified: trunk/libavcodec/arm/mathops.h
==============================================================================
--- trunk/libavcodec/arm/mathops.h	Thu Mar  5 22:20:10 2009	(r17830)
+++ trunk/libavcodec/arm/mathops.h	Thu Mar  5 22:20:13 2009	(r17831)
@@ -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 
     return m;
 }
 
+#endif /* HAVE_INLINE_ASM */
+
 #endif /* AVCODEC_ARM_MATHOPS_H */

Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h	Thu Mar  5 22:20:10 2009	(r17830)
+++ trunk/libavutil/internal.h	Thu Mar  5 22:20:13 2009	(r17831)
@@ -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
                      : "=&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;