This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] Fix thinko in previous change to elf32-msp430.c


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=133193b8aef9f74abce69ec84beca227dbd7f9a4

commit 133193b8aef9f74abce69ec84beca227dbd7f9a4
Author: Nick Clifton <nickc@redhat.com>
Date:   Tue Jul 25 12:47:46 2017 +0100

    Fix thinko in previous change to elf32-msp430.c

Diff:
---
 bfd/elf32-msp430.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c
index 75a6288..e1e6ed0 100644
--- a/bfd/elf32-msp430.c
+++ b/bfd/elf32-msp430.c
@@ -2227,8 +2227,10 @@ msp430_elf_relax_section (bfd * abfd, asection * sec,
 
 	/* Try to turn a 16-bit absolute branch into a 10-bit pc-relative
 	   branch.  */
-	if (ELF32_R_TYPE (irel->r_info) == R_MSP430X_ABS16
-	    || ELF32_R_TYPE (irel->r_info) == R_MSP430_16)
+	if ((uses_msp430x_relocs (abfd)
+	     && ELF32_R_TYPE (irel->r_info) == R_MSP430X_ABS16)
+	    || (! uses_msp430x_relocs (abfd)
+		&& ELF32_R_TYPE (irel->r_info) == R_MSP430_16))
 	  {
 	    bfd_vma value = symval;


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]