From 8123e0901fc7faa3d7dcf80af9ed0d874f8e7a06 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Fri, 22 Jun 2012 18:46:52 +0100
Subject: x86: place some inline asm under #if HAVE_INLINE_ASM

Signed-off-by: Mans Rullgard <mans@mansr.com>
---
 libavutil/internal.h    | 2 +-
 libavutil/x86/bswap.h   | 3 +++
 libavutil/x86/intmath.h | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'libavutil')

diff --git a/libavutil/internal.h b/libavutil/internal.h
index ae678d5840..41e8a9ab36 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -110,7 +110,7 @@ struct AVDictionary {
 
 /* math */
 
-#if ARCH_X86
+#if ARCH_X86 && HAVE_INLINE_ASM
 #define MASK_ABS(mask, level)\
             __asm__ volatile(\
                 "cltd                   \n\t"\
diff --git a/libavutil/x86/bswap.h b/libavutil/x86/bswap.h
index c6cf007c86..c73be9af81 100644
--- a/libavutil/x86/bswap.h
+++ b/libavutil/x86/bswap.h
@@ -28,6 +28,8 @@
 #include "config.h"
 #include "libavutil/attributes.h"
 
+#if HAVE_INLINE_ASM
+
 #if !AV_GCC_VERSION_AT_LEAST(4,1)
 #define av_bswap16 av_bswap16
 static av_always_inline av_const unsigned av_bswap16(unsigned x)
@@ -55,4 +57,5 @@ static inline uint64_t av_const av_bswap64(uint64_t x)
 #endif
 #endif /* !AV_GCC_VERSION_AT_LEAST(4,5) */
 
+#endif /* HAVE_INLINE_ASM */
 #endif /* AVUTIL_X86_BSWAP_H */
diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h
index a7e82b1340..b23c0f1bd0 100644
--- a/libavutil/x86/intmath.h
+++ b/libavutil/x86/intmath.h
@@ -21,6 +21,7 @@
 #ifndef AVUTIL_X86_INTMATH_H
 #define AVUTIL_X86_INTMATH_H
 
+#if HAVE_INLINE_ASM
 #define FASTDIV(a,b) \
     ({\
         int ret, dmy;\
@@ -31,5 +32,6 @@
             );\
         ret;\
     })
+#endif
 
 #endif /* AVUTIL_X86_INTMATH_H */
-- 
cgit v1.2.3