Enable -Wlogical-op for Valgrind; fix an obvious typo.

Fixes BZ#389065.
Reported by: dcb314@hotmail.com

diff --git a/Makefile.all.am b/Makefile.all.am
index 2d698cf6cb08694683af7fb19625414211e1c3f9..30e79dd5653944c0e671cf85a535765f92838933 100644 (file)
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -113,6 +113,7 @@ AM_CFLAGS_BASE = \
        @FLAG_W_FORMAT_SECURITY@ \
        @FLAG_W_IGNORED_QUALIFIERS@ \
        @FLAG_W_MISSING_PARAMETER_TYPE@ \
+       @FLAG_W_LOGICAL_OP@ \
        @FLAG_W_OLD_STYLE_DECLARATION@ \
        @FLAG_FNO_STACK_PROTECTOR@ \
        @FLAG_FSANITIZE@ \

diff --git a/NEWS b/NEWS
index ac73ddee0bc4fe2911eab662239b3397b97497d8..ee853d55a80bc9b49bcd903e7fc1a7fad2e21a0a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -86,6 +86,7 @@ where XXXXXX is the bug number as listed below.
 386397  PPC64, valgrind truncates powerpc timebase to 32-bits.
 387712  s390x cgijnl reports Conditional jump depends on uninitialised value
 387773  .gnu_debugaltlink paths resolve relative to .debug file, not symlink
+389065  valgrind meets gcc flag -Wlogical-op
 
 n-i-bz  Fix missing workq_ops operations (macOS)
 n-i-bz  fix bug in strspn replacement

diff --git a/configure.ac b/configure.ac
index 901c59502114b5b0b74b09ff0899993e5339e531..98d7ac6e5b6c9bbc9fe220bb284b134de2568cf7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2004,6 +2004,7 @@ AC_GCC_WARNING_SUBST([cast-qual], [FLAG_W_CAST_QUAL])
 AC_GCC_WARNING_SUBST([old-style-declaration], [FLAG_W_OLD_STYLE_DECLARATION])
 AC_GCC_WARNING_SUBST([ignored-qualifiers], [FLAG_W_IGNORED_QUALIFIERS])
 AC_GCC_WARNING_SUBST([missing-parameter-type], [FLAG_W_MISSING_PARAMETER_TYPE])
+AC_GCC_WARNING_SUBST([logical-op], [FLAG_W_LOGICAL_OP])
 
 # Does this compiler support -Wformat-security ?
 # Special handling is needed, because certain GCC versions require -Wformat

diff --git a/coregrind/m_syswrap/syswrap-xen.c b/coregrind/m_syswrap/syswrap-xen.c
index 1e374ab98dffbe6e5d3137af02d4e344f0faa148..54153ab1c7d8331fa96228ff89db0d9401a6035f 100644 (file)
--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -1279,7 +1279,7 @@ PRE(domctl)
       switch (domctl->interface_version) {
       case 0x000000b:
           if (domctl->u.monitor_op_0000000b.op == VKI_XEN_DOMCTL_MONITOR_OP_ENABLE ||
-              domctl->u.monitor_op_0000000b.op == VKI_XEN_DOMCTL_MONITOR_OP_ENABLE) {
+              domctl->u.monitor_op_0000000b.op == VKI_XEN_DOMCTL_MONITOR_OP_DISABLE) {
              switch (domctl->u.monitor_op_0000000b.event) {
              case VKI_XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG:
                 __PRE_XEN_DOMCTL_READ(monitor_op, monitor_op_0000000b, u.mov_to_cr);