From 5fc265c14ff7c8c382dc9d1ba0fb26b2819d1d09 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sun, 15 Aug 2010 19:15:55 +0000 Subject: [PATCH] rationalize libgcc stub & static lib linkage on Darwin 9 & 10. * config/darwin.h (REAL_LIBGCC_SPEC): Remove libgcc_s.10.5 stub for Darwin10. Do not link libgcc.a for Darwin >= 9. From-SVN: r163267 --- gcc/ChangeLog | 5 +++++ gcc/config/darwin.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index df9316115e6..02fa0f869ed 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-08-15 Iain Sandoe + + * config/darwin.h (REAL_LIBGCC_SPEC): Remove libgcc_s.10.5 stub for + Darwin10. Do not link libgcc.a for Darwin >= 9. + 2010-08-15 Gerald Pfeifer * doc/invoke.texi (Warning Options): Fix terminology and markup diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index df73890bdd0..feb57c9feb7 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -406,15 +406,15 @@ extern GTY(()) int darwin_ms_struct; "%{static-libgcc|static: -lgcc_eh -lgcc; \ shared-libgcc|fexceptions|fgnu-runtime: \ %:version-compare(!> 10.5 mmacosx-version-min= -lgcc_s.10.4) \ - %:version-compare(>= 10.5 mmacosx-version-min= -lgcc_s.10.5) \ + %:version-compare(>< 10.5 10.6 mmacosx-version-min= -lgcc_s.10.5) \ %:version-compare(!> 10.5 mmacosx-version-min= -lgcc_ext.10.4) \ %:version-compare(>= 10.5 mmacosx-version-min= -lgcc_ext.10.5) \ - -lgcc; \ + %:version-compare(< 10.5 mmacosx-version-min= -lgcc) ; \ :%:version-compare(>< 10.3.9 10.5 mmacosx-version-min= -lgcc_s.10.4) \ - %:version-compare(>= 10.5 mmacosx-version-min= -lgcc_s.10.5) \ + %:version-compare(>< 10.5 10.6 mmacosx-version-min= -lgcc_s.10.5) \ %:version-compare(!> 10.5 mmacosx-version-min= -lgcc_ext.10.4) \ %:version-compare(>= 10.5 mmacosx-version-min= -lgcc_ext.10.5) \ - -lgcc}" + %:version-compare(< 10.5 mmacosx-version-min= -lgcc) }" /* We specify crt0.o as -lcrt0.o so that ld will search the library path.