diff --git a/ChangeLog b/ChangeLog
index 7c725856d8..95f983ff49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-11-11  Joseph Myers  <joseph@codesourcery.com>
 
+	* stdlib/bug-getcontext.c: Include <libc-internal.h>.
+	(do_test): Disable -Wmaybe-uninitialized around uses of
+	except_mask.
+
 	* sysdeps/unix/sysv/linux/sh/sys/user.h: Include <stddef.h>.
 
 2016-11-10  Chris Metcalf  <cmetcalf@mellanox.com>
diff --git a/stdlib/bug-getcontext.c b/stdlib/bug-getcontext.c
index 133ee91eff..c4072129a6 100644
--- a/stdlib/bug-getcontext.c
+++ b/stdlib/bug-getcontext.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ucontext.h>
+#include <libc-internal.h>
 
 static int
 do_test (void)
@@ -49,6 +50,13 @@ do_test (void)
   printf ("\nDone with getcontext()!\n");
   fflush (NULL);
 
+  /* On nios2 and tilepro, GCC 5 warns that except_mask may be used
+     uninitialized.  Because it is always initialized and nothing in
+     this test ever calls setcontext (a setcontext call could result
+     in local variables being clobbered on the second return from
+     getcontext), in fact an uninitialized use is not possible.  */
+  DIAG_PUSH_NEEDS_COMMENT;
+  DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
   int mask = fegetexcept ();
   if (mask != except_mask)
     {
@@ -59,6 +67,7 @@ do_test (void)
 
   printf("\nAt end fegetexcept() returned %d, expected: %d.\n",
 	 mask, except_mask);
+  DIAG_POP_NEEDS_COMMENT;
 
   return 0;
 }