diff options
author | Igor Pashev <igor.pashev@nexenta.com> | 2012-12-03 19:01:30 +0400 |
---|---|---|
committer | Igor Pashev <igor.pashev@nexenta.com> | 2012-12-03 19:01:30 +0400 |
commit | 8ce8d223a716e16cd3ffd3aaa04d4dee7d35d4dd (patch) | |
tree | df24ae9285d42b32bf3f9b74e0142a4e36b6f5f0 /binutils/patches/140_pr10340.patch | |
parent | 7a067c659745b5cd1cc33767cc4d554b40885a5c (diff) | |
download | cibs-pkgs-8ce8d223a716e16cd3ffd3aaa04d4dee7d35d4dd.tar.gz |
GNU binutils 2.22+
Diffstat (limited to 'binutils/patches/140_pr10340.patch')
-rw-r--r-- | binutils/patches/140_pr10340.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/binutils/patches/140_pr10340.patch b/binutils/patches/140_pr10340.patch new file mode 100644 index 0000000..349d863 --- /dev/null +++ b/binutils/patches/140_pr10340.patch @@ -0,0 +1,35 @@ +# DP: Proposed patch for PR ld/10340, ld doesn't honor sysroot prefix for ldscripts + +Signed-off-by: Sven Rebhan <odinshorse@googlemail.com> + +Always try to prepend the sysroot prefix to absolute filenames first. + +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -308,18 +308,24 @@ + directory first. */ + if (! entry->is_archive) + { +- if (entry->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->sysrooted = is_sysrooted_pathname(entry->filename, FALSE); ++ if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted) + { + char *name = concat (ld_sysroot, entry->filename, + (const char *) NULL); + if (ldfile_try_open_bfd (name, entry)) + { + entry->filename = name; ++ entry->sysrooted = TRUE; + return TRUE; + } + free (name); + } +- else if (ldfile_try_open_bfd (entry->filename, entry)) ++ ++ if (ldfile_try_open_bfd (entry->filename, entry)) + { + entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename) + && is_sysrooted_pathname (entry->filename, TRUE); |