diff --git a/ChangeLog.mips b/ChangeLog.mips
index 4bb1a4db5e..36cae0dd87 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,8 @@
+2012-01-04  Tom de Vries  <tom@codesourcery.com>
+
+	* sysdeps/mips/Makefile: Compile initfini.c, pt-initfini.c with
+	-fno-unwind-tables.
+
 2012-01-03  Tom de Vries  <tom@codesourcery.com>
 
 	* sysdeps/mips/backtrace.c: New file, including ia64 backtrace.c.
diff --git a/sysdeps/mips/Makefile b/sysdeps/mips/Makefile
index b7e5e6192b..7937d25dcf 100644
--- a/sysdeps/mips/Makefile
+++ b/sysdeps/mips/Makefile
@@ -15,4 +15,12 @@ ifeq ($(subdir),debug)
 CFLAGS-backtrace.c += -funwind-tables
 endif
 
+ifeq ($(subdir),csu)
+CFLAGS-initfini.s += -fno-unwind-tables
+endif
+
+ifeq ($(subdir),nptl)
+CFLAGS-pt-initfini.s += -fno-unwind-tables
+endif
+
 ASFLAGS-.os += $(pic-ccflag)