From 83a5eb4084b4a4ec2249e7ff10e480d3c75d65f7 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 28 Sep 2018 15:43:17 -0700 Subject: Patches to fix ld's abort on xtensa Also while there, fix the naming (some patches ended up with two sequence numbers somehow). Signed-off-by: Alexey Neyman --- .../2.28.1/0001-001_ld_makefile_patch.patch | 27 ---------------------- .../binutils/2.28.1/0001-ld_makefile_patch.patch | 27 ++++++++++++++++++++++ .../2.28.1/0002-012_check_ldrunpath_length.patch | 24 ------------------- .../2.28.1/0002-check_ldrunpath_length.patch | 24 +++++++++++++++++++ 4 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 packages/binutils/2.28.1/0001-001_ld_makefile_patch.patch create mode 100644 packages/binutils/2.28.1/0001-ld_makefile_patch.patch delete mode 100644 packages/binutils/2.28.1/0002-012_check_ldrunpath_length.patch create mode 100644 packages/binutils/2.28.1/0002-check_ldrunpath_length.patch (limited to 'packages/binutils/2.28.1') diff --git a/packages/binutils/2.28.1/0001-001_ld_makefile_patch.patch b/packages/binutils/2.28.1/0001-001_ld_makefile_patch.patch deleted file mode 100644 index 36940def..00000000 --- a/packages/binutils/2.28.1/0001-001_ld_makefile_patch.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- - ld/Makefile.am | 2 +- - ld/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -452,7 +452,7 @@ - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include diff --git a/packages/binutils/2.28.1/0001-ld_makefile_patch.patch b/packages/binutils/2.28.1/0001-ld_makefile_patch.patch new file mode 100644 index 00000000..36940def --- /dev/null +++ b/packages/binutils/2.28.1/0001-ld_makefile_patch.patch @@ -0,0 +1,27 @@ +--- + ld/Makefile.am | 2 +- + ld/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -57,7 +57,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -452,7 +452,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/packages/binutils/2.28.1/0002-012_check_ldrunpath_length.patch b/packages/binutils/2.28.1/0002-012_check_ldrunpath_length.patch deleted file mode 100644 index 78f05ae6..00000000 --- a/packages/binutils/2.28.1/0002-012_check_ldrunpath_length.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1411,6 +1411,8 @@ - && command_line.rpath == NULL) - { - lib_path = (const char *) getenv ("LD_RUN_PATH"); -+ if ((lib_path) && (strlen (lib_path) == 0)) -+ lib_path = NULL; - if (gld${EMULATION_NAME}_search_needed (lib_path, &n, - force)) - break; -@@ -1692,6 +1694,8 @@ - rpath = command_line.rpath; - if (rpath == NULL) - rpath = (const char *) getenv ("LD_RUN_PATH"); -+ if ((rpath) && (*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/packages/binutils/2.28.1/0002-check_ldrunpath_length.patch b/packages/binutils/2.28.1/0002-check_ldrunpath_length.patch new file mode 100644 index 00000000..78f05ae6 --- /dev/null +++ b/packages/binutils/2.28.1/0002-check_ldrunpath_length.patch @@ -0,0 +1,24 @@ +--- + ld/emultempl/elf32.em | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1411,6 +1411,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -1692,6 +1694,8 @@ + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (*rpath == '\0')) ++ rpath = NULL; + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) -- cgit v1.2.3