darwin-crt2.c: Move to ../libgcc/config/rs6000.

	gcc:
	* config/darwin-crt2.c: Move to ../libgcc/config/rs6000.
	* config/darwin-crt3.c: Move to ../libgcc/config.
	* config/t-darwin (EXTRA_MULTILIB_PARTS): Remove.
	($(T)crt3$(objext)): Remove.
	* config/rs6000/t-darwin (DARWIN_EXTRA_CRT_BUILD_CFLAGS): Remove.
	($(T)crt2$(objext)): Remove.
	* config.gcc (powerpc-*-darwin*): Remove extra_parts.
	(powerpc64-*-darwin*): Likewise.

	gcc/po:
	* EXCLUDES (config/darwin-crt2.c): Remove.

	libgcc:
	* config/darwin-crt3.o: New file.
	* config/rs6000/darwin-crt2.c: New file.
	* config/t-darwin: New file.
	* config/rs6000/t-darwin (DARWIN_EXTRA_CRT_BUILD_CFLAGS): New variable.
	(crt2.o): New rule.
	* config.host (*-*-darwin*): Add crt3.o to extra_parts.
	(powerpc-*-darwin*): Add crt2.o to extra_parts.
	(powerpc64-*-darwin*): Likewise.

From-SVN: r176239

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ed493138eebf7330a54821f0035437e179e36620..522258417ac3617cac25dba6ec0a59894a2cce29 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2011-07-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * config/darwin-crt2.c: Move to ../libgcc/config/rs6000.
+       * config/darwin-crt3.c: Move to ../libgcc/config.
+       * config/t-darwin (EXTRA_MULTILIB_PARTS): Remove.
+       ($(T)crt3$(objext)): Remove.
+       * config/rs6000/t-darwin (DARWIN_EXTRA_CRT_BUILD_CFLAGS): Remove.
+       ($(T)crt2$(objext)): Remove.
+       * config.gcc (powerpc-*-darwin*): Remove extra_parts.
+       (powerpc64-*-darwin*): Likewise.
+
 2011-07-13  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/i386/i386.c (x86_output_mi_thunk): Support ptr_mode

diff --git a/gcc/config.gcc b/gcc/config.gcc
index c9dab55c63dc01006ab29503ee9471ef3541e22a..decd6ab8be8e09437fc089abdd6ea7037e2d8a71 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2030,7 +2030,6 @@ picochip-*)
 #      ;;
 powerpc-*-darwin*)
        extra_options="${extra_options} rs6000/darwin.opt"
-       extra_parts="crt2.o"
        case ${target} in
          *-darwin1[0-9]* | *-darwin[8-9]*)
            tmake_file="${tmake_file} rs6000/t-darwin8"
@@ -2047,7 +2046,6 @@ powerpc-*-darwin*)
        ;;
 powerpc64-*-darwin*)
        extra_options="${extra_options} ${cpu_type}/darwin.opt"
-       extra_parts="crt2.o"
        tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-dummy"
        tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
        extra_headers=altivec.h

diff --git a/gcc/config/rs6000/t-darwin b/gcc/config/rs6000/t-darwin
index 11cdcb3dc7cb873dd3042de6fd4e86c837cece1d..8113b9ecbcb4f0aab63bc1a3d9dc9f8a35ebb979 100644 (file)
--- a/gcc/config/rs6000/t-darwin
+++ b/gcc/config/rs6000/t-darwin
@@ -27,8 +27,6 @@ LIB2FUNCS_STATIC_EXTRA = \
        $(srcdir)/config/rs6000/darwin-fpsave.asm  \
        $(srcdir)/config/rs6000/darwin-vecsave.asm
 
-DARWIN_EXTRA_CRT_BUILD_CFLAGS = -mlongcall -mmacosx-version-min=10.4
-
 # The .asm files above are designed to run on all processors,
 # even though they use AltiVec instructions.  -Wa is used because
 # -force_cpusubtype_ALL doesn't work with -dynamiclib.
@@ -46,10 +44,3 @@ LIB2ADDEH += $(srcdir)/config/rs6000/darwin-fallback.c
 
 darwin-fpsave.o:       $(srcdir)/config/rs6000/darwin-asm.h
 darwin-tramp.o:                $(srcdir)/config/rs6000/darwin-asm.h
-
-# Explain how to build crt2.o
-$(T)crt2$(objext): $(srcdir)/config/darwin-crt2.c $(GCC_PASSES) \
-       $(TCONFIG_H) stmp-int-hdrs tsystem.h
-       $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) \
-         $(DARWIN_EXTRA_CRT_BUILD_CFLAGS) \
-         -c $(srcdir)/config/darwin-crt2.c -o $(T)crt2$(objext)

diff --git a/gcc/config/t-darwin b/gcc/config/t-darwin
index 2703e85f35aaea13fc8412bd334a2d8743d0a22f..9e77395998d8f80d7fd42e6e1cfac69057d7222d 100644 (file)
--- a/gcc/config/t-darwin
+++ b/gcc/config/t-darwin
@@ -42,15 +42,6 @@ darwin-driver.o: $(srcdir)/config/darwin-driver.c \
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
          $(srcdir)/config/darwin-driver.c
 
