diff mbox series

[FFmpeg-devel,v2] configure: fix clang on macOS 10.15

Message ID 20200415133409.26610-1-josh@itanimul.li
State Accepted
Commit 07ecc4615c3ef5cc2fc61209a845cffd0c073b13
Headers show
Series [FFmpeg-devel,v2] configure: fix clang on macOS 10.15 | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Josh Dekker April 15, 2020, 1:34 p.m. UTC
Works around a bug in the newer Xcode 11's clang with -fstack-check
emitting bad code with misaligned call instructions.

This fixes Trac #8073
---
 configure | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Jan Ekström April 15, 2020, 2:54 p.m. UTC | #1
On Wed, Apr 15, 2020 at 4:34 PM Josh de Kock <josh@itanimul.li> wrote:
>
> Works around a bug in the newer Xcode 11's clang with -fstack-check
> emitting bad code with misaligned call instructions.
>
> This fixes Trac #8073
> ---
>  configure | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/configure b/configure
> index 4d4c429be9..2ede4e7163 100755
> --- a/configure
> +++ b/configure
> @@ -5358,6 +5358,11 @@ case $target_os in
>          fi
>          version_script='-exported_symbols_list'
>          VERSION_SCRIPT_POSTPROCESS_CMD='tr " " "\n" | sed -n /global:/,/local:/p | grep ";" | tr ";" "\n" | sed -E "s/(.+)/_\1/g" | sed -E "s/(.+[^*])$$$$/\1*/"'
> +        # Workaround for Xcode 11 -fstack-check bug
> +        if enabled clang; then
> +            clang_version=$($cc -dumpversion)
> +            test ${clang_version%%.*} -eq 11 && add_cflags -fno-stack-check
> +        fi

Thank you, LGTM from me.

Jan
Josh Dekker April 15, 2020, 3:09 p.m. UTC | #2
On Wed, Apr 15, 2020, at 3:54 PM, Jan Ekström wrote:
> [...]
> 
> Thank you, LGTM from me.
> 
> Jan

Pushed.
diff mbox series

Patch

diff --git a/configure b/configure
index 4d4c429be9..2ede4e7163 100755
--- a/configure
+++ b/configure
@@ -5358,6 +5358,11 @@  case $target_os in
         fi
         version_script='-exported_symbols_list'
         VERSION_SCRIPT_POSTPROCESS_CMD='tr " " "\n" | sed -n /global:/,/local:/p | grep ";" | tr ";" "\n" | sed -E "s/(.+)/_\1/g" | sed -E "s/(.+[^*])$$$$/\1*/"'
+        # Workaround for Xcode 11 -fstack-check bug
+        if enabled clang; then
+            clang_version=$($cc -dumpversion)
+            test ${clang_version%%.*} -eq 11 && add_cflags -fno-stack-check
+        fi
         ;;
     msys*)
         die "Native MSYS builds are discouraged, please use the MINGW environment."