diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch b/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch deleted file mode 100644 index 5e6be3a653..0000000000 --- a/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | http://sourceware.org/bugzilla/show_bug.cgi?id=10340 | ||
4 | |||
5 | Signed-off-by: Sven Rebhan <odinshorse@googlemail.com> | ||
6 | |||
7 | Always try to prepend the sysroot prefix to absolute filenames first. | ||
8 | |||
9 | Index: binutils-2.22/ld/ldfile.c | ||
10 | =================================================================== | ||
11 | --- binutils-2.22.orig/ld/ldfile.c | ||
12 | +++ binutils-2.22/ld/ldfile.c | ||
13 | @@ -351,18 +351,24 @@ ldfile_open_file_search (const char *arc | ||
14 | directory first. */ | ||
15 | if (! entry->maybe_archive) | ||
16 | { | ||
17 | - if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename)) | ||
18 | + /* For absolute pathnames, try to always open the file in the | ||
19 | + sysroot first. If this fails, try to open the file at the | ||
20 | + given location. */ | ||
21 | + entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE); | ||
22 | + if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted) | ||
23 | { | ||
24 | char *name = concat (ld_sysroot, entry->filename, | ||
25 | (const char *) NULL); | ||
26 | if (ldfile_try_open_bfd (name, entry)) | ||
27 | { | ||
28 | entry->filename = name; | ||
29 | + entry->sysrooted = TRUE; | ||
30 | return TRUE; | ||
31 | } | ||
32 | free (name); | ||
33 | } | ||
34 | - else if (ldfile_try_open_bfd (entry->filename, entry)) | ||
35 | + | ||
36 | + if (ldfile_try_open_bfd (entry->filename, entry)) | ||
37 | { | ||
38 | entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename) | ||
39 | && is_sysrooted_pathname (entry->filename, TRUE); | ||