summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-03 16:51:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-05 12:26:36 +0000
commitb0922ed9b3e4b4fcb06f5c8476762d6dbb59758f (patch)
tree98b566f545cfc023670240c926ebdbdf398111cb /meta/recipes-core/glibc/glibc
parenta242274d98e6f0f8d2aa21f778df690de7b42144 (diff)
downloadpoky-b0922ed9b3e4b4fcb06f5c8476762d6dbb59758f.tar.gz
glibc: Drop prelink patch
With the removal of prelink, we no longer need the glibc patch for it either. (From OE-Core rev: 7b1b5a7ac5f64fb04c9df7f77e1f65f8acde18a8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc')
-rw-r--r--meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch b/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
deleted file mode 100644
index fb0a609dbb..0000000000
--- a/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 50b605dece16606dd9d1c737e579c13725eab11d Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@windriver.com>
3Date: Thu, 18 Aug 2016 14:07:58 -0500
4Subject: [PATCH] elf/dl-deps.c: Make _dl_build_local_scope breadth first
5
6According to the ELF specification:
7
8When resolving symbolic references, the dynamic linker examines the symbol
9tables with a breadth-first search.
10
11This function was using a depth first search. By doing so the conflict
12resolution reported to the prelinker (when LD_TRACE_PRELINKING=1 is set)
13was incorrect. This caused problems when their were various circular
14dependencies between libraries. The problem usually manifested itself by
15the wrong IFUNC being executed.
16
17[BZ# 20488]
18
19Upstream-Status: Submitted [libc-alpha]
20
21Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
22---
23 elf/dl-deps.c | 14 ++++++++++----
24 1 file changed, 10 insertions(+), 4 deletions(-)
25
26diff --git a/elf/dl-deps.c b/elf/dl-deps.c
27index 087a49b212..c09f9334f2 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