diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch index 3d66348133..97c280059f 100644 --- a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch +++ b/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0876fea1b5b26da84f298714a2e23ba696607dba Mon Sep 17 00:00:00 2001 | 1 | From 66d04e2cd8badb0984050e4e9f2732f47151fbbf Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 18 Mar 2015 01:48:24 +0000 | 3 | Date: Wed, 18 Mar 2015 01:48:24 +0000 |
4 | Subject: [PATCH 01/27] nativesdk-glibc: Look for host system ld.so.cache as | 4 | Subject: [PATCH 01/24] nativesdk-glibc: Look for host system ld.so.cache as |
5 | well | 5 | well |
6 | 6 | ||
7 | Upstream-Status: Inappropriate [embedded specific] | 7 | Upstream-Status: Inappropriate [embedded specific] |
@@ -27,18 +27,17 @@ RP 14/10/2010 | |||
27 | 27 | ||
28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
29 | --- | 29 | --- |
30 | elf/dl-load.c | 17 ++++++++--------- | 30 | elf/dl-load.c | 16 ++++++++-------- |
31 | 1 file changed, 8 insertions(+), 9 deletions(-) | 31 | 1 file changed, 8 insertions(+), 8 deletions(-) |
32 | 32 | ||
33 | diff --git a/elf/dl-load.c b/elf/dl-load.c | 33 | diff --git a/elf/dl-load.c b/elf/dl-load.c |
34 | index 0c052e4..f45085a 100644 | 34 | index 6fb615e..ee3d1e6 100644 |
35 | --- a/elf/dl-load.c | 35 | --- a/elf/dl-load.c |
36 | +++ b/elf/dl-load.c | 36 | +++ b/elf/dl-load.c |
37 | @@ -2040,7 +2040,14 @@ _dl_map_object (struct link_map *loader, const char *name, | 37 | @@ -2094,6 +2094,14 @@ _dl_map_object (struct link_map *loader, const char *name, |
38 | fd = open_path (name, namelen, mode, | 38 | } |
39 | &loader->l_runpath_dirs, &realname, &fb, loader, | 39 | } |
40 | LA_SER_RUNPATH, &found_other_class); | 40 | |
41 | - | ||
42 | + /* try the default path. */ | 41 | + /* try the default path. */ |
43 | + if (fd == -1 | 42 | + if (fd == -1 |
44 | + && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL | 43 | + && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL |
@@ -50,7 +49,7 @@ index 0c052e4..f45085a 100644 | |||
50 | #ifdef USE_LDCONFIG | 49 | #ifdef USE_LDCONFIG |
51 | if (fd == -1 | 50 | if (fd == -1 |
52 | && (__glibc_likely ((mode & __RTLD_SECURE) == 0) | 51 | && (__glibc_likely ((mode & __RTLD_SECURE) == 0) |
53 | @@ -2099,14 +2106,6 @@ _dl_map_object (struct link_map *loader, const char *name, | 52 | @@ -2152,14 +2160,6 @@ _dl_map_object (struct link_map *loader, const char *name, |
54 | } | 53 | } |
55 | #endif | 54 | #endif |
56 | 55 | ||
@@ -66,5 +65,5 @@ index 0c052e4..f45085a 100644 | |||
66 | if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) | 65 | if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) |
67 | _dl_debug_printf ("\n"); | 66 | _dl_debug_printf ("\n"); |
68 | -- | 67 | -- |
69 | 2.1.4 | 68 | 2.6.4 |
70 | 69 | ||