Fix "unresolved reloc" error for NOTOC relocs

	* elf64-ppc.c (ppc64_elf_relocate_section): Don't miss clearing
	unresolved_reloc on ppc_stub_plt_call_notoc.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 73873924a1b4a8359f377a3a4fe1ac8a54b55861..f24ef2be137827cd7ae4db7255aefb7464ab37e0 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2018-08-23  Alan Modra  <amodra@gmail.com>
+
+       * elf64-ppc.c (ppc64_elf_relocate_section): Don't miss clearing
+       unresolved_reloc on ppc_stub_plt_call_notoc.
+
 2018-08-22  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/23536

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 2b5b50092a8ab2c080b60fb09b6c5a7c4b735639..1a40fa967392f8fae5b039aa0ec13bc29949ba42 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -13887,9 +13887,8 @@ ppc64_elf_relocate_section (bfd *output_bfd,
            stub_entry = NULL;
 
          if (stub_entry != NULL
-             && (stub_entry->stub_type == ppc_stub_plt_call
-                 || stub_entry->stub_type == ppc_stub_plt_call_r2save
-                 || stub_entry->stub_type == ppc_stub_plt_call_both
+             && ((stub_entry->stub_type >= ppc_stub_plt_call
+                  && stub_entry->stub_type <= ppc_stub_plt_call_both)
                  || stub_entry->stub_type == ppc_stub_plt_branch_r2off
                  || stub_entry->stub_type == ppc_stub_plt_branch_both
                  || stub_entry->stub_type == ppc_stub_long_branch_r2off