about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--nss/makedb.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/nss/makedb.c b/nss/makedb.c
index 9389f6b548..8690e11e82 100644
--- a/nss/makedb.c
+++ b/nss/makedb.c
@@ -792,7 +792,13 @@ write_output (int fd)
 			  + nhashentries_total * sizeof (stridx_t)));
   header->allocate = file_offset;
 
-  /* Help GCC 10 see iov_nelts doesn't overflow the writev argument.  */
+#if __GNUC_PREREQ (10, 0) && !__GNUC_PREREQ (11, 0)
+  DIAG_PUSH_NEEDS_COMMENT;
+  /* Avoid GCC 10 false positive warning: specified size exceeds maximum
+     object size.  */
+  DIAG_IGNORE_NEEDS_COMMENT (10, "-Wstringop-overflow");
+#endif
+
   assert (iov_nelts <= INT_MAX);
   if (writev (fd, iov, iov_nelts) != keydataoffset)
     {
@@ -800,6 +806,10 @@ write_output (int fd)
       return EXIT_FAILURE;
     }
 
+#if __GNUC_PREREQ (10, 0) && !__GNUC_PREREQ (11, 0)
+  DIAG_POP_NEEDS_COMMENT;
+#endif
+
   return EXIT_SUCCESS;
 }