-# 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
-       $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) \
-         -fno-tree-dominator-opts $(DARWIN_EXTRA_CRT_BUILD_CFLAGS) \
-         -c $(srcdir)/config/darwin-crt3.c -o $(T)crt3$(objext)
-
 # Use unwind-dw2-fde-darwin
 LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-darwin.c \
   $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c

diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index e679b38c9000f88cf0d72221f755c016941c3e99..ff45aa8d8574f509c3d4d0d7cdf94d4dff88a463 100644 (file)
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * EXCLUDES (config/darwin-crt2.c): Remove.
+
 2011-07-11  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * EXCLUDES (libgcov.c): Remove.

diff --git a/gcc/po/EXCLUDES b/gcc/po/EXCLUDES
index a43aea5a4450ea07a8ed9fe2fe5d0db3e908afad..cc29a2bd1ac7d0de397a7d6447d6885445ab5f7a 100644 (file)
--- a/gcc/po/EXCLUDES
+++ b/gcc/po/EXCLUDES
@@ -22,7 +22,6 @@
 # .def are examined to begin with.
 
 #   These files are part of libgcc, or target headers provided by gcc.
-config/darwin-crt2.c
 config/fp-bit.c
 config/fp-bit.h
 config/vxlib.c

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index c358ae4126a439b72e17f24986f86dd4b0894607..bfbf1053157653d4be2b309db3f56ee35f6e6e5b 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,14 @@
+2011-07-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * config/darwin-crt3.o: New file.
+       * config/rs6000/darwin-crt2.c: New file.
+       * config/t-darwin: New file.
+       * config/rs6000/t-darwin (DARWIN_EXTRA_CRT_BUILD_CFLAGS): New variable.
+       (crt2.o): New rule.
+       * config.host (*-*-darwin*): Add crt3.o to extra_parts.
+       (powerpc-*-darwin*): Add crt2.o to extra_parts.
+       (powerpc64-*-darwin*): Likewise.
+
 2011-07-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * config/i386/netware-crt0.c: New file.

diff --git a/libgcc/config.host b/libgcc/config.host
index 6b6caffde95043a433777238b98214258ddb681c..56ce998a62b7db61f080281c840b3de616548c4e 100644 (file)
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -153,6 +153,7 @@ case ${host} in
 *-*-darwin*)
   asm_hidden_op=.private_extern
   tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
+  extra_parts=crt3.o
   ;;
 *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
   # This is the place-holder for the generic a.out configuration
@@ -528,8 +529,10 @@ powerpc-*-darwin*)
          md_unwind_header=rs6000/darwin-unwind.h
          ;;
        esac
+       extra_parts="$extra_parts crt2.o"
        ;;
 powerpc64-*-darwin*)
+       extra_parts="$extra_parts crt2.o"
        ;;
 powerpc-*-freebsd*)
        tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-freebsd t-softfp"

diff --git a/gcc/config/darwin-crt3.c b/libgcc/config/darwin-crt3.c
similarity index 100%
rename from gcc/config/darwin-crt3.c
rename to libgcc/config/darwin-crt3.c

diff --git a/gcc/config/darwin-crt2.c b/libgcc/config/rs6000/darwin-crt2.c
similarity index 100%
rename from gcc/config/darwin-crt2.c
rename to libgcc/config/rs6000/darwin-crt2.c

diff --git a/libgcc/config/rs6000/t-darwin b/libgcc/config/rs6000/t-darwin
index 0afe837b458d241f547de562e7a8181c3e39f616..4541e4ed3ed4c6bcd1567851c66e61036c7b5eb1 100644 (file)
--- a/libgcc/config/rs6000/t-darwin
+++ b/libgcc/config/rs6000/t-darwin
@@ -1 +1,6 @@
+DARWIN_EXTRA_CRT_BUILD_CFLAGS = -mlongcall -mmacosx-version-min=10.4
+
+crt2.o: $(srcdir)/config/rs6000/darwin-crt2.c
+       $(crt_compile) $(DARWIN_EXTRA_CRT_BUILD_CFLAGS) -c $<
+
 SHLIB_VERPFX = $(gcc_srcdir)/config/rs6000/darwin-libgcc

diff --git a/libgcc/config/t-darwin b/libgcc/config/t-darwin
new file mode 100644 (file)
index 0000000..548f0e3
--- /dev/null
+++ b/libgcc/config/t-darwin
@@ -0,0 +1,4 @@
+# Pass -fno-tree-dominator-opts to work around bug 26840.
+crt3.o: $(srcdir)/config/darwin-crt3.c
+       $(crt_compile) \
+         -fno-tree-dominator-opts $(DARWIN_EXTRA_CRT_BUILD_CFLAGS) -c $<