From c643347be00539c4526e84a15177a98cd5099c52 Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Thu, 20 Jul 2017 04:13:49 -0400
Subject: [PATCH] contrib: Improve Libav configuration and compiler flags on
 32-bit Intel.

Removes old Darwin-specific i386 stuffs and replaces with generic stuffs.

Fixes an issue cross-compiling compiling current master for i686.
---
 contrib/ffmpeg/module.defs | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index e3c72335f..5280a1437 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -112,20 +112,12 @@ endif
 ## enable compile verbosity
 FFMPEG.BUILD.extra = V=1
 
-##
-## llvm inline assembler (used in llvm-gcc and clang) runs out of registers
-## on darwin i386 - unclear if it is a source code or llvm bug.
-##
-ifeq (darwin-i386,$(BUILD.system)-$(BUILD.machine))
-    ## optimize mode hack: use clang
-    ifneq (none,$(FFMPEG.GCC.O))
-        FFMPEG.GCC.gcc = clang
-    endif
-
-    ## debug mode hack: omit frame pointer
-    ifneq (none,$(FFMPEG.GCC.g))
-        FFMPEG.GCC.args.extra += -fomit-frame-pointer
-    endif
+# 32-bit intel
+ifneq (,$(filter $(BUILD.machine),i386 i486 i586 i686))
+    # avoid running out of registers
+    FFMPEG.GCC.args.extra += -fomit-frame-pointer
+    # avoid 'asm' operand has impossible constraints errors
+    FFMPEG.CONFIGURE.extra += --disable-inline-asm
 endif
 
 ## For POSIX.1-2001
-- 
2.40.0