diff options
| author | Keith Seitz <keiths@redhat.com> | 2017-08-17 13:58:01 -0700 |
|---|---|---|
| committer | Keith Seitz <keiths@redhat.com> | 2017-08-17 13:58:01 -0700 |
| commit | b5f28d7abc02ca509e389fa932d725cf111e4b40 (patch) | |
| tree | 57a0dc0feaff890630a6ba2c9fab811d56b1f9cf /bfd/elf32-msp430.c | |
| parent | 2a95a158fae932f758d75a1178a40d4cc4804ff0 (diff) | |
| parent | 1a457753cfad05989574c671a221ffce2d5df703 (diff) | |
| download | gdb-users/pmuldoon/c++compile.zip gdb-users/pmuldoon/c++compile.tar.gz gdb-users/pmuldoon/c++compile.tar.bz2 | |
Update w/HEADusers/pmuldoon/c++compile
Problems:
gdb/compile/compile.c
gdb/cp-support.c
gdb/cp-support.h
gdb/gdbtypes.h
gdb/language.c
gdb/linespec.c
Diffstat (limited to 'bfd/elf32-msp430.c')
| -rw-r--r-- | bfd/elf32-msp430.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c index 9fae015..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 (uses_msp430x_relocs (abfd) - && ELF32_R_TYPE (irel->r_info) == R_MSP430X_ABS16) + 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; |