glibc: Backport hotfixes from RHEL6.
[people/teissler/ipfire-2.x.git] / src / patches / glibc / glibc-rh886968.patch
1 diff -Nrup a/elf/dl-load.c b/elf/dl-load.c
2 --- a/elf/dl-load.c 2013-01-10 08:57:20.098898830 -0500
3 +++ b/elf/dl-load.c 2013-01-10 12:04:48.155962895 -0500
4 @@ -819,7 +819,7 @@ lose (int code, int fd, const char *name
5 {
6 r->r_state = RT_CONSISTENT;
7 _dl_debug_state ();
8 - LIBC_PROBE (rtld_map_complete, 2, nsid, r);
9 + LIBC_PROBE (rtld_map_complete, 3, nsid, r, NULL);
10 }
11
12 _dl_signal_error (code, name, NULL, msg);
13 diff -Nrup a/elf/dl-open.c b/elf/dl-open.c
14 --- a/elf/dl-open.c 2013-01-10 08:57:19.917897417 -0500
15 +++ b/elf/dl-open.c 2013-01-10 12:06:04.644775710 -0500
16 @@ -298,7 +298,7 @@ dl_open_worker (void *a)
17 struct r_debug *r = _dl_debug_initialize (0, args->nsid);
18 r->r_state = RT_CONSISTENT;
19 _dl_debug_state ();
20 - LIBC_PROBE (rtld_map_complete, 2, args->nsid, r);
21 + LIBC_PROBE (rtld_map_complete, 3, args->nsid, r, new);
22
23 /* Only do lazy relocation if `LD_BIND_NOW' is not set. */
24 int reloc_mode = mode & __RTLD_AUDIT;
25 @@ -472,7 +472,7 @@ TLS generation counter wrapped! Please
26
27 /* Notify the debugger all new objects have been relocated. */
28 if (relocation_in_progress)
29 - LIBC_PROBE (rtld_reloc_complete, 2, args->nsid, r);
30 + LIBC_PROBE (rtld_reloc_complete, 3, args->nsid, r, new);
31
32 /* Run the initializer functions of new objects. */
33 _dl_init (new, args->argc, args->argv, args->env);