bfd: xtensa: pr26246: fix removed_literal_compare

2020-07-22  Max Filippov  <jcmvbkbc@gmail.com>
bfd/
	PR 26246
	* elf32-xtensa.c (removed_literal_compare): Use correct pointer
	type for the first function argument. Rename pointers to reflect
	that they have distinct types.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d6a1d87e5e77595b7dc1fa11d15df2271bae4c81..411c19068df18f97e5ea08adbc30af4bd0815480 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2020-07-22  Max Filippov  <jcmvbkbc@gmail.com>
+
+       PR 26246
+       * elf32-xtensa.c (removed_literal_compare): Use correct pointer
+       type for the first function argument. Rename pointers to reflect
+       that they have distinct types.
+
 2020-07-20  Alan Modra  <amodra@gmail.com>
 
        * elflink.c (_bfd_elf_gc_keep): Use bfd_is_const_section.

diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 45727b3f805c070eb9dc208082318fea915d574a..8928b11fbce3b3b1aeed53858661bd49d018a88b 100644 (file)
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -5989,13 +5989,13 @@ map_removed_literal (removed_literal_list *removed_list)
 static int
 removed_literal_compare (const void *a, const void *b)
 {
-  const removed_literal_map_entry *pa = a;
-  const removed_literal_map_entry *pb = b;
+  const bfd_vma *key = a;
+  const removed_literal_map_entry *memb = b;
 
-  if (pa->addr == pb->addr)
+  if (*key == memb->addr)
     return 0;
   else
-    return pa->addr < pb->addr ? -1 : 1;
+    return *key < memb->addr ? -1 : 1;
 }
 
 /* Check if the list of removed literals contains an entry for the