diff options
author | Iain Sandoe <iain@codesourcery.com> | 2016-11-27 15:07:22 +0000 |
---|---|---|
committer | Iain Sandoe <iains@gcc.gnu.org> | 2016-11-27 15:07:22 +0000 |
commit | b410cf1dc056aab195c5408871ffca932df8a78a (patch) | |
tree | dc142613e84e7693a450028b7c1073978b9092b4 /gcc/config/darwin.h | |
parent | 03f82a6a634ddfa5828843b647c896968aee3702 (diff) | |
download | gcc-b410cf1dc056aab195c5408871ffca932df8a78a.zip gcc-b410cf1dc056aab195c5408871ffca932df8a78a.tar.gz gcc-b410cf1dc056aab195c5408871ffca932df8a78a.tar.bz2 |
[Darwin] fix PR67710 by updating 'as' specs to handle newer assembler versions.
A/ Newer versions of ld64 check the min_version command, and newer versions of
the system assembler inserts this in response to "-mmacosx-version-min=" on
the assembler line. Unless one makes sensible versions, some object is bound
to conflict.
B/ Additionally, there's a difference in behaviour between "as" and "ld" when
presented with xx.yy.zz (ld truncates to xx.yy, as doesn't); net result is
that one needs to pass a truncated version to "as".
So (if the assembler supports minversion commands)
(a) provide a truncated minversion (as asm_macosx_version_min, which is a
driver-only var).
(b) pass this to "as"
(c) Update tests to determine 'HAVE_AS_MMACOSX_VERSION_MIN_OPTION'
(Rainer's patch)
(d) For some reason the testcases are "run" (it's not obvious they need to be,
they are checking compile-time issues)
- anyway, to preserve the status quo, I've left them as exec. However, the
minimum version that can be code-gened for is target-dependent (there are no
released x86 versions before 10.4, for example). To avoid conflicts where
the "as" is assuming some minimum, I've set the testversion to 10.5 (which
is supported by all the archs we have)
(e) We need to ensure that libgcc and crts are generated with a sufficiently
old minversion not to conflict.
gcc/
2016-11-27 Iain Sandoe <iain@codesourcery.com>
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR target/67710
* config.in: Regenerate
* config/darwin-driver.c (darwin_driver_init): Emit a version string
for the assembler.
* config/darwin.h(ASM_MMACOSX_VERSION_MIN_SPEC): New, new tests.
* config/darwin.opt(asm_macosx_version_min): New.
* config/i386/darwin.h: Handle ASM_MMACOSX_VERSION_MIN_SPEC.
* configure: Regenerate
* configure.ac: Check for mmacosx-version-min handling.
gcc/testsuite/
2016-11-27 Iain Sandoe <iain@codesourcery.com>
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Dominique d'Humieres <dominiq@lps.ens.fr>
PR target/67710
* gcc.dg/darwin-minversion-1.c: Update min version check.
* gcc.dg/darwin-minversion-2.c: Likewise.
* gcc.dg/darwin-minversion-3.c: Likewise.
libgcc/
2016-11-27 Iain Sandoe <iain@codesourcery.com>
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR target/67710
* config/t-darwin: Default builds to 10.5 codegen.
Co-Authored-By: Dominique d'Humieres <dominiq@lps.ens.fr>
Co-Authored-By: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
From-SVN: r242898
Diffstat (limited to 'gcc/config/darwin.h')
-rw-r--r-- | gcc/config/darwin.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 79fc506..374034e 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -399,10 +399,27 @@ extern GTY(()) int darwin_ms_struct; %:version-compare(>< 10.6 10.8 mmacosx-version-min= -lcrt1.10.6.o) \ %{fgnu-tm: -lcrttms.o}" -/* Default Darwin ASM_SPEC, very simple. */ +#ifdef HAVE_AS_MMACOSX_VERSION_MIN_OPTION +/* Emit macosx version (but only major). */ +#define ASM_MMACOSX_VERSION_MIN_SPEC \ + " %{asm_macosx_version_min=*: -mmacosx-version-min=%*} %<asm_macosx_version_min=*" +#else +#define ASM_MMACOSX_VERSION_MIN_SPEC " %<asm_macosx_version_min=*" +#endif + +/* When we detect that we're cctools or llvm as, we need to insert the right + additional options. */ +#if HAVE_GNU_AS +#define ASM_OPTIONS "" +#else +#define ASM_OPTIONS "%{v} %{w:-W} %{I*}" +#endif + +/* Default Darwin ASM_SPEC, very simple. */ #define ASM_SPEC "-arch %(darwin_arch) \ + " ASM_OPTIONS " \ %{Zforce_cpusubtype_ALL:-force_cpusubtype_ALL} \ - %{static}" + %{static}" ASM_MMACOSX_VERSION_MIN_SPEC /* Default ASM_DEBUG_SPEC. Darwin's as cannot currently produce dwarf debugging data. */ |