diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
| commit | c58cc7d3796dcee6e93885c835ed04cb566abeb2 (patch) | |
| tree | 3eea4d4ef6a4ef79e0f4e025d7012c1a5cc38835 /meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-2.19.1-ld-sysroot.patch | |
| parent | eec6ab97f712e06eb52c9f7c99e19ffab3ce9d74 (diff) | |
| download | meta-openembedded-c58cc7d3796dcee6e93885c835ed04cb566abeb2.tar.gz | |
move layer into meta-oe in preparation for future splits
As per TSC decision
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-2.19.1-ld-sysroot.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-2.19.1-ld-sysroot.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-2.19.1-ld-sysroot.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-2.19.1-ld-sysroot.patch new file mode 100644 index 0000000000..adcabb4f66 --- /dev/null +++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-2.19.1-ld-sysroot.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | http://sourceware.org/bugzilla/show_bug.cgi?id=10340 | ||
| 2 | |||
| 3 | Signed-off-by: Sven Rebhan <odinshorse@googlemail.com> | ||
| 4 | |||
| 5 | Always try to prepend the sysroot prefix to absolute filenames first. | ||
| 6 | |||
| 7 | Index: binutils-2.21/ld/ldfile.c | ||
| 8 | =================================================================== | ||
| 9 | --- binutils-2.21.orig/ld/ldfile.c | ||
| 10 | +++ binutils-2.21/ld/ldfile.c | ||
| 11 | @@ -372,18 +372,24 @@ ldfile_open_file_search (const char *arc | ||
| 12 | directory first. */ | ||
| 13 | if (! entry->is_archive) | ||
| 14 | { | ||
| 15 | - if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename)) | ||
| 16 | + /* For absolute pathnames, try to always open the file in the | ||
| 17 | + sysroot first. If this fails, try to open the file at the | ||
| 18 | + given location. */ | ||
| 19 | + entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE); | ||
| 20 | + if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted) | ||
| 21 | { | ||
| 22 | char *name = concat (ld_sysroot, entry->filename, | ||
| 23 | (const char *) NULL); | ||
| 24 | if (ldfile_try_open_bfd (name, entry)) | ||
| 25 | { | ||
| 26 | entry->filename = name; | ||
| 27 | + entry->sysrooted = TRUE; | ||
| 28 | return TRUE; | ||
| 29 | } | ||
| 30 | free (name); | ||
| 31 | } | ||
| 32 | - else if (ldfile_try_open_bfd (entry->filename, entry)) | ||
| 33 | + | ||
| 34 | + if (ldfile_try_open_bfd (entry->filename, entry)) | ||
| 35 | { | ||
| 36 | entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename) | ||
| 37 | && is_sysrooted_pathname (entry->filename, TRUE); | ||
