[PATCH] Combine multiple MULTILIB_MATCHES entries into single entry

Fred Fish fnf@specifix.com
Sat Jun 3 02:00:00 GMT 2006


When testing a mips-elf (and mips64-elf) toolchain I switched from
using a -EB option to a -meb option, and discovered that gcc was
finding the wrong multilib components.

I tracked the problem down to multiple MULTILIB_MATCHES entries in
gcc/config/mips/t-elf.  Apparently only the last one was effective.
None of the other t-* files have multiple MULTILIB_MATCHES entries.

-Fred

2006-06-02  Fred Fish  <fnf@specifix.com>

	* config/mips/t-elf (MULTILIB_MATCHES): Combine two entries
	into single entry.

Index: gcc/gcc/config/mips/t-elf
===================================================================
RCS file: /cvsroots/latest/src/gcc/gcc/config/mips/t-elf,v
retrieving revision 1.1.1.1
diff -c -p -r1.1.1.1 t-elf
*** gcc/gcc/config/mips/t-elf	8 Oct 2005 18:57:43 -0000	1.1.1.1
--- gcc/gcc/config/mips/t-elf	3 Jun 2006 01:44:34 -0000
*************** TARGET_LIBGCC2_CFLAGS = -G 0
*** 33,40 ****
  
  MULTILIB_OPTIONS = msoft-float EL/EB
  MULTILIB_DIRNAMES = soft-float el eb
! MULTILIB_MATCHES = EL=mel EB=meb
! MULTILIB_MATCHES = msingle-float=m4650
  EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o
  
  LIBGCC = stmp-multilib
--- 33,39 ----
  
  MULTILIB_OPTIONS = msoft-float EL/EB
  MULTILIB_DIRNAMES = soft-float el eb
! MULTILIB_MATCHES = EL=mel EB=meb msingle-float=m4650
  EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o
  
  LIBGCC = stmp-multilib






More information about the Gcc-patches mailing list