This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.26.9000-755-gec72135


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  ec72135e5f1d061cb5cf7cd1b855fd6290be10d9 (commit)
      from  a259f5d388d6195da958b2d147d17c2e2d16b857 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ec72135e5f1d061cb5cf7cd1b855fd6290be10d9

commit ec72135e5f1d061cb5cf7cd1b855fd6290be10d9
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Tue Nov 14 17:50:36 2017 +0000

    Fix string/bug-strncat1.c build with GCC 8.
    
    GCC 8 warns about strncat calls with truncated output.
    string/bug-strncat1.c tests such a call; this patch disables the
    warning for it.
    
    Tested (compilation) with GCC 8 for x86_64-linux-gnu with
    build-many-glibcs.py (in conjunction with Martin's patch to allow
    glibc to build).
    
    	* string/bug-strncat1.c: Include <libc-diag.h>.
    	(main): Disable -Wstringop-truncation for strncat call for GCC 8.

diff --git a/ChangeLog b/ChangeLog
index bc5ff14..579185d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-14  Joseph Myers  <joseph@codesourcery.com>
+
+	* string/bug-strncat1.c: Include <libc-diag.h>.
+	(main): Disable -Wstringop-truncation for strncat call for GCC 8.
+
 2017-11-13  Claude Paroz <claude@2xlibre.net>
 
 	[BZ #22387]
diff --git a/string/bug-strncat1.c b/string/bug-strncat1.c
index f1b5c37..b22beba 100644
--- a/string/bug-strncat1.c
+++ b/string/bug-strncat1.c
@@ -4,13 +4,21 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <libc-diag.h>
 
 char d[3] = "\0\1\2";
 
 int
 main (void)
 {
+  DIAG_PUSH_NEEDS_COMMENT;
+#if __GNUC_PREREQ (8, 0)
+  /* GCC 8 warns about strncat truncating output; this is deliberately
+     tested here.  */
+  DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-truncation");
+#endif
   strncat (d, "\5\6", 1);
+  DIAG_POP_NEEDS_COMMENT;
   if (d[0] != '\5')
     {
       puts ("d[0] != '\\5'");

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |    5 +++++
 string/bug-strncat1.c |    8 ++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]