darwin.h (STARTFILE_SPEC): Do not use -lbundle1.o when Darwin >= 10.

2012-05-29  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.

From-SVN: r187992

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 078ad6d531f53f45a0a6a6b62f5ed3543573c09e..ae1dd66844291af22735dcb2d5f78c47e6dcecdb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-29  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.
+
 2012-05-29  Oleg Endo  <olegendo@gcc.gnu.org>
 
        PR target/51340

diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 3e6efd790613d6fcb1c92f35ead600d586a47c9c..80ff0b060b736512e7737b85d9cfda6f61afa963 100644 (file)
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -356,7 +356,9 @@ extern GTY(()) int darwin_ms_struct;
      %{!Zbundle:%{pg:%{static:-lgcrt0.o}                                   \
                      %{!static:%{object:-lgcrt0.o}                         \
                                %{!object:%{preload:-lgcrt0.o}              \
-                                 %{!preload:-lgcrt1.o %(darwin_crt2)}}}}    \
+                                 %{!preload:-lgcrt1.o                       \
+                                 %:version-compare(>= 10.8 mmacosx-version-min= -no_new_main) \
+                                 %(darwin_crt2)}}}}    \
                 %{!pg:%{static:-lcrt0.o}                                   \
                       %{!static:%{object:-lcrt0.o}                         \
                                 %{!object:%{preload:-lcrt0.o}              \
@@ -379,7 +381,7 @@ extern GTY(()) int darwin_ms_struct;
 #define DARWIN_CRT1_SPEC                                               \
   "%:version-compare(!> 10.5 mmacosx-version-min= -lcrt1.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)       \
+   %:version-compare(>< 10.6 10.8 mmacosx-version-min= -lcrt1.10.6.o)  \
    %{fgnu-tm: -lcrttms.o}"
 
 /* Default Darwin ASM_SPEC, very simple.  */