diff options
author | Chris Packham <judge.packham@gmail.com> | 2021-09-26 20:47:36 +1300 |
---|---|---|
committer | Chris Packham <judge.packham@gmail.com> | 2021-09-26 20:47:42 +1300 |
commit | aa524934f5fcfedb91b03d2fec7a8dd4dd080aea (patch) | |
tree | ff5e58ebf6d3aa1fdff5fb1cf9888904f19cd4fa /packages/binutils/2.24/0006-sysroot.patch | |
parent | 02d1503f6769be4ad8058b393d4245febced459f (diff) | |
parent | dab2d8011ea67118348a6bd28ae3583960c1b5c3 (diff) | |
download | crosstool-ng-aa524934f5fcfedb91b03d2fec7a8dd4dd080aea.tar.gz crosstool-ng-aa524934f5fcfedb91b03d2fec7a8dd4dd080aea.tar.bz2 crosstool-ng-aa524934f5fcfedb91b03d2fec7a8dd4dd080aea.zip |
Merge branch 'remove-obsolete-versions' of https://github.com/cpackham/crosstool-ng
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'packages/binutils/2.24/0006-sysroot.patch')
-rw-r--r-- | packages/binutils/2.24/0006-sysroot.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/packages/binutils/2.24/0006-sysroot.patch b/packages/binutils/2.24/0006-sysroot.patch deleted file mode 100644 index 13b52888..00000000 --- a/packages/binutils/2.24/0006-sysroot.patch +++ /dev/null @@ -1,41 +0,0 @@ -Signed-off-by: Sven Rebhan <odinshorse@googlemail.com> - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - ---- - ld/ldfile.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -341,18 +341,25 @@ - directory first. */ - if (! entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) |