From 8c6683ef45561aac852c29dd9b338071b2cdaea7 Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Mon, 5 Feb 2018 14:23:58 +0100
Subject: binutils-2.30 patches

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 ...CH64_ABS16-and-R_AARCH64_ABS32-against-ab.patch | 57 ++++++++++++++++++++++
 ...te-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 36 ++++++++++++++
 patches/binutils-2.30/series                       |  7 +++
 3 files changed, 100 insertions(+)
 create mode 100644 patches/binutils-2.30/0001-Allow-R_AARCH64_ABS16-and-R_AARCH64_ABS32-against-ab.patch
 create mode 100644 patches/binutils-2.30/0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
 create mode 100644 patches/binutils-2.30/series

diff --git a/patches/binutils-2.30/0001-Allow-R_AARCH64_ABS16-and-R_AARCH64_ABS32-against-ab.patch b/patches/binutils-2.30/0001-Allow-R_AARCH64_ABS16-and-R_AARCH64_ABS32-against-ab.patch
new file mode 100644
index 0000000..1fd9afd
--- /dev/null
+++ b/patches/binutils-2.30/0001-Allow-R_AARCH64_ABS16-and-R_AARCH64_ABS32-against-ab.patch
@@ -0,0 +1,57 @@
+From: Renlin Li <renlin.li@arm.com>
+Date: Sat, 3 Feb 2018 13:18:17 +0000
+Subject: [PATCH] Allow R_AARCH64_ABS16 and R_AARCH64_ABS32 against absolution
+ symbol or undefine symbol in shared object.
+
+backport from mainline
+
+bfd/
+
+2018-02-05  Renlin Li  <renlin.li@arm.com>
+
+	PR ld/22764
+	* elfnn-aarch64.c (elfNN_aarch64_check_relocs): Relax the
+	R_AARCH64_ABS32 and R_AARCH64_ABS16 for absolute symbol. Apply the
+	check for writeable section as well.
+
+ld/
+
+2018-02-05  Renlin Li  <renlin.li@arm.com>
+
+	PR ld/22764
+	* testsuite/ld-aarch64/emit-relocs-258.s: Define symbol as an address.
+	* testsuite/ld-aarch64/emit-relocs-259.s: Likewise.
+	* testsuite/ld-aarch64/aarch64-elf.exp: Run new test.
+	* testsuite/ld-aarch64/pr22764.s: New.
+	* testsuite/ld-aarch64/pr22764.d: New.
+---
+ bfd/elfnn-aarch64.c | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
+index d5711e0eb1dc..973188220ba1 100644
+--- a/bfd/elfnn-aarch64.c
++++ b/bfd/elfnn-aarch64.c
+@@ -7074,10 +7074,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ #if ARCH_SIZE == 64
+ 	case BFD_RELOC_AARCH64_32:
+ #endif
+-	  if (bfd_link_pic (info)
+-	      && (sec->flags & SEC_ALLOC) != 0
+-	      && (sec->flags & SEC_READONLY) != 0)
++	  if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0)
+ 	    {
++	      if (h != NULL
++		  /* This is an absolute symbol.  It represents a value instead
++		     of an address.  */
++		  && ((h->root.type == bfd_link_hash_defined
++		       && bfd_is_abs_section (h->root.u.def.section))
++		      /* This is an undefined symbol.  */
++		      || h->root.type == bfd_link_hash_undefined))
++		break;
++
++	      /* For local symbols, defined global symbols in a non-ABS section,
++		 it is assumed that the value is an address.  */
+ 	      int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START;
+ 	      _bfd_error_handler
+ 		/* xgettext:c-format */
diff --git a/patches/binutils-2.30/0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/patches/binutils-2.30/0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
new file mode 100644
index 0000000..9ab7729
--- /dev/null
+++ b/patches/binutils-2.30/0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -0,0 +1,36 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 1 Nov 2011 16:45:55 +0100
+Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty, for
+ cases where -rpath isn't specified.
+
+This is http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=151024
+
+This patch is still used in debian binutils 2.30-1
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ ld/emultempl/elf32.em | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index c0925fc9b970..cf6e2fe203e1 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1470,6 +1470,8 @@ fragment <<EOF
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((path) && (strlen (path) == 0))
++		path = NULL;
+ 	      if (path
+ 		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
+ 		break;
+@@ -1750,6 +1752,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++      rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/patches/binutils-2.30/series b/patches/binutils-2.30/series
new file mode 100644
index 0000000..d89c7f2
--- /dev/null
+++ b/patches/binutils-2.30/series
@@ -0,0 +1,7 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream --start-number 1
+0001-Allow-R_AARCH64_ABS16-and-R_AARCH64_ABS32-against-ab.patch
+#tag:debian --start-number 100
+0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+# 980ef2225944402e64746169ce1bb6b3  - git-ptx-patches magic
-- 
cgit v1.2.3