hurd: Silence warning

	* hurd/hurdsig.c (interrupted_reply_port_location): Use
	DIAG_IGNORE_NEEDS_COMMENT to silence warning with GCC 6 and before.

diff --git a/ChangeLog b/ChangeLog
index cc9613239de651b40aaa848c6ceca4d2e4c81fe7..cbe62ee88d2c747e7bc2eb3f64f7a7c313bbf1e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,8 @@
 
        * sysdeps/mach/hurd/if_index.c (__if_nametoindex): Return ENODEV if
        ifname is too long.
+       * hurd/hurdsig.c (interrupted_reply_port_location): Use
+       DIAG_IGNORE_NEEDS_COMMENT to silence warning with GCC 6 and before.
 
 2018-04-03  Wilco Dijkstra  <wdijkstr@arm.com>
 

diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 31e8d336e34306db4b75bcd2cef69d3b48ee959c..6b73dcdbf38be8f30f715f5a459558ac70f93edc 100644 (file)
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -33,6 +33,8 @@
 #include "hurdmalloc.h"                /* XXX */
 #include "../locale/localeinfo.h"
 
+#include <libc-diag.h>
+
 const char *_hurdsig_getenv (const char *);
 
 struct mutex _hurd_siglock;
@@ -246,8 +248,14 @@ interrupted_reply_port_location (thread_t thread,
     /* Faulted trying to read the TCB.  */
     return NULL;
 
+  DIAG_PUSH_NEEDS_COMMENT;
+  /* GCC 6 and before seem to be confused by the setjmp call inside
+     _hurdsig_catch_memory_fault and think that we may be returning a second
+     time to here with portloc uninitialized (but we never do). */
+  DIAG_IGNORE_NEEDS_COMMENT (6, "-Wmaybe-uninitialized");
   /* Fault now if this pointer is bogus.  */
   *(volatile mach_port_t *) portloc = *portloc;
+  DIAG_POP_NEEDS_COMMENT;
 
   if (sigthread)
     _hurdsig_end_catch_fault ();