]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
binutils: Remove RISC-V PIE patch
authorAlistair Francis <alistair.francis@wdc.com>
Tue, 11 Aug 2020 14:38:37 +0000 (07:38 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 12 Aug 2020 09:51:40 +0000 (10:51 +0100)
Remove the out of tree patch that is trying to address a PIE issue. This
patch causes RISC-V applications to seg fault when running
_dl_relocate_object.

This fixes: https://github.com/riscv/meta-riscv/issues/236

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/binutils/binutils-2.35.inc
meta/recipes-devtools/binutils/binutils/0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch [deleted file]

index 9aa5e7efe3c973358536b7d830c8ff09046468b6..5ae9ec4226f110490c9fbf1a282d4cdfb96c8516 100644 (file)
@@ -41,6 +41,5 @@ SRC_URI = "\
      file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
      file://0015-sync-with-OE-libtool-changes.patch \
      file://0016-Check-for-clang-before-checking-gcc-version.patch \
-     file://0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch \
 "
 S  = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch b/meta/recipes-devtools/binutils/binutils/0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch
deleted file mode 100644 (file)
index 99bb38e..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5b61c40c34c3db699de723c3128ba704501ccdac Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 20 Apr 2020 14:23:57 -0700
-Subject: [PATCH 17/17] Do not emit R_RISCV_NONE reloc in the extra unused
- reloc space.
-
-Redundant R_RISCV_DTPMOD* R_RISCV_DTPREL* results from Global Dynamic -> Local Exec relaxation
-which generates
-
-Patch from https://sourceware.org/bugzilla/show_bug.cgi?id=24673
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- bfd/elfnn-riscv.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
-index a5fa415309a..1e582052aa9 100644
---- a/bfd/elfnn-riscv.c
-+++ b/bfd/elfnn-riscv.c
-@@ -2090,13 +2090,14 @@ riscv_elf_relocate_section (bfd *output_bfd,
-                 pic = bfd_link_pic (info);
-                 if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, pic, h)
--                    && (!pic || !SYMBOL_REFERENCES_LOCAL (info, h)))
-+                    && (bfd_link_dll (info)
-+                        || !SYMBOL_REFERENCES_LOCAL (info, h)))
-                   indx = h->dynindx;
-               }
-             /* The GOT entries have not been initialized yet.  Do it
-                now, and emit any relocations.  */
--            if ((bfd_link_pic (info) || indx != 0)
-+            if ((bfd_link_dll (info) || indx != 0)
-                 && (h == NULL
-                     || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
-                     || h->root.type != bfd_link_hash_undefweak))
--- 
-2.28.0
-