]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/glibc/glibc-rh808337.patch
lcdproc: Update to 0.5.7
[ipfire-2.x.git] / src / patches / glibc / glibc-rh808337.patch
1 commit 6a5ee1029b3966c5ae9adaaa881e255b2880f511
2 Author: Ulrich Drepper <drepper@gmail.com>
3 Date: Sun Mar 6 00:01:50 2011 -0500
4
5 Fix loading first object along a path when tracing.
6
7 diff --git a/elf/dl-load.c b/elf/dl-load.c
8 index 1ad16a0..f866066 100644
9 --- a/elf/dl-load.c
10 +++ b/elf/dl-load.c
11 @@ -2111,7 +2111,9 @@ _dl_map_object (struct link_map *loader, const char *name,
12 {
13 #ifdef SHARED
14 // XXX Correct to unconditionally default to namespace 0?
15 - l = loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded;
16 + l = (loader
17 + ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded
18 + ?: &GL(dl_rtld_map));
19 #else
20 l = loader;
21 #endif