[Valgrind-developers] [valgrind] regtest: warning cleanup

[Paul F. <pa...@so...>]

https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=ab6d3928a5bf6163470e4ea649b68178f8875b94

commit ab6d3928a5bf6163470e4ea649b68178f8875b94
Author: Paul Floyd <pj...@wa...>
Date:   Mon Apr 10 10:28:58 2023 +0200

    regtest: warning cleanup
    
    All for clang and mostly Apple clang
    There are still numerous deprecated warnings on macOS 10.13
    (sem* functions, syscall, sbrk, i386, PIEi, OSSpinLocki, swapcontext, getcontext)

Diff:
---
 configure.ac                       | 4 ++++
 massif/tests/Makefile.am           | 2 +-
 memcheck/tests/Makefile.am         | 8 +++++---
 memcheck/tests/memalign_args.c     | 4 ++--
 memcheck/tests/realloc_size_zero.c | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index ea6d3991a8..a8d9b95138 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2572,6 +2572,10 @@ AC_GCC_WARNING_SUBST_NO([stringop-truncation], [FLAG_W_NO_STRINGOP_TRUNCATION])
 AC_GCC_WARNING_SUBST_NO([format-overflow], [FLAG_W_NO_FORMAT_OVERFLOW])
 AC_GCC_WARNING_SUBST_NO([use-after-free], [FLAG_W_NO_USE_AFTER_FREE])
 AC_GCC_WARNING_SUBST_NO([free-nonheap-object], [FLAG_W_NO_FREE_NONHEAP_OBJECT])
+AC_GCC_WARNING_SUBST_NO([fortify-source], [FLAG_W_NO_FORTIFY_SOURCE])
+AC_GCC_WARNING_SUBST_NO([builtin-memcpy-chk-size], [FLAG_W_NO_BUILTIN_MEMCPY_CHK_SIZE])
+AC_GCC_WARNING_SUBST_NO([incompatible-pointer-types-discards-qualifiers], [FLAG_W_NO_INCOMPATIBLE_POINTER_TYPES_DISCARDS_QUALIFIERS])
+AC_GCC_WARNING_SUBST_NO([suspicious-bzero], [FLAG_W_NO_SUSPICIOUS_BZERO])
 
 AC_GCC_WARNING_SUBST_NO_VAL([alloc-size-larger-than], [1677216], [FLAG_W_NO_ALLOC_SIZE_LARGER_THAN])
 
diff --git a/massif/tests/Makefile.am b/massif/tests/Makefile.am
index 5b3d1938f4..84c9b1273a 100644
--- a/massif/tests/Makefile.am
+++ b/massif/tests/Makefile.am
@@ -104,4 +104,4 @@ insig_CFLAGS		= $(AM_CFLAGS) -Wno-unused-result
 long_names_CFLAGS	= $(AM_CFLAGS) -Wno-unused-result
 one_CFLAGS		= $(AM_CFLAGS) -Wno-unused-result
 thresholds_CFLAGS	= $(AM_CFLAGS) -Wno-unused-result
-realloc_CFLAGS		= $(AM_CFLAGS) -Wno-free-nonheap-object
+realloc_CFLAGS		= $(AM_CFLAGS) @FLAG_W_NO_FREE_NONHEAP_OBJECT@
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 7bfedb3058..b4d80f837a 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -645,12 +645,13 @@ origin6_fp_CFLAGS	= $(AM_CFLAGS) -O
 # Don't allow GCC to inline memcpy() and strcpy(),
 # because then we can't intercept it
 overlap_CFLAGS		= $(AM_CFLAGS) -fno-builtin-memcpy -fno-builtin-strcpy \
-			  -Wno-fortify-source @FLAG_W_NO_STRINGOP_OVERFLOW@
+			  @FLAG_W_NO_FORTIFY_SOURCE@ @FLAG_W_NO_STRINGOP_OVERFLOW@ @FLAG_W_NO_BUILTIN_MEMCPY_CHK_SIZE@
 
 partial_load_CFLAGS	= $(AM_CFLAGS) @FLAG_W_NO_USE_AFTER_FREE@
 reach_thread_register_CFLAGS	= $(AM_CFLAGS) -O2
 reach_thread_register_LDADD	= -lpthread
 
+realloc_size_zero_CFLAGS	= $(AM_CFLAGS) @FLAG_W_NO_INCOMPATIBLE_POINTER_TYPES_DISCARDS_QUALIFIERS@
 realloc_size_zero_mismatch_SOURCES = realloc_size_zero_mismatch.cpp
 
 resvn_stack_CFLAGS      = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
@@ -668,8 +669,9 @@ endif
 
 str_tester_CFLAGS	= $(AM_CFLAGS) -Wno-shadow @FLAG_W_NO_STRINGOP_OVERFLOW@ \
 			  @FLAG_W_NO_STRINGOP_TRUNCATION@ \
-			  -Wno-fortify-source -Wno-suspicious-bzero \
-			  @FLAG_W_NO_MEMSET_TRANSPOSED_ARGS@ @FLAG_W_NO_STRINGOP_OVERREAD@
+			  @FLAG_W_NO_FORTIFY_SOURCE@ @FLAG_W_NO_SUSPICIOUS_BZERO@ \
+			  @FLAG_W_NO_MEMSET_TRANSPOSED_ARGS@ @FLAG_W_NO_STRINGOP_OVERREAD@ \
+			  @FLAG_W_NO_BUILTIN_MEMCPY_CHK_SIZE@
 
 supp_CFLAGS             = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
 
diff --git a/memcheck/tests/memalign_args.c b/memcheck/tests/memalign_args.c
index 9c774d61ee..de765bcc2b 100644
--- a/memcheck/tests/memalign_args.c
+++ b/memcheck/tests/memalign_args.c
@@ -12,7 +12,7 @@ int main(void)
    size_t align = 64U;
    char *mem;
    char *p;
-   int res;
+
    (void)VALGRIND_MAKE_MEM_UNDEFINED(&size, sizeof(size));
    (void)VALGRIND_MAKE_MEM_UNDEFINED(&align, sizeof(align));
 #if !defined(VGO_darwin)
@@ -20,7 +20,7 @@ int main(void)
    free(p);
 #endif
 
-   res = posix_memalign((void **)&mem,align,size);
+   (void)posix_memalign((void **)&mem,align,size);
    free(mem);
    
 #if !defined(VGO_darwin)
diff --git a/memcheck/tests/realloc_size_zero.c b/memcheck/tests/realloc_size_zero.c
index afe2a76680..c9d8e74777 100644
--- a/memcheck/tests/realloc_size_zero.c
+++ b/memcheck/tests/realloc_size_zero.c
@@ -4,7 +4,7 @@
 
 int main(void)
 {
-   int i;
+
    char* p = malloc(1024);
    p[0] = '\0';
    errno = 0;