Bug 511972 - valgrind-3.26.0 tests fail to build on upcomig gcc-16: unrecognized...

Initial patch from Sergei Trofimovich, thanks.

diff --git a/NEWS b/NEWS
index a52af5119b3ef2bc8fe371d303aeeba42519fb77..0cdbea54e388b75453add576d47fd7ae608e6aba 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,9 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 511329  Darwin and FreeBSD: Move setting of carry flag out of
         ML_(do_syscall_for_client_WRK)
 511713  Refactor syscall argument handling
+511972  valgrind-3.26.0 tests fail to build on upcomig gcc-16:
+        unrecognized command-line option
+        '-Wno-alloc-size-larger-than=18446744073709551615'
 
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX

diff --git a/configure.ac b/configure.ac
index 0092ad2ae037f1480e5828cd96d40b77ee782837..869487db4d01f2d7326c0c2180468878493251f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2538,7 +2538,7 @@ fi
 AC_DEFUN([AC_GCC_WARNING_SUBST_NO],[
   AC_MSG_CHECKING([if gcc accepts -W$1])
   safe_CFLAGS=$CFLAGS
-  CFLAGS="-W$1 -Werror"
+  CFLAGS="-W$1 -Wno-$1 -Werror"
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[;]])], [
   AC_SUBST([$2], [-Wno-$1])
   AC_MSG_RESULT([yes])], [
@@ -2591,7 +2591,6 @@ AC_GCC_WARNING_SUBST_NO([unused-result], [FLAG_W_NO_UNUSED_RESULT])
 AC_GCC_WARNING_SUBST_NO([infinite-recursion], [FLAG_W_NO_INFINITE_RECURSION])
 AC_GCC_WARNING_SUBST_NO([deprecated], [FLAG_W_NO_DEPRECATED])
 # OK for 32 and 64 bit
-AC_GCC_WARNING_SUBST_NO([alloc-size-larger-than=18446744073709551615], [FLAG_W_NO_ALLOC_SIZE_LARGER_THAN])
 AC_GCC_WARNING_SUBST_NO([alloc-size], [FLAG_W_NO_ALLOC_SIZE])
 AC_GCC_WARNING_SUBST_NO([deprecated-declarations], [FLAG_W_NO_DEPRECATED_DECLARATIONS])
 
@@ -2606,6 +2605,7 @@ AC_GCC_WARNING_SUBST([missing-parameter-type], [FLAG_W_MISSING_PARAMETER_TYPE])
 AC_GCC_WARNING_SUBST([logical-op], [FLAG_W_LOGICAL_OP])
 AC_GCC_WARNING_SUBST([enum-conversion], [FLAG_W_ENUM_CONVERSION])
 AC_GCC_WARNING_SUBST([implicit-fallthrough=2], [FLAG_W_IMPLICIT_FALLTHROUGH])
+AC_GCC_WARNING_SUBST([alloc-size-larger-than=18446744073709551616], [FLAG_W_ALLOC_SIZE_LARGER_THAN])
 
 # as above, C++ flags
 AC_DEFUN([AC_GXX_WARNING_SUBST_NO],[

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 5cdc2082c9b55fb392f37cc826c9e874a37716c0..1cf97fc82e2bfddd937508bf0a74cce280e8efed 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -690,19 +690,19 @@ leak_cpp_interior_SOURCES = leak_cpp_interior.cpp
 
 # Suppress various gcc warnings which are correct, but for things
 # we are actually testing for at runtime.
-accounting_CFLAGS      = $(AM_CFLAGS) @FLAG_W_NO_ALLOC_SIZE_LARGER_THAN@
+accounting_CFLAGS      = $(AM_CFLAGS) @FLAG_W_ALLOC_SIZE_LARGER_THAN@
 badfree_CFLAGS         = $(AM_CFLAGS) @FLAG_W_NO_FREE_NONHEAP_OBJECT@
 brk2_CFLAGS            = ${AM_CFLAGS} @FLAG_W_NO_DEPRECATED_DECLARATIONS@
-bug155125_CFLAGS       = $(AM_CFLAGS) @FLAG_W_NO_UNUSED_RESULT@ @FLAG_W_NO_ALLOC_SIZE_LARGER_THAN@
+bug155125_CFLAGS       = $(AM_CFLAGS) @FLAG_W_NO_UNUSED_RESULT@ @FLAG_W_ALLOC_SIZE_LARGER_THAN@
 bug472219_CFLAGS       = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
-calloc_overflow_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_ALLOC_SIZE_LARGER_THAN@
+calloc_overflow_CFLAGS = ${AM_CFLAGS} @FLAG_W_ALLOC_SIZE_LARGER_THAN@
 malloc_usable_CFLAGS   = ${AM_CFLAGS} @FLAG_W_NO_MAYBE_UNINITIALIZED@ @FLAG_W_NO_UNINITIALIZED@
 mallinfo_CFLAGS                = $(AM_CFLAGS) @FLAG_W_NO_DEPRECATED_DECLARATIONS@
 if VGCONF_OS_IS_SOLARIS
 mallinfo_LDADD = -lmalloc
 endif
 mallinfo2_CFLAGS       = $(AM_CFLAGS) @FLAG_W_NO_DEPRECATED_DECLARATIONS@
-malloc3_CFLAGS         = $(AM_CFLAGS) @FLAG_W_NO_ALLOC_SIZE_LARGER_THAN@ @FLAG_W_NO_ALLOC_SIZE@
+malloc3_CFLAGS         = $(AM_CFLAGS) @FLAG_W_ALLOC_SIZE_LARGER_THAN@ @FLAG_W_NO_ALLOC_SIZE@
 sbfragment_CFLAGS      = $(AM_CFLAGS) @FLAG_W_NO_DEPRECATED_DECLARATIONS@
 if VGCONF_OS_IS_SOLARIS
 sbfragment_LDADD = -lmalloc

diff --git a/memcheck/tests/amd64-freebsd/Makefile.am b/memcheck/tests/amd64-freebsd/Makefile.am
index 378446d4cf450f836d91dde65533fa47e8e33d9b..1eff95fce3b7b3a31931168e739e593353c052ed 100644 (file)
--- a/memcheck/tests/amd64-freebsd/Makefile.am
+++ b/memcheck/tests/amd64-freebsd/Makefile.am
@@ -24,5 +24,5 @@ AM_CCASFLAGS += @FLAG_M64@
 
 posix_fallocate_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
 posix_fadvise_CFLAGS   = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
-reallocarray_CFLAGS    = ${AM_CFLAGS} @FLAG_W_NO_ALLOC_SIZE_LARGER_THAN@
+reallocarray_CFLAGS    = ${AM_CFLAGS} @FLAG_W_ALLOC_SIZE_LARGER_THAN@
 

diff --git a/memcheck/tests/amd64-linux/Makefile.am b/memcheck/tests/amd64-linux/Makefile.am
index 3426c677d6b216346351d43ca5141d06ce4b9e13..bd12337feb84e22ac14a96de718b1841e04b6e53 100644 (file)
--- a/memcheck/tests/amd64-linux/Makefile.am
+++ b/memcheck/tests/amd64-linux/Makefile.am
@@ -32,7 +32,7 @@ AM_CCASFLAGS += @FLAG_M64@
 
 defcfaexpr_SOURCES     = defcfaexpr.S
 defcfaexpr_CFLAGS      = $(AM_CFLAGS) @FLAG_NO_PIE@ 
-reallocarray_CFLAGS    = $(AM_CFLAGS) @FLAG_W_NO_ALLOC_SIZE_LARGER_THAN@
+reallocarray_CFLAGS    = $(AM_CFLAGS) @FLAG_W_ALLOC_SIZE_LARGER_THAN@
 scalar_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
 
 # Avoid linker warnings

diff --git a/memcheck/tests/x86-freebsd/Makefile.am b/memcheck/tests/x86-freebsd/Makefile.am
index 8c48506c2be7100957e35c62a879990f944ce1e8..7839bb3095889219b136b6ad71e02099863e11d6 100644 (file)
--- a/memcheck/tests/x86-freebsd/Makefile.am
+++ b/memcheck/tests/x86-freebsd/Makefile.am
@@ -23,4 +23,4 @@ AM_CCASFLAGS += @FLAG_M32@
 
 posix_fallocate_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
 posix_fadvise_CFLAGS   = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
-reallocarray_CFLAGS    = ${AM_CFLAGS} @FLAG_W_NO_ALLOC_SIZE_LARGER_THAN@
+reallocarray_CFLAGS    = ${AM_CFLAGS} @FLAG_W_ALLOC_SIZE_LARGER_THAN@