aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2013-11-01 17:46:33 +0000
committerJason E. Hale <jhale@FreeBSD.org>2013-11-01 17:46:33 +0000
commit9d9e01ec18050a44c6372ccfe68f6d9746d005c4 (patch)
tree26bf9b580ce747f59b9e64dd2e183de4ef6ff505
parent90f5b719f0b5f5709f17831b9c23d2b533bdba69 (diff)
- Fix build with clang on i386
Reported by: Herbert J. Skuhra <hskuhra@eumx.net> Approved by: wg
Notes
Notes: svn path=/head/; revision=332397
-rw-r--r--multimedia/ffmpeg/files/patch-libavutil-x86-asm.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h b/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
new file mode 100644
index 000000000000..52ff6d3247fa
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
@@ -0,0 +1,11 @@
+--- ./libavutil/x86/asm.h.orig 2013-11-01 13:02:26.000000000 -0400
++++ ./libavutil/x86/asm.h 2013-11-01 13:03:00.000000000 -0400
+@@ -70,7 +70,7 @@
+ typedef int x86_reg;
+ #endif
+
+-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
++#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
+ #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
+
+ #if ARCH_X86_64 && defined(PIC)