diff --git a/ChangeLog b/ChangeLog
index fdae8a566e..a99abbccb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/mips/mips64/Makefile
+	[$(subdir) == signal] (CFLAGS-sigaction.c): New variable.
+	[$(subdir) == nptl] (CFLAGS-sigaction.c): Likewise.
+
 2014-12-10  Joseph Myers  <joseph@codesourcery.com>
 	    Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/Makefile b/sysdeps/unix/sysv/linux/mips/mips64/Makefile
index 0a37c5b9b4..b4fb190bba 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/Makefile
+++ b/sysdeps/unix/sysv/linux/mips/mips64/Makefile
@@ -7,3 +7,15 @@ ifeq ($(subdir),nptl)
 CFLAGS-recv.c += -fexceptions
 CFLAGS-send.c += -fexceptions
 endif
+
+ifeq ($(subdir),signal)
+# sigaction.c defines static functions in asms and refers to them from
+# C code, resulting in "'restore_rt' used but never defined" (which
+# has no corresponding warning option to allow it to be disabled with
+# diagnostic pragmas).
+CFLAGS-sigaction.c += -Wno-error
+endif
+
+ifeq ($(subdir),nptl)
+CFLAGS-sigaction.c += -Wno-error
+endif