From 1cea0e151b9d62f8c630de72a736dac6a6d51ed1 Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Sun, 8 Jan 2023 17:51:37 +0100 Subject: [PATCH] Cleanup of warnings, mostly -Wno-unused-but-set-variable --- configure.ac | 3 +++ drd/tests/Makefile.am | 13 +++++++------ helgrind/tests/Makefile.am | 1 + helgrind/tests/bug322621.cpp | 3 +-- memcheck/tests/Makefile.am | 2 +- memcheck/tests/freebsd/Makefile.am | 4 +++- memcheck/tests/freebsd/scalar.c | 2 +- perf/Makefile.am | 1 + 8 files changed, 18 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 467c98e023..cffb22774b 100755 --- a/configure.ac +++ b/configure.ac @@ -2546,6 +2546,9 @@ AC_GCC_WARNING_SUBST_NO([static-local-in-inline], [FLAG_W_NO_STATIC_LOCAL_IN_INL AC_GCC_WARNING_SUBST_NO([mismatched-new-delete], [FLAG_W_NO_MISMATCHED_NEW_DELETE]) AC_GCC_WARNING_SUBST_NO([infinite-recursion], [FLAG_W_NO_INFINITE_RECURSION]) AC_GCC_WARNING_SUBST_NO([expansion-to-defined], [FLAG_W_NO_EXPANSION_TO_DEFINED]) +AC_GCC_WARNING_SUBST_NO([unused-but-set-variable], [FLAG_W_NO_UNUSED_BUT_SET_VARIABLE]) +AC_GCC_WARNING_SUBST_NO([non-power-of-two-alignment], [FLAG_W_NO_NON_POWER_OF_TWO_ALIGNMENT]) +AC_GCC_WARNING_SUBST_NO([sign-compare], [FLAG_W_NO_SIGN_COMPARE]) AC_GCC_WARNING_SUBST([write-strings], [FLAG_W_WRITE_STRINGS]) AC_GCC_WARNING_SUBST([empty-body], [FLAG_W_EMPTY_BODY]) diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am index 771f47ccce..e3366a18a0 100755 --- a/drd/tests/Makefile.am +++ b/drd/tests/Makefile.am @@ -526,7 +526,8 @@ AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ @FLAG_FALIGNED_NEW@ \ LDADD = -lpthread - +annotate_sem_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNUSED_BUT_SET_VARIABLE@ +annotate_rwlock_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNUSED_BUT_SET_VARIABLE@ bug322621_SOURCES = bug322621.cpp condvar_SOURCES = condvar.cpp condvar_CXXFLAGS = $(AM_CXXFLAGS) -std=c++0x @@ -604,7 +605,7 @@ if HAVE_PTHREAD_BARRIER matinv_LDADD = $(LDADD) -lm endif -rwlock_test_CFLAGS = $(AM_CFLAGS) +rwlock_test_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNUSED_BUT_SET_VARIABLE@ if VGCONF_OS_IS_SOLARIS rwlock_test_CFLAGS += -D__EXTENSIONS__ endif @@ -613,16 +614,16 @@ shared_timed_mutex_SOURCES = shared_timed_mutex.cpp shared_timed_mutex_CXXFLAGS = $(AM_CXXFLAGS) -std=c++1y std_atomic_SOURCES = std_atomic.cpp -std_atomic_CXXFLAGS = $(AM_CXXFLAGS) -std=c++0x -Wno-sign-compare +std_atomic_CXXFLAGS = $(AM_CXXFLAGS) -std=c++0x @FLAG_W_NO_SIGN_COMPARE@ std_list_SOURCES = std_list.cpp -std_list_CXXFLAGS = $(AM_CXXFLAGS) -std=c++0x -Wno-sign-compare +std_list_CXXFLAGS = $(AM_CXXFLAGS) -std=c++0x @FLAG_W_NO_SIGN_COMPARE@ std_mutex_SOURCES = std_mutex.cpp -std_mutex_CXXFLAGS = $(AM_CXXFLAGS) -std=c++0x -Wno-sign-compare +std_mutex_CXXFLAGS = $(AM_CXXFLAGS) -std=c++0x @FLAG_W_NO_SIGN_COMPARE@ std_string_SOURCES = std_string.cpp -std_string_CXXFLAGS = $(AM_CXXFLAGS) -std=c++0x -Wno-sign-compare +std_string_CXXFLAGS = $(AM_CXXFLAGS) -std=c++0x @FLAG_W_NO_SIGN_COMPARE@ # Note: -Wl,--no-as-needed is a workaround for # https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1228201 diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am index 721749f1ce..0a8bd5744b 100755 --- a/helgrind/tests/Makefile.am +++ b/helgrind/tests/Makefile.am @@ -233,6 +233,7 @@ endif if HAVE_BUILTIN_ATOMIC check_PROGRAMS += annotate_rwlock +annotate_rwlock_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNUSED_BUT_SET_VARIABLE@ endif AM_CFLAGS += $(AM_FLAG_M3264_PRI) diff --git a/helgrind/tests/bug322621.cpp b/helgrind/tests/bug322621.cpp index 08292dd33a..9e80b53317 100644 --- a/helgrind/tests/bug322621.cpp +++ b/helgrind/tests/bug322621.cpp @@ -71,13 +71,12 @@ int main() pthread_attr_destroy(&attr); int buf = 0; - int res = 0; for (int i = 0; i < NR_RUNS; i++) { std::cerr << "Main at barrier " << i << "\n"; pthread_barrier_wait(&ls_barrier); std::cerr << "Main after barrier " << i << "\n"; buf = buf ^ 1; - res += read_buffer(buf); + (void)read_buffer(buf); } pthread_join(ls_thread,NULL); diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 24cfa020cd..53483e55cb 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -539,7 +539,7 @@ reach_thread_register_LDADD = -lpthread thread_alloca_LDADD = -lpthread threadname_LDADD = -lpthread -error_counts_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@ +error_counts_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@ @FLAG_W_NO_UNUSED_BUT_SET_VARIABLE@ execve1_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ diff --git a/memcheck/tests/freebsd/Makefile.am b/memcheck/tests/freebsd/Makefile.am index 5a6f29549f..daf14f2f8e 100644 --- a/memcheck/tests/freebsd/Makefile.am +++ b/memcheck/tests/freebsd/Makefile.am @@ -119,4 +119,6 @@ endif scalar_CFLAGS = ${AM_CFLAGS} -g -errno_aligned_allocs_CFLAGS = ${AM_CFLAGS} -Wno-non-power-of-two-alignment +errno_aligned_allocs_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_NON_POWER_OF_TWO_ALIGNMENT@ + +extattr_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_UNUSED_BUT_SET_VARIABLE@ diff --git a/memcheck/tests/freebsd/scalar.c b/memcheck/tests/freebsd/scalar.c index d75a894b09..c6a7ff2d5c 100644 --- a/memcheck/tests/freebsd/scalar.c +++ b/memcheck/tests/freebsd/scalar.c @@ -1586,7 +1586,7 @@ int main(void) GO(SYS_sctp_generic_recvmsg, "6s 4m"); SY(SYS_sctp_generic_recvmsg, x0+1, x0+2, x0+300, x0+4, &fromlen, x0+6, x0+7); FAIL; - iov.iov_base = x0+8; + iov.iov_base = (void*)(x0+8); iov.iov_len = x0+9; GO(SYS_sctp_generic_recvmsg, "6s 6m"); diff --git a/perf/Makefile.am b/perf/Makefile.am index ab504e9375..7f5c6eed00 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -30,6 +30,7 @@ AM_CXXFLAGS += -O $(AM_FLAG_M3264_PRI) bz2_CFLAGS = $(AM_CFLAGS) -Wno-inline fbench_CFLAGS = $(AM_CFLAGS) -O2 +ffbench_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNUSED_BUT_SET_VARIABLE@ ffbench_LDADD = -lm memrw_LDADD = -lpthread -- 2.47.2