[llvm-commits] [llvm-gcc-4.2] r133977 - in /llvm-gcc-4.2/trunk/gcc/config: arm/darwin.h darwin.h i386/darwin.h i386/t-darwin rs6000/darwin.h rs6000/t-darwin t-darwin
Bob Wilson
bob.wilson at apple.com
Mon Jun 27 17:35:36 PDT 2011
Author: bwilson
Date: Mon Jun 27 19:35:36 2011
New Revision: 133977
URL: http://llvm.org/viewvc/llvm-project?rev=133977&view=rev
Log:
Do not install or use crt3.o for ARM/Darwin targets. Radar 9385990.
Modified:
llvm-gcc-4.2/trunk/gcc/config/arm/darwin.h
llvm-gcc-4.2/trunk/gcc/config/darwin.h
llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h
llvm-gcc-4.2/trunk/gcc/config/i386/t-darwin
llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h
llvm-gcc-4.2/trunk/gcc/config/rs6000/t-darwin
llvm-gcc-4.2/trunk/gcc/config/t-darwin
Modified: llvm-gcc-4.2/trunk/gcc/config/arm/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/darwin.h?rev=133977&r1=133976&r2=133977&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/darwin.h Mon Jun 27 19:35:36 2011
@@ -256,6 +256,11 @@
#define DARWIN_DEFAULT_VERSION_TYPE DARWIN_VERSION_IPHONEOS
#endif
+/* APPLE LOCAL begin use crt3.o for x86 and ppc only 9385990 */
+#undef STARTFILE_SPEC
+#define STARTFILE_SPEC DARWIN_STARTFILE_SPEC
+/* APPLE LOCAL end use crt3.o for x86 and ppc only 9385990 */
+
#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc_s.1 -lgcc"
#undef SUBTARGET_EXTRA_SPECS
Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.h?rev=133977&r1=133976&r2=133977&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Mon Jun 27 19:35:36 2011
@@ -525,8 +525,7 @@
powerpc program built. */
/* APPLE LOCAL begin mainline */
-#undef STARTFILE_SPEC
-#define STARTFILE_SPEC \
+#define DARWIN_STARTFILE_SPEC \
"%{Zdynamiclib: %(darwin_dylib1) } \
"/* APPLE LOCAL link optimizations 6499452 */" \
%{!Zdynamiclib:%{Zbundle:%{!static: %(darwin_bundle1)}} \
@@ -538,10 +537,7 @@
%{!static:%{object:-lcrt0.o} \
%{!object:%{preload:-lcrt0.o} \
%{!preload: %(darwin_crt1) \
- %(darwin_crt2)}}}}}} \
- %{shared-libgcc: \
- %{!miphoneos-version-min=*: \
- %:version-compare(< 10.5 mmacosx-version-min= crt3.o%s)}}"
+ %(darwin_crt2)}}}}}}"
/* APPLE LOCAL end mainline */
/* The native Darwin linker doesn't necessarily place files in the order
Modified: llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h?rev=133977&r1=133976&r2=133977&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h Mon Jun 27 19:35:36 2011
@@ -141,6 +141,14 @@
/* APPLE LOCAL ARM 5681645 8307333 */
#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc"
+/* APPLE LOCAL begin use crt3.o for x86 and ppc only 9385990 */
+#undef STARTFILE_SPEC
+#define STARTFILE_SPEC DARWIN_STARTFILE_SPEC \
+ "%{shared-libgcc: \
+ %{!miphoneos-version-min=*: \
+ %:version-compare(< 10.5 mmacosx-version-min= crt3.o%s)}}"
+/* APPLE LOCAL end use crt3.o for x86 and ppc only 9385990 */
+
/* APPLE LOCAL begin link optimizations 6499452 */
#undef DARWIN_CRT1_SPEC
#define DARWIN_CRT1_SPEC \
Modified: llvm-gcc-4.2/trunk/gcc/config/i386/t-darwin
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/t-darwin?rev=133977&r1=133976&r2=133977&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/t-darwin (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/t-darwin Mon Jun 27 19:35:36 2011
@@ -20,3 +20,6 @@
TARGET_LIBGCC2_CFLAGS = -fPIC -pipe
TARGET_LIBGCC2_STATIC_CFLAGS = -mmacosx-version-min=10.4
# APPLE LOCAL end gcov 5573505
+
+# APPLE LOCAL use crt3.o for x86 and ppc only 9385990
+EXTRA_MULTILIB_PARTS=crt3.o
Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h?rev=133977&r1=133976&r2=133977&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h Mon Jun 27 19:35:36 2011
@@ -137,6 +137,14 @@
mcpu=G5:ppc970; \
:ppc}}"
+/* APPLE LOCAL begin use crt3.o for x86 and ppc only 9385990 */
+#undef STARTFILE_SPEC
+#define STARTFILE_SPEC DARWIN_STARTFILE_SPEC \
+ "%{shared-libgcc: \
+ %{!miphoneos-version-min=*: \
+ %:version-compare(< 10.5 mmacosx-version-min= crt3.o%s)}}"
+/* APPLE LOCAL end use crt3.o for x86 and ppc only 9385990 */
+
/* crt2.o is at least partially required for 10.3.x and earlier. */
/* APPLE LOCAL begin ARM 5683689 */
#define DARWIN_CRT2_SPEC \
Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/t-darwin
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/t-darwin?rev=133977&r1=133976&r2=133977&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/t-darwin (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/t-darwin Mon Jun 27 19:35:36 2011
@@ -25,6 +25,9 @@
TARGET_LIBGCC2_STATIC_CFLAGS = -mmacosx-version-min=10.4
# APPLE LOCAL end gcov 5573505
+# APPLE LOCAL use crt3.o for x86 and ppc only 9385990
+EXTRA_MULTILIB_PARTS=crt3.o
+
# APPLE LOCAL 5901604 6499452
# LLVM LOCAL begin 8260893
MULTILIB_EXTRA_OPTS = isysroot/Developer/SDKs/MacOSX10.5.sdk mmacosx-version-min=10.5
Modified: llvm-gcc-4.2/trunk/gcc/config/t-darwin
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/t-darwin?rev=133977&r1=133976&r2=133977&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/t-darwin (original)
+++ llvm-gcc-4.2/trunk/gcc/config/t-darwin Mon Jun 27 19:35:36 2011
@@ -30,7 +30,6 @@
# APPLE LOCAL begin 4505290
# How to build crt3.o
-EXTRA_MULTILIB_PARTS=crt3.o
# Pass -fno-tree-dominator-opts to work around bug 26840.
$(T)crt3$(objext): $(srcdir)/config/darwin-crt3.c $(GCC_PASSES) \
$(TCONFIG_H) stmp-int-hdrs tsystem.h
More information about the llvm-commits
mailing list