cabac: Try to disable problematic ASM for gcc-llvm 4.2.1
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jan 2012 17:09:56 +0000 (18:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jan 2012 21:30:21 +0000 (22:30 +0100)
This should fix compilation with gcc-llvm (see darwin fate box)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/cabac.h

index 17e699a..2bb0be6 100644 (file)
@@ -82,7 +82,8 @@
         "1:                                                             \n\t"
 
 
-#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) && !(defined(__i386) && defined(__clang__) && (__clang_major__<2 || (__clang_major__==2 && __clang_minor__<10)))
+#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) && !(defined(__i386) && defined(__clang__) && (__clang_major__<2 || (__clang_major__==2 && __clang_minor__<10)))\
+                                               && !(defined(__i386) && !defined(__clang__) && defined(__llvm__) && __GNUC__==4 && __GNUC_MINOR__==2 && __GNUC_PATCHLEVEL__<=1)
 #define get_cabac_inline get_cabac_inline_x86
 static av_always_inline int get_cabac_inline_x86(CABACContext *c,
                                                  uint8_t *const state)