Annotation of /trunk/glibc/patches/glibc-2.15-vdso.patch
Parent Directory | Revision Log
Revision 1806 -
(hide annotations)
(download)
Tue Jun 12 12:33:27 2012 UTC (12 years, 3 months ago) by niro
File size: 1449 byte(s)
Tue Jun 12 12:33:27 2012 UTC (12 years, 3 months ago) by niro
File size: 1449 byte(s)
-added patches for 2.15-r1
1 | niro | 1806 | diff --git a/elf/Makefile b/elf/Makefile |
2 | index 8234ba7..25ffc57 100644 | ||
3 | --- a/elf/Makefile | ||
4 | +++ b/elf/Makefile | ||
5 | @@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so | ||
6 | $(objpfx)tst-relsort1mod2.so: $(libm) | ||
7 | $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \ | ||
8 | $(objpfx)tst-relsort1mod2.so | ||
9 | + | ||
10 | +tests: $(objpfx)tst-unused-dep.out | ||
11 | + | ||
12 | +$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so | ||
13 | + LD_TRACE_LOADED_OBJECTS=1 \ | ||
14 | + LD_DEBUG=unused \ | ||
15 | + LD_PRELOAD= \ | ||
16 | + $(elf-objpfx)${rtld-installed-name} \ | ||
17 | + --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \ | ||
18 | + $< > $@ | ||
19 | + cmp $@ /dev/null > /dev/null | ||
20 | diff --git a/elf/rtld.c b/elf/rtld.c | ||
21 | index 2e4f97f..3e15447 100644 | ||
22 | --- a/elf/rtld.c | ||
23 | +++ b/elf/rtld.c | ||
24 | @@ -1,5 +1,5 @@ | ||
25 | /* Run time dynamic linker. | ||
26 | - Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc. | ||
27 | + Copyright (C) 1995-2012 Free Software Foundation, Inc. | ||
28 | This file is part of the GNU C Library. | ||
29 | |||
30 | The GNU C Library is free software; you can redistribute it and/or | ||
31 | @@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\ | ||
32 | _dl_setup_hash (l); | ||
33 | l->l_relocated = 1; | ||
34 | |||
35 | + /* The vDSO is always used. */ | ||
36 | + l->l_used = 1; | ||
37 | + | ||
38 | /* Initialize l_local_scope to contain just this map. This allows | ||
39 | the use of dl_lookup_symbol_x to resolve symbols within the vdso. | ||
40 | So we create a single entry list pointing to l_real as its only |