public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r10-10776] Darwin, X86, config: Adjust 'as' command lines [PR100340].
@ 2022-05-29 19:02 Iain D Sandoe
0 siblings, 0 replies; only message in thread
From: Iain D Sandoe @ 2022-05-29 19:02 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:8e4e6100d7fdef22e3f3c8475699a32aeb3e60ea
commit r10-10776-g8e4e6100d7fdef22e3f3c8475699a32aeb3e60ea
Author: Iain Sandoe <iain@sandoe.co.uk>
Date: Sat Jul 31 16:29:03 2021 +0100
Darwin, X86, config: Adjust 'as' command lines [PR100340].
Versions of the assembler using clang from XCode 12.5/12.5.1
have a bug which produces different code layout between debug and
non-debug input, leading to a compare fail for default configure
parameters.
This is a workaround fix to disable the optimisation that is
responsible for the bug.
Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
PR target/100340 - Bootstrap fails with Clang 12.0.5 (XCode 12.5)
PR target/100340
gcc/ChangeLog:
* config.in: Regenerate.
* config/i386/darwin.h (EXTRA_ASM_OPTS): New
(ASM_SPEC): Pass options to disable branch shortening where
needed.
* configure: Regenerate.
* configure.ac: Detect versions of 'as' that support the
optimisation which has the bug.
(cherry picked from commit 743b8dd6fd757e997eb060d70fd4ae8e04fb56cd)
Diff:
---
gcc/config.in | 7 +++++++
gcc/config/i386/darwin.h | 10 +++++++++-
gcc/configure | 35 +++++++++++++++++++++++++++++++++++
gcc/configure.ac | 9 +++++++++
4 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/gcc/config.in b/gcc/config.in
index 364eba47737..0938ca9013f 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -570,6 +570,13 @@
#endif
+/* Define if your Mac OS X assembler supports -mllvm -x86-pad-for-align=false.
+ */
+#ifndef USED_FOR_TARGET
+#undef HAVE_AS_MLLVM_X86_PAD_FOR_ALIGN
+#endif
+
+
/* Define if your Mac OS X assembler supports the -mmacos-version-min option.
*/
#ifndef USED_FOR_TARGET
diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h
index 5faa1f40089..187697f1ab0 100644
--- a/gcc/config/i386/darwin.h
+++ b/gcc/config/i386/darwin.h
@@ -135,10 +135,18 @@ along with GCC; see the file COPYING3. If not see
%{mfentry*:%eDarwin does not support -mfentry or associated options}" \
DARWIN_CC1_SPEC
+/* This is a workaround for a tool bug: see PR100340. */
+
+#ifdef HAVE_AS_MLLVM_X86_PAD_FOR_ALIGN
+#define EXTRA_ASM_OPTS " -mllvm -x86-pad-for-align=false"
+#else
+#define EXTRA_ASM_OPTS ""
+#endif
+
#undef ASM_SPEC
#define ASM_SPEC "-arch %(darwin_arch) \
" ASM_OPTIONS " -force_cpusubtype_ALL \
- %{static}" ASM_MMACOSX_VERSION_MIN_SPEC
+ %{static}" ASM_MMACOSX_VERSION_MIN_SPEC EXTRA_ASM_OPTS
#undef ENDFILE_SPEC
#define ENDFILE_SPEC \
diff --git a/gcc/configure b/gcc/configure
index 84e0ea21054..10331ec5535 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -26421,6 +26421,41 @@ $as_echo "$as_me: WARNING: LTO for $target requires binutils >= 2.20.1, but vers
fi
;;
esac
+ case $target_os in
+ darwin2[0-9]* | darwin19*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for llvm assembler x86-pad-for-align option" >&5
+$as_echo_n "checking assembler for llvm assembler x86-pad-for-align option... " >&6; }
+if ${gcc_cv_as_mllvm_x86_pad_for_align+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gcc_cv_as_mllvm_x86_pad_for_align=no
+ if test x$gcc_cv_as != x; then
+ $as_echo '.text' > conftest.s
+ if { ac_try='$gcc_cv_as $gcc_cv_as_flags -mllvm -x86-pad-for-align=false -o conftest.o conftest.s >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }
+ then
+ gcc_cv_as_mllvm_x86_pad_for_align=yes
+ else
+ echo "configure: failed program was" >&5
+ cat conftest.s >&5
+ fi
+ rm -f conftest.o conftest.s
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_mllvm_x86_pad_for_align" >&5
+$as_echo "$gcc_cv_as_mllvm_x86_pad_for_align" >&6; }
+if test $gcc_cv_as_mllvm_x86_pad_for_align = yes; then
+
+$as_echo "#define HAVE_AS_MLLVM_X86_PAD_FOR_ALIGN 1" >>confdefs.h
+
+fi
+
+ ;;
+ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for -xbrace_comment" >&5
$as_echo_n "checking assembler for -xbrace_comment... " >&6; }
diff --git a/gcc/configure.ac b/gcc/configure.ac
index d068618bd8f..a254528493f 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -4534,6 +4534,15 @@ foo: nop
fi
;;
esac
+ case $target_os in
+ darwin2[[0-9]]* | darwin19*)
+ gcc_GAS_CHECK_FEATURE([llvm assembler x86-pad-for-align option],
+ gcc_cv_as_mllvm_x86_pad_for_align,,
+ [-mllvm -x86-pad-for-align=false], [.text],,
+ [AC_DEFINE(HAVE_AS_MLLVM_X86_PAD_FOR_ALIGN, 1,
+ [Define if your Mac OS X assembler supports -mllvm -x86-pad-for-align=false.])])
+ ;;
+ esac
gcc_GAS_CHECK_FEATURE([-xbrace_comment], gcc_cv_as_ix86_xbrace_comment,,
[-xbrace_comment=no], [.text],,
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-29 19:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-29 19:02 [gcc r10-10776] Darwin, X86, config: Adjust 'as' command lines [PR100340] Iain D Sandoe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).