From 2db255c38d93b2ff60516d5dd3cf5e7001cd7ccd Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Tue, 7 Jan 2020 21:37:36 +0000 Subject: [PATCH] [testsuite, Darwin] Fix failing darwin-version-1.c. Recent platform linkers will no longer accept linking for a target OS version less than 10.4. Recent SDKs no longer have the libgcc_s shims used for 10.4 and 10.5. So we need to adjust tests that expect these. 2020-01-07 Iain Sandoe Backport from mainline. 2020-01-05 Iain Sandoe * gcc.dg/darwin-version-1.c: Adjust test to use different options for Darwin4-9 and Darwin10+. From-SVN: r279975 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.dg/darwin-version-1.c | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 25874aa79aab..f23c0804b32b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2020-01-07 Iain Sandoe + + Backport from mainline. + 2020-01-05 Iain Sandoe + + * gcc.dg/darwin-version-1.c: Adjust test to use different + options for Darwin4-9 and Darwin10+. + 2020-01-02 Jakub Jelinek PR c/90677 diff --git a/gcc/testsuite/gcc.dg/darwin-version-1.c b/gcc/testsuite/gcc.dg/darwin-version-1.c index 11cfceff3996..ad7f7da3b63c 100644 --- a/gcc/testsuite/gcc.dg/darwin-version-1.c +++ b/gcc/testsuite/gcc.dg/darwin-version-1.c @@ -1,10 +1,14 @@ /* Basic test of the -mmacosx-version-min option. */ -/* { dg-options "-mmacosx-version-min=10.1" } */ +/* Darwin4 corresponds to MacOS 10.0. */ +/* { dg-options "-mmacosx-version-min=10.1" { target *-*-darwin[456789]* } } */ +/* Later Darwin linkers decline to link for less than Darwin8/MacOS 10.4. + However, we need to make the link for 10.6 because the relevant libgcc_s + shim files for 10.4 and 10.5 are also not installed in later SDKs. */ +/* { dg-options "-mmacosx-version-min=10.6" { target *-*-darwin[123]* } } */ /* { dg-do link { target *-*-darwin* } } */ int main() { return 0; } - -- 2.47.2