[glibc/azanella/clang] libio: Handle -Wno-restrict with libc-diag.h

[Adhemerval Zanella <azanella@sourceware.org>]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b9751c7856124e58e4135b41b9c297948c242a4e

commit b9751c7856124e58e4135b41b9c297948c242a4e
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Thu Mar 24 16:14:56 2022 -0300

    libio: Handle -Wno-restrict with libc-diag.h

Diff:
---
 libio/Makefile         |  4 ----
 libio/tst-sprintf-ub.c | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libio/Makefile b/libio/Makefile
index 3d26a0ed25..e614d6f934 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -165,10 +165,6 @@ CFLAGS-iofputs_u.c += $(config-cflags-wno-ignored-attributes)
 
 CFLAGS-tst_putwc.c += -DOBJPFX=\"$(objpfx)\"
 
-# These test cases intentionally use overlapping arguments
-CFLAGS-tst-sprintf-ub.c += -Wno-restrict
-CFLAGS-tst-sprintf-chk-ub.c += -Wno-restrict
-
 LDFLAGS-tst-bz24228 = -Wl,--version-script=tst-bz24228.map
 
 tst_wprintf2-ARGS = "Some Text"
diff --git a/libio/tst-sprintf-ub.c b/libio/tst-sprintf-ub.c
index 55f341eadb..e6baa4fe6c 100644
--- a/libio/tst-sprintf-ub.c
+++ b/libio/tst-sprintf-ub.c
@@ -16,8 +16,14 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#include <libc-diag.h>
 #include <stdarg.h>
+/* This is required to disable the overlap warnings for the fortify
+   test.  */
+DIAG_PUSH_NEEDS_COMMENT;
+DIAG_IGNORE_NEEDS_COMMENT_GCC (5, "-Wrestrict");
 #include <stdio.h>
+DIAG_POP_NEEDS_COMMENT;
 #include <string.h>
 
 #include <support/check.h>
@@ -54,7 +60,11 @@ do_one_test (int function, char *buf, ...)
       /* The regular sprintf and vsprintf functions do not override the
          destination buffer, even if source and destination overlap.  */
       case FUNCTION_SPRINTF:
+	/* This intentionally use overlapping arguments.  */
+	DIAG_PUSH_NEEDS_COMMENT;
+	DIAG_IGNORE_NEEDS_COMMENT_GCC (5, "-Wrestrict");
         sprintf (buf, "%sCD", buf);
+	DIAG_POP_NEEDS_COMMENT;
         TEST_COMPARE_STRING (buf, expected);
         break;
       case FUNCTION_VSPRINTF:
@@ -66,7 +76,11 @@ do_one_test (int function, char *buf, ...)
       /* On the other hand, snprint and vsnprint override overlapping
          source and destination buffers.  */
       case FUNCTION_SNPRINF:
+	/* This intentionally use overlapping arguments.  */
+	DIAG_PUSH_NEEDS_COMMENT;
+	DIAG_IGNORE_NEEDS_COMMENT_GCC (5, "-Wrestrict");
         snprintf (buf, 3, "%sCD", buf);
+	DIAG_POP_NEEDS_COMMENT;
         TEST_COMPARE_STRING (buf, "CD");
         break;
       case FUNCTION_VSNPRINTF: