Fix mips* in mainline

[Richard Sandiford]

Eric Christopher <echristo@redhat.com> writes:

> --- t-elf	2001/05/17 03:16:05	1.5
> +++ t-elf	2001/08/28 23:00:47
> @@ -1,9 +1,17 @@
>  CONFIG2_H	= $(srcdir)/config/mips/ecoff.h
>  
> -EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o
>  # Don't let CTOR_LIST end up in sdata section.
>  CRTSTUFF_T_CFLAGS = -G 0
>[snip]
> @@ -48,6 +56,7 @@ fp-bit.c: $(srcdir)/config/fp-bit.c
>  MULTILIB_OPTIONS = msoft-float/msingle-float EL/EB mips1/mips3
>  MULTILIB_DIRNAMES = soft-float single el eb mips1 mips3
>  MULTILIB_MATCHES = msingle-float=m4650
> +EXTRA_PARTS = crtbegin.o crtend.o crti.o crtn.o
>  
>  LIBGCC = stmp-multilib
>  INSTALL_LIBGCC = install-multilib

Moving from EXTRA_MULTLIB_PARTS to EXTRA_PARTS means that all the
multlibs now try to use the mips1/EB crt files.  Is it OK to install the
following?  Tested on mips-elf{-EL,-EB}{-mips1,-mips3} (with other stuff
I'm about to send).

Richard

	* config/mips/t-elf (EXTRA_PARTS): Use EXTRA_MULTILIB_PARTS instead.
	(crti.o): Prefix name of object file with $(T).
	(crtn.o): Likewise.

Index: t-elf
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/t-elf,v
retrieving revision 1.6
diff -u -p -d -r1.6 t-elf
--- t-elf	2001/08/28 23:03:52	1.6
+++ t-elf	2001/09/04 13:39:18
@@ -6,11 +6,11 @@ CRTSTUFF_T_CFLAGS = -G 0
 # Assemble startup files.
 $(T)crti.o: $(srcdir)/config/mips/crti.asm $(GCC_PASSES)
 	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-	-c -o crti.o -x assembler-with-cpp $(srcdir)/config/mips/crti.asm
+	-c -o $(T)crti.o -x assembler-with-cpp $(srcdir)/config/mips/crti.asm
 
 $(T)crtn.o: $(srcdir)/config/mips/crtn.asm $(GCC_PASSES)
 	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-	-c -o crtn.o -x assembler-with-cpp $(srcdir)/config/mips/crtn.asm
+	-c -o $(T)crtn.o -x assembler-with-cpp $(srcdir)/config/mips/crtn.asm
 
 LIB1ASMSRC = mips/mips16.S
 LIB1ASMFUNCS = _m16addsf3 _m16subsf3 _m16mulsf3 _m16divsf3 \
@@ -56,7 +56,7 @@ fp-bit.c: $(srcdir)/config/fp-bit.c
 MULTILIB_OPTIONS = msoft-float/msingle-float EL/EB mips1/mips3
 MULTILIB_DIRNAMES = soft-float single el eb mips1 mips3
 MULTILIB_MATCHES = msingle-float=m4650
-EXTRA_PARTS = crtbegin.o crtend.o crti.o crtn.o
+EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o
 
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib