diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-09-15 18:33:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-28 14:58:51 +0100 |
commit | 3ae6040295723a79a4dc1202992aaad6c388b797 (patch) | |
tree | 3d7587468790389e9f43b082528d800d63871a3e /meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch | |
parent | 46ad3b0e2c603ebbd510f59796bf44fcabe70aaa (diff) | |
download | poky-3ae6040295723a79a4dc1202992aaad6c388b797.tar.gz |
eglibc: Add recipes for 2.14
Backport Fedora patch to enable sunrpc as it was in 2.13
Fix cross-localedef-native to be able to build from eglibc 2.14 branch
Tested builds/boot of angstrom/console-image on qemu for arm,mips,ppc,i386,x86_64
(From OE-Core rev: bee3699510a31158f9e2095fe8b6e4cb75ed3651)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch new file mode 100644 index 0000000000..40ae6d37f4 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | The default lib search path order is: | ||
4 | |||
5 | 1) LD_LIBRARY_PATH | ||
6 | 2) RPATH from the binary | ||
7 | 3) ld.so.cache | ||
8 | 4) default search paths embedded in the linker | ||
9 | |||
10 | For nativesdk binaries which are being used alongside binaries on a host system, we | ||
11 | need the search paths to firstly search the shipped nativesdk libs but then also | ||
12 | cover the host system. For example we want the host system's libGL and this may be | ||
13 | in a non-standard location like /usr/lib/mesa. The only place the location is know | ||
14 | about is in the ld.so.cache of the host system. | ||
15 | |||
16 | Since nativesdk has a simple structure and doesn't need to use a cache itself, we | ||
17 | repurpose the cache for use as a last resort in finding host system binaries. This | ||
18 | means we need to switch the order of 3 and 4 above to make this work effectively. | ||
19 | |||
20 | RP 14/10/2010 | ||
21 | |||
22 | Index: libc/elf/dl-load.c | ||
23 | =================================================================== | ||
24 | --- libc.orig/elf/dl-load.c | ||
25 | +++ libc/elf/dl-load.c | ||
26 | @@ -2107,6 +2107,15 @@ _dl_map_object (struct link_map *loader, | ||
27 | &loader->l_runpath_dirs, &realname, &fb, loader, | ||
28 | LA_SER_RUNPATH, &found_other_class); | ||
29 | |||
30 | + /* try the default path. */ | ||
31 | + if (fd == -1 | ||
32 | + && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL | ||
33 | + || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)) | ||
34 | + && rtld_search_dirs.dirs != (void *) -1) | ||
35 | + fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs, | ||
36 | + &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); | ||
37 | + | ||
38 | + /* Finally try ld.so.cache */ | ||
39 | if (fd == -1 | ||
40 | && (__builtin_expect (! (mode & __RTLD_SECURE), 1) | ||
41 | || ! INTUSE(__libc_enable_secure))) | ||
42 | @@ -2169,14 +2178,6 @@ _dl_map_object (struct link_map *loader, | ||
43 | } | ||
44 | } | ||
45 | |||
46 | - /* Finally, try the default path. */ | ||
47 | - if (fd == -1 | ||
48 | - && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL | ||
49 | - || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)) | ||
50 | - && rtld_search_dirs.dirs != (void *) -1) | ||
51 | - fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs, | ||
52 | - &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); | ||
53 | - | ||
54 | /* Add another newline when we are tracing the library loading. */ | ||
55 | if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, 0)) | ||
56 | _dl_debug_printf ("\n"); | ||