diff options
| author | Nick Clifton <nickc@redhat.com> | 2010-02-08 14:33:22 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2010-02-08 14:33:22 +0000 |
| commit | bb7c70edcc3262f3a38a7c7b0bb262578d784838 (patch) | |
| tree | 5265c938578e594d9fe872ad1fa995de4001ca7b /binutils | |
| parent | 0b8bcf0ddbf245438a44d81f0a8c3eb8202336ef (diff) | |
| download | gdb-bb7c70edcc3262f3a38a7c7b0bb262578d784838.zip gdb-bb7c70edcc3262f3a38a7c7b0bb262578d784838.tar.gz gdb-bb7c70edcc3262f3a38a7c7b0bb262578d784838.tar.bz2 | |
* objdump.c (disassemble_bytes): Clear aux->reloc before printing
a new address, so as not to reuse a previous, non-related reloc.
* gas/arm/arm-it-auto.d, gas/arm/bl-local-v4t.d,
gas/arm/blx-local.d, gas/arm/thumb-w-good.d: Update expected
results.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/objdump.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index ede4c6d..33bfd3e 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2010-02-08 Christophe Lyon <christophe.lyon@st.com> + + * objdump.c (disassemble_bytes): Clear aux->reloc before printing + a new address, so as not to reuse a previous, non-related reloc. + 2010-02-02 H.J. Lu <hongjiu.lu@intel.com> * readelf.c (get_note_type): Handle NT_X86_XSTATE. diff --git a/binutils/objdump.c b/binutils/objdump.c index b53d4eb..41d0b4e 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -1516,6 +1516,9 @@ disassemble_bytes (struct disassemble_info * inf, previous_octets = octets; octets = 0; + /* Make sure we don't use relocs from previous instructions. */ + aux->reloc = NULL; + /* If we see more than SKIP_ZEROES octets of zeroes, we just print `...'. */ for (z = addr_offset * opb; z < stop_offset * opb; z++) @@ -1619,8 +1622,6 @@ disassemble_bytes (struct disassemble_info * inf, inf->flags |= INSN_HAS_RELOC; aux->reloc = **relppp; } - else - aux->reloc = NULL; } octets = (*disassemble_fn) (section->vma + addr_offset, inf); |