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 | 12 |
1 files changed, 6 insertions, 6 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 19c1d9bf14..86234c9d2e 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 81346b2f7735698078d5bf919a78b6c0269d6fee Mon Sep 17 00:00:00 2001 | 1 | From bd91b60ce6ff01f49b173b6b45e23ce94911b2a6 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/25] nativesdk-glibc: Look for host system ld.so.cache as | 4 | Subject: [PATCH 01/27] 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] |
@@ -31,10 +31,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
31 | 1 file changed, 8 insertions(+), 8 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 c1b6d4ba0f..d7af9ebcbc 100644 | 34 | index 7554a99b5a..a73d11a62f 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 | @@ -2054,6 +2054,14 @@ _dl_map_object (struct link_map *loader, const char *name, | 37 | @@ -2007,6 +2007,14 @@ _dl_map_object (struct link_map *loader, const char *name, |
38 | } | 38 | } |
39 | } | 39 | } |
40 | 40 | ||
@@ -49,7 +49,7 @@ index c1b6d4ba0f..d7af9ebcbc 100644 | |||
49 | #ifdef USE_LDCONFIG | 49 | #ifdef USE_LDCONFIG |
50 | if (fd == -1 | 50 | if (fd == -1 |
51 | && (__glibc_likely ((mode & __RTLD_SECURE) == 0) | 51 | && (__glibc_likely ((mode & __RTLD_SECURE) == 0) |
52 | @@ -2112,14 +2120,6 @@ _dl_map_object (struct link_map *loader, const char *name, | 52 | @@ -2065,14 +2073,6 @@ _dl_map_object (struct link_map *loader, const char *name, |
53 | } | 53 | } |
54 | #endif | 54 | #endif |
55 | 55 | ||
@@ -65,5 +65,5 @@ index c1b6d4ba0f..d7af9ebcbc 100644 | |||
65 | if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) | 65 | if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) |
66 | _dl_debug_printf ("\n"); | 66 | _dl_debug_printf ("\n"); |
67 | -- | 67 | -- |
68 | 2.13.2 | 68 | 2.16.1 |
69 | 69 | ||