* config.gcc (bfin*-linux-uclibc*): Set extra_parts

	to "crtbegin.o crtbeginS.o crtend.o crtendS.o".
	* config/bfin/t-bfin-linux (crti.o): Don't build.
	(crtn.o): Likewise.
	(EXTRA_MULTILIB_PARTS): Remove crti.o and crtn.o.
	* config/bfin/t-bfin-uclinux (crti.o): Don't build.
	(crtn.o): Likewise.
	(EXTRA_MULTILIB_PARTS): Remove crti.o and crtn.o.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128860 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e3e7fc6..b2a78e3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2007-09-28  Jie Zhang  <jie.zhang@analog.com>
+
+       * config.gcc (bfin*-linux-uclibc*): Set extra_parts
+       to "crtbegin.o crtbeginS.o crtend.o crtendS.o".
+       * config/bfin/t-bfin-linux (crti.o): Don't build.
+       (crtn.o): Likewise.
+       (EXTRA_MULTILIB_PARTS): Remove crti.o and crtn.o.
+       * config/bfin/t-bfin-uclinux (crti.o): Don't build.
+       (crtn.o): Likewise.
+       (EXTRA_MULTILIB_PARTS): Remove crti.o and crtn.o.
+
 2007-09-27  Ollie Wild  <aaw@google.com>
 
        * varasm.c (compare_constant): Removed call to

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 72e206c..a5b8f60 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -813,30 +813,31 @@ avr-*-*)
        ;;
 bfin*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
-        tmake_file=bfin/t-bfin-elf
-        use_collect2=no
-        ;;
+       tmake_file=bfin/t-bfin-elf
+       use_collect2=no
+       ;;
 bfin*-uclinux*)
        tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h bfin/uclinux.h"
-        tmake_file=bfin/t-bfin-uclinux
-       tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
+       tmake_file=bfin/t-bfin-uclinux
+       tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
        extra_options="${extra_options} linux.opt"
-        use_collect2=no
-        ;;
+       use_collect2=no
+       ;;
 bfin*-linux-uclibc*)
        tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h bfin/linux.h ./linux-sysroot-suffix.h"
-        tmake_file="t-slibgcc-elf-ver bfin/t-bfin-linux"
-        use_collect2=no
-        ;;
+       tmake_file="t-slibgcc-elf-ver bfin/t-bfin-linux"
+       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       use_collect2=no
+       ;;
 bfin*-rtems*)
        tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h bfin/rtems.h rtems.h"
        tmake_file="bfin/t-bfin t-rtems bfin/t-rtems"
-        ;;
+       ;;
 bfin*-*)
        tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
-        tmake_file=bfin/t-bfin
-        use_collect2=no
-        ;;
+       tmake_file=bfin/t-bfin
+       use_collect2=no
+       ;;
 c4x-*-rtems* | tic4x-*-rtems*)
        tmake_file="c4x/t-c4x t-rtems c4x/t-rtems"
        tm_file="c4x/c4x.h c4x/rtems.h rtems.h"

diff --git a/gcc/config/bfin/t-bfin-linux b/gcc/config/bfin/t-bfin-linux
index a632e90..f79ccac 100644 (file)
--- a/gcc/config/bfin/t-bfin-linux
+++ b/gcc/config/bfin/t-bfin-linux
@@ -23,18 +23,9 @@ MULTILIB_MATCHES=mcpu?bf532-none=mcpu?bf561
 MULTILIB_MATCHES+=mcpu?bf532-none=mcpu?bf531-none mcpu?bf532-none=mcpu?bf533-none mcpu?bf532-none=mcpu?bf534-none mcpu?bf532-none=mcpu?bf536-none mcpu?bf532-none=mcpu?bf537-none mcpu?bf532-none=mcpu?bf561-none mcpu?bf532-none=mcpu?bf561-0.5
 MULTILIB_MATCHES+=mcpu?bf532-0.3=mcpu?bf531-0.4 mcpu?bf532-0.3=mcpu?bf531-0.3 mcpu?bf532-0.3=mcpu?bf532-0.4 mcpu?bf532-0.3=mcpu?bf533-0.4 mcpu?bf532-0.3=mcpu?bf533-0.3 mcpu?bf532-0.3=mcpu?bf534-0.2 mcpu?bf532-0.3=mcpu?bf534-0.1 mcpu?bf532-0.3=mcpu?bf536-0.2 mcpu?bf532-0.3=mcpu?bf536-0.1 mcpu?bf532-0.3=mcpu?bf537-0.2 mcpu?bf532-0.3=mcpu?bf537-0.1 mcpu?bf532-0.3=mcpu?bf561-0.3 mcpu?bf532-0.3=mcpu?bf561-0.2 mcpu?bf532-0.3=mcpu?bf531-any mcpu?bf532-0.3=mcpu?bf532-any mcpu?bf532-0.3=mcpu?bf533-any mcpu?bf532-0.3=mcpu?bf534-any mcpu?bf532-0.3=mcpu?bf536-any mcpu?bf532-0.3=mcpu?bf537-any mcpu?bf532-0.3=mcpu?bf561-any
 
-# Assemble startup files.
-$(T)crti.o: $(srcdir)/config/bfin/crti.s $(GCC_PASSES)
-       $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-       -c -o $(T)crti.o -x assembler-with-cpp $(srcdir)/config/bfin/crti.s
-
-$(T)crtn.o: $(srcdir)/config/bfin/crtn.s $(GCC_PASSES)
-       $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-       -c -o $(T)crtn.o -x assembler-with-cpp $(srcdir)/config/bfin/crtn.s
-
 SHLIB_MAPFILES=$(srcdir)/config/bfin/libgcc-bfin.ver
 
-EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crtbeginS.o crtendS.o crti.o crtn.o
+EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crtbeginS.o crtendS.o
 
 # This rule uses MULTILIB_MATCHES to generate a definition of
 # SYSROOT_SUFFIX_SPEC.

diff --git a/gcc/config/bfin/t-bfin-uclinux b/gcc/config/bfin/t-bfin-uclinux
index a323824..4668653 100644 (file)
--- a/gcc/config/bfin/t-bfin-uclinux
+++ b/gcc/config/bfin/t-bfin-uclinux
@@ -29,17 +29,9 @@ MULTILIB_EXCEPTIONS+=mcpu=bf532-none/mleaf-id-shared-library*
 MULTILIB_EXCEPTIONS+=*msep-data/mleaf-id-shared-library*
 
 # Assemble startup files.
-$(T)crti.o: $(srcdir)/config/bfin/crti.s $(GCC_PASSES)
-       $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-       -c -o $(T)crti.o -x assembler-with-cpp $(srcdir)/config/bfin/crti.s
-
-$(T)crtn.o: $(srcdir)/config/bfin/crtn.s $(GCC_PASSES)
-       $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-       -c -o $(T)crtn.o -x assembler-with-cpp $(srcdir)/config/bfin/crtn.s
-
 $(T)crtlibid.o: $(srcdir)/config/bfin/crtlibid.s $(GCC_PASSES)
        $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
        -c -o $(T)crtlibid.o -x assembler-with-cpp \
        $(srcdir)/config/bfin/crtlibid.s
 
-EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crtbeginS.o crtendS.o crti.o crtn.o crtlibid.o
+EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crtbeginS.o crtendS.o crtlibid.o