diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-01-12 12:20:50 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-23 12:05:22 +0000 |
commit | 49fec741ebd62e6a4157e364321b9fec8931825b (patch) | |
tree | 305062cbc3ae0a6ae0bc510bfd05b0c1cb0c3999 /meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch | |
parent | f4c96ea8292e9641214c32b5858d7653651b054f (diff) | |
download | poky-49fec741ebd62e6a4157e364321b9fec8931825b.tar.gz |
glibc: Upgrade to 2.25 snapshot
glibc 2.25 release is in freeze stage now
(From OE-Core rev: b72dbf70646e9dca0dbb5b22bc70d919e6eb8bdc)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.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-.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 ca3375805d..0553f8a472 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 7e11aafc3a7cb873b3f648740c8acd379597e4d1 Mon Sep 17 00:00:00 2001 | 1 | From 2727e58d1d269994de17cadb12195001b14585e7 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/26] 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 c0d6249..2c73105 100644 | 34 | index 51fb0d0..f503dbc 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 | @@ -2094,6 +2094,14 @@ _dl_map_object (struct link_map *loader, const char *name, | 37 | @@ -2054,6 +2054,14 @@ _dl_map_object (struct link_map *loader, const char *name, |
38 | } | 38 | } |
39 | } | 39 | } |
40 | 40 | ||
@@ -49,7 +49,7 @@ index c0d6249..2c73105 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 | @@ -2152,14 +2160,6 @@ _dl_map_object (struct link_map *loader, const char *name, | 52 | @@ -2112,14 +2120,6 @@ _dl_map_object (struct link_map *loader, const char *name, |
53 | } | 53 | } |
54 | #endif | 54 | #endif |
55 | 55 | ||
@@ -65,5 +65,5 @@ index c0d6249..2c73105 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.8.2 | 68 | 2.10.2 |
69 | 69 | ||