diff options
| author | Iain Sandoe <iains@gcc.gnu.org> | 2010-08-20 20:10:42 +0000 |
|---|---|---|
| committer | Iain Sandoe <iains@gcc.gnu.org> | 2010-08-20 20:10:42 +0000 |
| commit | c6d8116af92b7c733ff5b3180e1ae1a7becbb377 (patch) | |
| tree | e1b74d1652f7f150dc933ec4580719e08f812607 | |
| parent | 26e4a41748ae801545ab9b0c9609e0d06c0530c2 (diff) | |
| download | gcc-c6d8116af92b7c733ff5b3180e1ae1a7becbb377.zip gcc-c6d8116af92b7c733ff5b3180e1ae1a7becbb377.tar.gz gcc-c6d8116af92b7c733ff5b3180e1ae1a7becbb377.tar.bz2 | |
revert r163410, partially revert r163267.
* config/rs6000/darwin.h (LIB_SPEC): Remove.
* config/darwin.h (REAL_LIBGCC_SPEC): Link lgcc for all
Darwin versions.
From-SVN: r163419
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/darwin.h | 4 | ||||
| -rw-r--r-- | gcc/config/rs6000/darwin.h | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1cfd27e..8b93321 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-08-20 Iain Sandoe <iains@gcc.gnu.org> + + revert r163410, partially revert r163267. + * config/rs6000/darwin.h (LIB_SPEC): Remove. + * config/darwin.h (REAL_LIBGCC_SPEC): Link lgcc for all + Darwin versions. + 2010-08-20 Jakub Jelinek <jakub@redhat.com> PR middle-end/44974 diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index c935434..3314acb 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -412,12 +412,12 @@ extern GTY(()) int darwin_ms_struct; %: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) \ - %:version-compare(< 10.5 mmacosx-version-min= -lgcc) ; \ + -lgcc ; \ :%:version-compare(>< 10.3.9 10.5 mmacosx-version-min= -lgcc_s.10.4) \ %: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) \ - %:version-compare(< 10.5 mmacosx-version-min= -lgcc) }" + -lgcc }" /* We specify crt0.o as -lcrt0.o so that ld will search the library path. diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h index d2d1a1f..810563e 100644 --- a/gcc/config/rs6000/darwin.h +++ b/gcc/config/rs6000/darwin.h @@ -120,11 +120,6 @@ extern int darwin_emit_branch_islands; mcpu=G5:ppc970; \ :ppc}}" -/* Linked libs might refer to save/restFP - we still need to append -lgcc to - provide these. */ -#undef LIB_SPEC -#define LIB_SPEC "%{!static:-lgcc -lSystem}" - /* crt2.o is at least partially required for 10.3.x and earlier. */ #define DARWIN_CRT2_SPEC \ "%{!m64:%:version-compare(!> 10.4 mmacosx-version-min= crt2.o%s)}" |