From: Nick Clifton <nickc@redhat.com>
Date: Thu, 18 Feb 2021 11:43:26 +0000 (+0000)
Subject: Fix a problem merging empty annobin notes on ppc64le targets.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8568422270e312310c47048750733652c7bd979f;p=binutils-gdb.git

Fix a problem merging empty annobin notes on ppc64le targets.

	* objcopy.c (merge_gnu_build_notes): Handle notes with a start
	address that is higher than the end address.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 70ecb0a4263..fd46001007f 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-18  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (merge_gnu_build_notes): Handle notes with a start
+	address that is higher than the end address.
+
 2021-02-17  Alan Modra  <amodra@gmail.com>
 
 	* dwarf.c: Include limits.h.
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 0e1047e7482..54a59430f1b 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -2275,6 +2275,11 @@ merge_gnu_build_notes (bfd *          abfd,
 	  goto done;
 	}
 
+      if (start > end)
+	/* This can happen with PPC64LE binaries where empty notes are
+	   encoded as start = end + 4.  */
+	start = end;
+
       if (is_open_note (pnote))
 	{
 	  if (start)