Module Name:    src
Committed By:   rin
Date:           Mon Aug 28 01:59:26 UTC 2023

Modified Files:
        src/external/gpl3/binutils/dist/bfd: elf64-ppc.c

Log Message:
binutils/bfd/elf64-ppc.c: Fix merge botch

Extra NULL check for irrelevant variable has been accidentally
introduced during binutils 2.26 merge.

Probably confused with similar if block nearby...


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/binutils/dist/bfd/elf64-ppc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/dist/bfd/elf64-ppc.c
diff -u src/external/gpl3/binutils/dist/bfd/elf64-ppc.c:1.18 src/external/gpl3/binutils/dist/bfd/elf64-ppc.c:1.19
--- src/external/gpl3/binutils/dist/bfd/elf64-ppc.c:1.18	Mon Jan 16 00:11:50 2023
+++ src/external/gpl3/binutils/dist/bfd/elf64-ppc.c	Mon Aug 28 01:59:26 2023
@@ -16491,7 +16491,7 @@ ppc64_elf_relocate_section (bfd *output_
 		    }
 		}
 
-	      if (!can_plt_call && h != NULL)
+	      if (!can_plt_call)
 		{
 		  /* g++ as of 20130507 emits self-calls without a
 		     following nop.  This is arguably wrong since we

Reply via email to