summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch')
-rw-r--r--meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch14
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
index 4cdc8354b6..743994f2db 100644
--- a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
+++ b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
@@ -1,7 +1,8 @@
1From 6987ad183770cb56680ccc4f6ea065a04f31ccb6 Mon Sep 17 00:00:00 2001 1From de4322ef6d4dc9fc3ee9b69af1c10edbc64a66a3 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] nativesdk-glibc: Look for host system ld.so.cache as well 4Subject: [PATCH 03/29] nativesdk-glibc: Look for host system ld.so.cache as
5 well
5 6
6Upstream-Status: Inappropriate [embedded specific] 7Upstream-Status: Inappropriate [embedded specific]
7 8
@@ -30,10 +31,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
30 1 file changed, 8 insertions(+), 8 deletions(-) 31 1 file changed, 8 insertions(+), 8 deletions(-)
31 32
32diff --git a/elf/dl-load.c b/elf/dl-load.c 33diff --git a/elf/dl-load.c b/elf/dl-load.c
33index a6b80f9395..3226f2e531 100644 34index e39980fb19..565b039b23 100644
34--- a/elf/dl-load.c 35--- a/elf/dl-load.c
35+++ b/elf/dl-load.c 36+++ b/elf/dl-load.c
36@@ -2073,6 +2073,14 @@ _dl_map_object (struct link_map *loader, const char *name, 37@@ -2160,6 +2160,14 @@ _dl_map_object (struct link_map *loader, const char *name,
37 } 38 }
38 } 39 }
39 40
@@ -48,7 +49,7 @@ index a6b80f9395..3226f2e531 100644
48 #ifdef USE_LDCONFIG 49 #ifdef USE_LDCONFIG
49 if (fd == -1 50 if (fd == -1
50 && (__glibc_likely ((mode & __RTLD_SECURE) == 0) 51 && (__glibc_likely ((mode & __RTLD_SECURE) == 0)
51@@ -2131,14 +2139,6 @@ _dl_map_object (struct link_map *loader, const char *name, 52@@ -2218,14 +2226,6 @@ _dl_map_object (struct link_map *loader, const char *name,
52 } 53 }
53 #endif 54 #endif
54 55
@@ -63,3 +64,6 @@ index a6b80f9395..3226f2e531 100644
63 /* Add another newline when we are tracing the library loading. */ 64 /* Add another newline when we are tracing the library loading. */
64 if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) 65 if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
65 _dl_debug_printf ("\n"); 66 _dl_debug_printf ("\n");
67--
682.27.0
69