Index: sysdeps/mips/mips64/n32/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mips/mips64/n32/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sysdeps/mips/mips64/n32/Makefile	29 Mar 2003 08:15:28 -0000	1.2
+++ sysdeps/mips/mips64/n32/Makefile	14 May 2004 05:32:32 -0000
@@ -2,5 +2,9 @@
 long-double-fcts = yes
 
 ifeq ($(filter -mabi=n32,$(CC)),)
-CC += -mabi=n32
+CC += -mabi=n32
 endif
+ifeq ($(filter "-Wl,-m,elf32btsmipn32",$(LD)),)
+LD += -Wl,-m,elf32btsmipn32
+endif
+ABI_FLAG= -Wl,-m,elf32btsmipn32
Index: sysdeps/mips/mips64/n64/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mips/mips64/n64/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sysdeps/mips/mips64/n64/Makefile	29 Mar 2003 08:15:28 -0000	1.2
+++ sysdeps/mips/mips64/n64/Makefile	14 May 2004 05:32:32 -0000
@@ -4,3 +4,10 @@
 ifeq ($(filter -mabi=64,$(CC)),)
 CC += -mabi=64
 endif
+ifeq ($(filter "-Wl,-m,elf64btsmip",$(LDFLAGS)),)
+LDFLAGS += -Wl,-m,elf64btsmip
+endif
+ifeq ($(filter "-Wl,-m,elf64btsmip",$(ASFLAGS-.os)),)
+ASFLAGS-.os += -Wl,-m,elf64btsmip
+endif
+ABI_FLAG= -Wl,-m,elf64btsmip
Index: csu/Makefile
===================================================================
RCS file: /cvs/glibc/libc/csu/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- csu/Makefile	8 Mar 2004 21:28:15 -0000	1.73
+++ csu/Makefile	14 May 2004 05:32:18 -0000
@@ -146,7 +147,7 @@
 subdir_lib: $(extra-objs:%=$(objpfx)%)
 
 define link-relocatable
-$(CC) -nostdlib -nostartfiles -r -o $@ $^
+$(CC) $(ABI_FLAG) -nostdlib -nostartfiles -r -o $@ $^
 endef
 
 ifndef start-installed-name-rule