summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-02 21:37:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-21 09:32:43 +0000
commit91a1baaf57153a86b7e14318c9d36e1cc38e3077 (patch)
tree51bb1d2724bbc5d3b98d9412de9cab8fb7b02524 /meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
parentc1f9507c69cac8cc28fec837a4bbb070c52a8a39 (diff)
downloadpoky-91a1baaf57153a86b7e14318c9d36e1cc38e3077.tar.gz
glibc: Upgrade to 2.23
Drop kconfig and options-group support Forward port cross-localedef support Assume ssp support in libc when building gcc-initial (From OE-Core rev: 9c3d461c4d54d684b38ec4c038a1c3c2fb9923f0) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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-.patch23
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 @@
1From 0876fea1b5b26da84f298714a2e23ba696607dba Mon Sep 17 00:00:00 2001 1From 66d04e2cd8badb0984050e4e9f2732f47151fbbf Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:48:24 +0000 3Date: Wed, 18 Mar 2015 01:48:24 +0000
4Subject: [PATCH 01/27] nativesdk-glibc: Look for host system ld.so.cache as 4Subject: [PATCH 01/24] nativesdk-glibc: Look for host system ld.so.cache as
5 well 5 well
6 6
7Upstream-Status: Inappropriate [embedded specific] 7Upstream-Status: Inappropriate [embedded specific]
@@ -27,18 +27,17 @@ RP 14/10/2010
27 27
28Signed-off-by: Khem Raj <raj.khem@gmail.com> 28Signed-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
33diff --git a/elf/dl-load.c b/elf/dl-load.c 33diff --git a/elf/dl-load.c b/elf/dl-load.c
34index 0c052e4..f45085a 100644 34index 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--
692.1.4 682.6.4
70 69