summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Abdurachmanov <davidlt@cern.ch>2016-04-11 16:00:57 +0200
committerMark Wielaard <mark@tarox.wildebeest.org>2016-04-11 17:07:22 +0200
commit836a16fe5b5bab4a3afe2c991c104652775ce3a3 (patch)
treeedf5dbef825d255e475c3d8e8d5dad7967217e65
parentc57e357a99314c1f7f4e56c2a534f60ee3299a4f (diff)
downloadelfutils-836a16fe5b5bab4a3afe2c991c104652775ce3a3.tar.gz
elfcmp: fix self-comparison error with GCC 6
Noticed with Fedora 24 Alpha, gcc (GCC) 6.0.0 20160406 (Red Hat 6.0.0-0.20). elfcmp.c: In function ‘main’: elfcmp.c:364:199: error: self-comparison always evaluates to false [-Werror=tautological-compare] if (unlikely (name1 == NULL || name2 == NULL Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
-rw-r--r--src/ChangeLog4
-rw-r--r--src/elfcmp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f74b5dcb..bdc9d133 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-11 David Abdurachmanov <davidlt@cern.ch>
+
+ * elfcmp.c (main): Fix self-comparison error with GCC 6.
+
2016-03-21 Mark Wielaard <mjw@redhat.com>
* nm.c (show_symbols): Check for malloc size argument overflow.
diff --git a/src/elfcmp.c b/src/elfcmp.c
index 852b92f5..7b5d39ce 100644
--- a/src/elfcmp.c
+++ b/src/elfcmp.c
@@ -368,7 +368,7 @@ main (int argc, char *argv[])
&& sym1->st_shndx != SHN_UNDEF)
|| sym1->st_info != sym2->st_info
|| sym1->st_other != sym2->st_other
- || sym1->st_shndx != sym1->st_shndx))
+ || sym1->st_shndx != sym2->st_shndx))
{
// XXX Do we want to allow reordered symbol tables?
symtab_mismatch: