rpm/binutils
SHA256
1
0
Fork 0
forked from pool/binutils
Code Pull Requests Activity

- Remove empty rpath component removal optimization from

Browse Source 
binutils-skip-rpaths.patch to workaround CMake rpath handling.
  [boo#1025282]

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/binutils?expand=0&rev=236
This commit is contained in:
Richard Biener 2017-03-30 11:17:57 +00:00 committed by Git OBS Bridge
parent fe376ecbb2
commit 32d9ceffd6
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
binutils-skip-rpaths.patch
View File

@ -1,16 +1,13 @@
Index: ld/emultempl/elf32.em Index: ld/emultempl/elf32.em
=================================================================== ===================================================================
--- ld/emultempl/elf32.em.orig 2014-10-14 17:18:40.000000000 +0200 --- ld/emultempl/elf32.em.orig 2017-03-02 09:23:54.000000000 +0100
+++ ld/emultempl/elf32.em 2014-10-14 17:20:23.000000000 +0200 +++ ld/emultempl/elf32.em 2017-03-30 13:06:06.406399958 +0200
@@ -1357,8 +1357,38 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" != @@ -1581,8 +1581,35 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" !=
else else
ELF_INTERPRETER_SET_DEFAULT= ELF_INTERPRETER_SET_DEFAULT=
fi fi
+ +
+ libpath_nl= + libpath_nl=`echo ${NATIVE_LIB_DIRS// /\\\n}`
+ for path in $NATIVE_LIB_DIRS; do
+ libpath_nl="$libpath_nl\n$path"
+ done
fragment <<EOF fragment <<EOF
+static int +static int
@ -41,7 +38,7 @@ Index: ld/emultempl/elf32.em
/* used by before_allocation and handle_option. */ /* used by before_allocation and handle_option. */
static void static void
gld${EMULATION_NAME}_append_to_separated_string (char **to, char *op_arg) gld${EMULATION_NAME}_append_to_separated_string (char **to, char *op_arg)
@@ -1405,7 +1435,7 @@ gld${EMULATION_NAME}_append_to_separated @@ -1634,7 +1661,7 @@ static struct bfd_link_hash_entry ehdr_s
static void static void
gld${EMULATION_NAME}_before_allocation (void) gld${EMULATION_NAME}_before_allocation (void)
{ {
@ -50,7 +47,7 @@ Index: ld/emultempl/elf32.em
asection *sinterp; asection *sinterp;
bfd *abfd; bfd *abfd;
struct elf_link_hash_entry *ehdr_start = NULL; struct elf_link_hash_entry *ehdr_start = NULL;
@@ -1457,7 +1487,65 @@ gld${EMULATION_NAME}_before_allocation ( @@ -1691,7 +1718,65 @@ gld${EMULATION_NAME}_before_allocation (
by dynamic linking. */ by dynamic linking. */
rpath = command_line.rpath; rpath = command_line.rpath;
if (rpath == NULL) if (rpath == NULL)

7
binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
- Remove empty rpath component removal optimization from
binutils-skip-rpaths.patch to workaround CMake rpath handling.
[boo#1025282]
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 17 15:28:26 UTC 2017 - matz@suse.com Fri Mar 17 15:28:26 UTC 2017 - matz@suse.com