diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-14 18:23:20 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-11 15:57:08 +0100 |
commit | 1f4f343ff290019987f25d06ea0c00d495660919 (patch) | |
tree | f139bbba8e209a1094a0fc14d446a4e0aba9e9be /meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch | |
parent | 715b05e9e193200c2e41fe4881b2ab1fdb639cc2 (diff) | |
download | poky-1f4f343ff290019987f25d06ea0c00d495660919.tar.gz |
glibc: Upgrade to 2.25.90
Eventually it will be released as 2.26 final
(From OE-Core rev: 5a58883258206893d15990953c8691b05473eecb)
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/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch b/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch new file mode 100644 index 0000000000..0b59352536 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From a784742739c90eea0d4ccbbd073a067d55ca95e8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Hatle <mark.hatle@windriver.com> | ||
3 | Date: Thu, 18 Aug 2016 14:07:58 -0500 | ||
4 | Subject: [PATCH 24/25] elf/dl-deps.c: Make _dl_build_local_scope breadth first | ||
5 | |||
6 | According to the ELF specification: | ||
7 | |||
8 | When resolving symbolic references, the dynamic linker examines the symbol | ||
9 | tables with a breadth-first search. | ||
10 | |||
11 | This function was using a depth first search. By doing so the conflict | ||
12 | resolution reported to the prelinker (when LD_TRACE_PRELINKING=1 is set) | ||
13 | was incorrect. This caused problems when their were various circular | ||
14 | dependencies between libraries. The problem usually manifested itself by | ||
15 | the wrong IFUNC being executed. | ||
16 | |||
17 | [BZ# 20488] | ||
18 | |||
19 | Upstream-Status: Submitted [libc-alpha] | ||
20 | |||
21 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
22 | --- | ||
23 | elf/dl-deps.c | 14 ++++++++++---- | ||
24 | 1 file changed, 10 insertions(+), 4 deletions(-) | ||
25 | |||
26 | diff --git a/elf/dl-deps.c b/elf/dl-deps.c | ||
27 | index 1b8bac6593..c616808f31 100644 | ||
28 | --- a/elf/dl-deps.c | ||
29 | +++ b/elf/dl-deps.c | ||
30 | @@ -73,13 +73,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map) | ||
31 | { | ||
32 | struct link_map **p = list; | ||
33 | struct link_map **q; | ||
34 | + struct link_map **r; | ||
35 | |||
36 | *p++ = map; | ||
37 | map->l_reserved = 1; | ||
38 | - if (map->l_initfini) | ||
39 | - for (q = map->l_initfini + 1; *q; ++q) | ||
40 | - if (! (*q)->l_reserved) | ||
41 | - p += _dl_build_local_scope (p, *q); | ||
42 | + | ||
43 | + for (r = list; r < p; ++r) | ||
44 | + if ((*r)->l_initfini) | ||
45 | + for (q = (*r)->l_initfini + 1; *q; ++q) | ||
46 | + if (! (*q)->l_reserved) | ||
47 | + { | ||
48 | + *p++ = *q; | ||
49 | + (*q)->l_reserved = 1; | ||
50 | + } | ||
51 | return p - list; | ||
52 | } | ||
53 | |||
54 | -- | ||
55 | 2.13.2 | ||
56 | |||