diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 59e3bb3a19..60a199a5db 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2017-05-19 Jose E. Marchesi + + * objcopy.c (merge_gnu_build_notes): Remove workaround that + prevented deleting relocations in duplicated notes in mips64 and + sparc. + 2017-05-19 Maciej W. Rozycki * testsuite/binutils-all/mips/mips-note-2.d: New test. diff --git a/binutils/objcopy.c b/binutils/objcopy.c index ccb5e12798..42c7775234 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -2137,13 +2137,6 @@ merge_gnu_build_notes (bfd * abfd, asection * sec, bfd_size_type size, bfd_byte relcount = 0; } - /* A few targets (eg MIPS, SPARC) create multiple internal relocs to - represent a single external reloc. Unfortunately the current BFD - API does not handle deleting relocs in such situations very well - and so it is unsafe to proceed. */ - if ((unsigned long) relcount > sec->reloc_count) - goto done; - /* Eliminate the duplicates. */ new = new_contents = xmalloc (size); for (pnote = pnotes, old = contents;