aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIain Sandoe <iains@gcc.gnu.org>2010-08-15 19:15:55 +0000
committerIain Sandoe <iains@gcc.gnu.org>2010-08-15 19:15:55 +0000
commit5fc265c14ff7c8c382dc9d1ba0fb26b2819d1d09 (patch)
tree193533ff2e8c868a86f03ad0b12ef32f647566fd /gcc
parent09ccff9f3d0704402ec2b0dbefb6cf7021b87a15 (diff)
downloadgcc-5fc265c14ff7c8c382dc9d1ba0fb26b2819d1d09.zip
gcc-5fc265c14ff7c8c382dc9d1ba0fb26b2819d1d09.tar.gz
gcc-5fc265c14ff7c8c382dc9d1ba0fb26b2819d1d09.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/darwin.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df93161..02fa0f8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-15 Iain Sandoe <iains@gcc.gnu.org>
+
+ * 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 <gerald@pfeifer.com>
* doc/invoke.texi (Warning Options): Fix terminology and markup
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index df73890..feb57c9 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.