Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Unified Diff: binutils/binutils/objdump.c

Issue 3018030: [binutils] Bump binutils to 2.20.1 (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/nacl-toolchain.git
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « binutils/binutils/objcopy.c ('k') | binutils/binutils/po/binutils.pot » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: binutils/binutils/objdump.c
diff --git a/binutils/binutils/objdump.c b/binutils/binutils/objdump.c
index dd0d0ef50c27a1c1438694658376c509a4cc13ec..ff2d7032dbb9e09ca54a62f3ad9a4d1b014f7008 100644
--- a/binutils/binutils/objdump.c
+++ b/binutils/binutils/objdump.c
@@ -1465,6 +1465,9 @@ disassemble_bytes (struct disassemble_info * info,
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++)
@@ -1568,8 +1571,6 @@ disassemble_bytes (struct disassemble_info * info,
info->flags |= INSN_HAS_RELOC;
aux->reloc = **relppp;
}
- else
- aux->reloc = NULL;
}
octets = (*disassemble_fn) (section->vma + addr_offset, info);
« no previous file with comments | « binutils/binutils/objcopy.c ('k') | binutils/binutils/po/binutils.pot » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698