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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 975598aab0308a905dff0a8234cb2c5e9eea1d3c..71d8243c0cab82411a335fbfd8b74c1a89c11339 100644 (file)
--- 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 7f0c55057f27538fb8b83ddf43c6339cb4dd708f..18a14957bdd20dadc4b37f8d27a1d272c412563f 100644 (file)
--- 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 eef9fe84d590cbd3b22f24657e43f095762bbf4b..6b509c7cb8dda45cccf10b98cb623880847d7551 100644 (file)
--- 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 01686fa0ed55705f3fc25e6957e3887706ddec27..1a0838632a7d9018e50a96ba2f2267d492ff96a4 100644 (file)
--- 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 9617a7eb0467556e8dd4fadc3c02f02e0068711f..760ab4f45cb5975a65c1fcf0c57105740eb54cdd 100644 (file)
--- 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 },