gkeating 02/11/22 16:24:48 Modified: live/gcc3/gcc/config darwin.h Log: Fix merge problem with STARTFILE_SPEC Revision Changes Path 1.186 +11 -2 src/live/gcc3/gcc/config/darwin.h Index: darwin.h =================================================================== RCS file: /cvs/Darwin/src/live/gcc3/gcc/config/darwin.h,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- darwin.h 2002/11/20 20:49:18 1.185 +++ darwin.h 2002/11/23 00:24:47 1.186 @@ -312,10 +312,19 @@ /* We specify crt0.o as -lcrt0.o so that ld will search the library path. */ +/* APPLE LOCAL begin flag translation */ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ - "%{pg:%{static:-lgcrt0.o}%{!static:-lgcrt1.o} -lcrt2.o} \ - %{!pg:%{static:-lcrt0.o}%{!static:-lcrt1.o} -lcrt2.o}" + "%{!Zdynamiclib:%{Zbundle:%{!static:-lbundle1.o}} \ + %{!Zbundle:%{pg:%{static:-lgcrt0.o} \ + %{!static:%{object:-lgcrt0.o} \ + %{!object:%{preload:-lgcrt0.o} \ + %{!preload:-lgcrt1.o -lcrt2.o}}}} \ + %{!pg:%{static:-lcrt0.o} \ + %{!static:%{object:-lcrt0.o} \ + %{!object:%{preload:-lcrt0.o} \ + %{!preload:-lcrt1.o -lcrt2.o}}}}}}" +/* APPLE LOCAL end flag translation */ /* The native Darwin linker doesn't necessarily place files in the order that they're specified on the link line. Thus, it is pointless