diff options
| author | Eric Christopher <echristo@gcc.gnu.org> | 2006-12-05 19:40:54 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gcc.gnu.org> | 2006-12-05 19:40:54 +0000 |
| commit | 742163c039877dd51fa4cf99e8f616ac48c804a3 (patch) | |
| tree | dc0c3bdb18f24e1416a23753a4f8720e4b32401c /gcc | |
| parent | bab651ad74c5b68cbb1405fe407934d1d9f8aa77 (diff) | |
| download | gcc-742163c039877dd51fa4cf99e8f616ac48c804a3.zip gcc-742163c039877dd51fa4cf99e8f616ac48c804a3.tar.gz gcc-742163c039877dd51fa4cf99e8f616ac48c804a3.tar.bz2 | |
darwin.h (DARWIN_EXTRA_SPECS): New.
2006-12-05 Eric Christopher <echristo@apple.com>
* config/darwin.h (DARWIN_EXTRA_SPECS): New.
(STARTFILE_SPEC): Use.
(DARWIN_DYLIB1_SPEC): New.
(DARWIN_CRT1_SPEC): New.
* config/i386/darwin64.h (SUBTARGET_EXTRA_SPECS): Use
DARWIN_EXTRA_SPECS.
* config/i386/darwin.h: Ditto.
* config/rs6000/darwin.h: Ditto.
From-SVN: r119555
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/config/darwin.h | 16 | ||||
| -rw-r--r-- | gcc/config/i386/darwin.h | 1 | ||||
| -rw-r--r-- | gcc/config/i386/darwin64.h | 1 | ||||
| -rw-r--r-- | gcc/config/rs6000/darwin.h | 1 |
5 files changed, 29 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 975598a..71d8243 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2006-12-05 Eric Christopher <echristo@apple.com> + + * config/darwin.h (DARWIN_EXTRA_SPECS): New. + (STARTFILE_SPEC): Use. + (DARWIN_DYLIB1_SPEC): New. + (DARWIN_CRT1_SPEC): New. + * config/i386/darwin64.h (SUBTARGET_EXTRA_SPECS): Use + DARWIN_EXTRA_SPECS. + * config/i386/darwin.h: Ditto. + * config/rs6000/darwin.h: Ditto. + 2006-12-05 Daniel Berlin <dberlin@dberlin.org> * tree-vrp.c (pass_vrp): Remove PROP_smt_usage. @@ -62,7 +73,7 @@ 2006-12-04 Aldy Hernandez <aldyh@redhat.com> - * config/stormy16/stormy16.c (xstormy16_expand_builtin_va_start): + * config/stormy16/stormy16.c (xstormy16_expand_builtin_va_start): Change uses of MODIFY_EXPR to GIMPLE_MODIFY_STMT. (xstormy16_expand_builtin_va_arg): Same. diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 7f0c550..18a1495 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -367,7 +367,7 @@ extern GTY(()) int darwin_ms_struct; #undef STARTFILE_SPEC #define STARTFILE_SPEC \ - "%{Zdynamiclib: -ldylib1.o} \ + "%{Zdynamiclib: %(darwin_dylib1) } \ %{!Zdynamiclib:%{Zbundle:%{!static:-lbundle1.o}} \ %{!Zbundle:%{pg:%{static:-lgcrt0.o} \ %{!static:%{object:-lgcrt0.o} \ @@ -376,7 +376,7 @@ extern GTY(()) int darwin_ms_struct; %{!pg:%{static:-lcrt0.o} \ %{!static:%{object:-lcrt0.o} \ %{!object:%{preload:-lcrt0.o} \ - %{!preload:-lcrt1.o %(darwin_crt2)}}}}}} \ + %{!preload: %(darwin_crt1) %(darwin_crt2)}}}}}} \ %{shared-libgcc:%:version-compare(< 10.5 mmacosx-version-min= crt3.o%s)}" /* The native Darwin linker doesn't necessarily place files in the order @@ -384,6 +384,18 @@ extern GTY(()) int darwin_ms_struct; to put anything in ENDFILE_SPEC. */ /* #define ENDFILE_SPEC "" */ +#define DARWIN_EXTRA_SPECS \ + { "darwin_crt1", DARWIN_CRT1_SPEC }, \ + { "darwin_dylib1", DARWIN_DYLIB1_SPEC }, + +#define DARWIN_DYLIB1_SPEC \ + "%:version-compare(!> 10.5 mmacosx-version-min= -ldylib1.o) \ + %:version-compare(>= 10.5 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)" + /* Default Darwin ASM_SPEC, very simple. */ #define ASM_SPEC "-arch %(darwin_arch) \ %{Zforce_cpusubtype_ALL:-force_cpusubtype_ALL}" diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h index eef9fe8..6b509c7 100644 --- a/gcc/config/i386/darwin.h +++ b/gcc/config/i386/darwin.h @@ -81,6 +81,7 @@ Boston, MA 02110-1301, USA. */ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ + DARWIN_EXTRA_SPECS \ { "darwin_arch", DARWIN_ARCH_SPEC }, \ { "darwin_crt2", "" }, \ { "darwin_subarch", DARWIN_SUBARCH_SPEC }, diff --git a/gcc/config/i386/darwin64.h b/gcc/config/i386/darwin64.h index 01686fa..1a08386 100644 --- a/gcc/config/i386/darwin64.h +++ b/gcc/config/i386/darwin64.h @@ -30,6 +30,7 @@ Boston, MA 02110-1301, USA. */ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ + DARWIN_EXTRA_SPECS \ { "darwin_arch", DARWIN_ARCH_SPEC }, \ { "darwin_crt2", "" }, \ { "darwin_subarch", DARWIN_SUBARCH_SPEC }, diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h index 9617a7e..760ab4f 100644 --- a/gcc/config/rs6000/darwin.h +++ b/gcc/config/rs6000/darwin.h @@ -153,6 +153,7 @@ do { \ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ + DARWIN_EXTRA_SPECS \ { "darwin_arch", DARWIN_ARCH_SPEC }, \ { "darwin_crt2", DARWIN_CRT2_SPEC }, \ { "darwin_subarch", DARWIN_SUBARCH_SPEC }, |