Cleanup of warnings, mostly -Wno-unused-but-set-variable

diff --git a/configure.ac b/configure.ac
index 467c98e023458fbbf21df683a61bdeac09b4a30a..cffb22774b4535380190a4183d819b108d646016 100755 (executable)
--- 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 771f47ccce0c20774a272910af89b855bc86d301..e3366a18a01fbeeea7b3f69f7a1950fdd9d56184 100755 (executable)
--- 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 721749f1ce60db4b2c923ab14e1f7b36b374bd1d..0a8bd5744bfe564323dab9484766599d16f60581 100755 (executable)
--- 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 08292dd33ac19de46b5b61bbcebfbc3bd951e195..9e80b5331733287800b4e9cd00aa7a1f8ad9d258 100644 (file)
--- 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 24cfa020cd4216c0d0e2f32c8c2b68fe1dea90d8..53483e55cbc39731bdbc4611d41c9fa5c839d0fe 100644 (file)
--- 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 5a6f29549fa127f4fc3cb56af68d5f2a48041b7f..daf14f2f8e7e0726799a246c0851e63bbee419bb 100644 (file)
--- 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 d75a894b094fedc938429e101c54a825d56a5b59..c6a7ff2d5c1c91944bd1a9c6770578f5c58ad988 100644 (file)
--- 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 ab504e937530cad9657d0157a5d21e9bea9d1a50..7f5c6eed003e11fe982303d235e5eaad1a15e2f6 100644 (file)
--- 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