diff options
| author | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-03 18:03:45 +0000 |
|---|---|---|
| committer | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-03 18:03:45 +0000 |
| commit | 7a7511664b33a428315afed1065419dd91e70a6b (patch) | |
| tree | 934aedebf021372d7e8ce4d6a9d76b4f4fb5864e /gcc | |
| parent | 2d782cba9476ffb60b4be605282503322fa4c0a3 (diff) | |
| download | gcc-7a7511664b33a428315afed1065419dd91e70a6b.tar.gz | |
gcc:
* config/darwin.h (STARTFILE_SPEC): Do not use -lbundle1.o when
Darwin >= 10.
(DARWIN_DYLIB1_SPEC): Do not use -ldylib1.10.5.o when Darwin >= 10.
(DARWIN_CRT1_SPEC): Use -lcrt1.10.6.o when Darwin >= 10.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181974 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/darwin.h | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 82031fc32ab..08b04408ba9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-12-03 Iain Sandoe <iains@gcc.gnu.org> + + * config/darwin.h (STARTFILE_SPEC): Do not use -lbundle1.o when + Darwin >= 10. + (DARWIN_DYLIB1_SPEC): Do not use -ldylib1.10.5.o when Darwin >= 10. + (DARWIN_CRT1_SPEC): Use -lcrt1.10.6.o when Darwin >= 10. + 2011-12-03 Jakub Jelinek <jakub@redhat.com> * fold-const.c (fold_unary_loc): Fold VEC_UNPACK_LO_EXPR, diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index fd4590404bd..70ac80c19ac 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -348,7 +348,9 @@ extern GTY(()) int darwin_ms_struct; #undef STARTFILE_SPEC #define STARTFILE_SPEC \ "%{Zdynamiclib: %(darwin_dylib1) %{fgnu-tm: -lcrttms.o}} \ - %{!Zdynamiclib:%{Zbundle:%{!static:-lbundle1.o %{fgnu-tm: -lcrttms.o}}} \ + %{!Zdynamiclib:%{Zbundle:%{!static: \ + %:version-compare(< 10.6 mmacosx-version-min= -lbundle1.o) \ + %{fgnu-tm: -lcrttms.o}}} \ %{!Zbundle:%{pg:%{static:-lgcrt0.o} \ %{!static:%{object:-lgcrt0.o} \ %{!object:%{preload:-lgcrt0.o} \ @@ -370,11 +372,12 @@ extern GTY(()) int darwin_ms_struct; #define DARWIN_DYLIB1_SPEC \ "%:version-compare(!> 10.5 mmacosx-version-min= -ldylib1.o) \ - %:version-compare(>= 10.5 mmacosx-version-min= -ldylib1.10.5.o)" + %:version-compare(>< 10.5 10.6 mmacosx-version-min= -ldylib1.10.5.o)" #define DARWIN_CRT1_SPEC \ "%:version-compare(!> 10.5 mmacosx-version-min= -lcrt1.o) \ - %:version-compare(>= 10.5 mmacosx-version-min= -lcrt1.10.5.o) \ + %:version-compare(>< 10.5 10.6 mmacosx-version-min= -lcrt1.10.5.o) \ + %:version-compare(>= 10.6 mmacosx-version-min= -lcrt1.10.6.o) \ %{fgnu-tm: -lcrttms.o}" /* Default Darwin ASM_SPEC, very simple. */ |