From 1395c6ce47510babad3dcb9892f6f2517a3f2b59 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 2 May 2017 16:54:53 +0100 Subject: [PATCH] Don't merge notes when the relocs associated with them cannot be reliably deleted. * objcopy.c (merge_gnu_build_notes): Disable merge if there are more internal relocs than external relocs. --- binutils/ChangeLog | 5 +++++ binutils/objcopy.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index aef436d3020..d13dbb637d4 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2017-05-02 Nick Clifton + + * objcopy.c (merge_gnu_build_notes): Disable merge if there are + more internal relocs than external relocs. + 2017-05-02 Maciej W. Rozycki * testsuite/binutils-all/mips/mips16-undecoded.d: Adjust the diff --git a/binutils/objcopy.c b/binutils/objcopy.c index 42c7775234d..36952ecd6f5 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -2137,6 +2137,13 @@ 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 (relcount > sec->reloc_count) + goto done; + /* Eliminate the duplicates. */ new = new_contents = xmalloc (size); for (pnote = pnotes, old = contents; -- 2.30.2