summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc/GLRO_dl_debug_mask.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/glibc/glibc/GLRO_dl_debug_mask.patch')
-rw-r--r--meta/recipes-core/glibc/glibc/GLRO_dl_debug_mask.patch529
1 files changed, 529 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/GLRO_dl_debug_mask.patch b/meta/recipes-core/glibc/glibc/GLRO_dl_debug_mask.patch
new file mode 100644
index 0000000000..e858bfaeda
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/GLRO_dl_debug_mask.patch
@@ -0,0 +1,529 @@
1Its controlled by __OPTION_EGLIBC_RTLD_DEBUG
2so we should use GLRO_dl_debug_mask
3
4Singed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Upstream-Status: Pending
7Index: git/elf/dl-open.c
8===================================================================
9--- git.orig/elf/dl-open.c 2014-08-27 05:03:59.732070587 +0000
10+++ git/elf/dl-open.c 2014-08-27 05:05:25.656070587 +0000
11@@ -147,7 +147,7 @@
12 ns->_ns_main_searchlist->r_list[new_nlist++] = map;
13
14 /* We modify the global scope. Report this. */
15- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES))
16+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_SCOPES))
17 _dl_debug_printf ("\nadd %s [%lu] to global scope\n",
18 map->l_name, map->l_ns);
19 }
20@@ -243,7 +243,7 @@
21 if (__glibc_unlikely (new->l_searchlist.r_list != NULL))
22 {
23 /* Let the user know about the opencount. */
24- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES))
25+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES))
26 _dl_debug_printf ("opening file=%s [%lu]; direct_opencount=%u\n\n",
27 new->l_name, new->l_ns, new->l_direct_opencount);
28
29@@ -294,7 +294,7 @@
30 LIBC_PROBE (map_complete, 3, args->nsid, r, new);
31
32 /* Print scope information. */
33- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES))
34+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_SCOPES))
35 _dl_show_scope (new, 0);
36
37 /* Only do lazy relocation if `LD_BIND_NOW' is not set. */
38@@ -511,7 +511,7 @@
39 }
40
41 /* Print scope information. */
42- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES))
43+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_SCOPES))
44 _dl_show_scope (imap, from_scope);
45 }
46
47@@ -584,7 +584,7 @@
48 #endif
49
50 /* Let the user know about the opencount. */
51- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES))
52+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES))
53 _dl_debug_printf ("opening file=%s [%lu]; direct_opencount=%u\n\n",
54 new->l_name, new->l_ns, new->l_direct_opencount);
55 }
56Index: git/elf/rtld.c
57===================================================================
58--- git.orig/elf/rtld.c 2014-08-27 05:03:59.732070587 +0000
59+++ git/elf/rtld.c 2014-08-27 05:12:33.812070587 +0000
60@@ -321,7 +321,7 @@
61 }
62 #endif
63
64- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_STATISTICS))
65+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_STATISTICS))
66 {
67 #ifndef HP_TIMING_NONAVAIL
68 print_statistics (&rtld_total_time);
69@@ -1699,7 +1699,7 @@
70 after relocation. */
71 struct link_map *l;
72
73- if (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)
74+ if (GLRO_dl_debug_mask & DL_DEBUG_PRELINK)
75 {
76 struct r_scope_elem *scope = &main_map->l_searchlist;
77
78@@ -1729,7 +1729,7 @@
79 _dl_printf ("\n");
80 }
81 }
82- else if (GLRO(dl_debug_mask) & DL_DEBUG_UNUSED)
83+ else if (GLRO_dl_debug_mask & DL_DEBUG_UNUSED)
84 {
85 /* Look through the dependencies of the main executable
86 and determine which of them is not actually
87@@ -1837,7 +1837,7 @@
88 }
89 }
90
91- if ((GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)
92+ if ((GLRO_dl_debug_mask & DL_DEBUG_PRELINK)
93 && rtld_multiple_ref)
94 {
95 /* Mark the link map as not yet relocated again. */
96@@ -1970,7 +1970,7 @@
97 if (r_list == r_listend && liblist == liblistend)
98 prelinked = true;
99
100- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
101+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS))
102 _dl_debug_printf ("\nprelink checking: %s\n",
103 prelinked ? "ok" : "failed");
104 }
105@@ -1988,7 +1988,7 @@
106 GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
107
108 /* Print scope information. */
109- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES))
110+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_SCOPES))
111 {
112 _dl_debug_printf ("\nInitial object scopes\n");
113
114@@ -2262,7 +2262,7 @@
115 if (debopts[cnt].len == len
116 && memcmp (dl_debug, debopts[cnt].name, len) == 0)
117 {
118- GLRO(dl_debug_mask) |= debopts[cnt].mask;
119+ GLRO_dl_debug_mask |= debopts[cnt].mask;
120 any_debug = 1;
121 break;
122 }
123@@ -2283,7 +2283,7 @@
124 ++dl_debug;
125 }
126
127- if (GLRO(dl_debug_mask) & DL_DEBUG_UNUSED)
128+ if (GLRO_dl_debug_mask & DL_DEBUG_UNUSED)
129 {
130 /* In order to get an accurate picture of whether a particular
131 DT_NEEDED entry is actually used we have to process both
132@@ -2291,7 +2291,7 @@
133 GLRO(dl_lazy) = 0;
134 }
135
136- if (GLRO(dl_debug_mask) & DL_DEBUG_HELP)
137+ if (GLRO_dl_debug_mask & DL_DEBUG_HELP)
138 {
139 size_t cnt;
140
141@@ -2490,7 +2490,7 @@
142 {
143 mode = trace;
144 GLRO(dl_verbose) = 1;
145- GLRO(dl_debug_mask) |= DL_DEBUG_PRELINK;
146+ GLRO_dl_debug_mask |= DL_DEBUG_PRELINK;
147 GLRO(dl_trace_prelink) = &envline[17];
148 }
149 break;
150@@ -2537,7 +2537,7 @@
151 if (__access ("/etc/suid-debug", F_OK) != 0)
152 {
153 unsetenv ("MALLOC_CHECK_");
154- GLRO(dl_debug_mask) = 0;
155+ GLRO_dl_debug_mask = 0;
156 }
157
158 if (mode != normal)
159Index: git/elf/dl-lookup.c
160===================================================================
161--- git.orig/elf/dl-lookup.c 2014-08-27 05:03:59.732070587 +0000
162+++ git/elf/dl-lookup.c 2014-08-27 05:13:07.644070587 +0000
163@@ -300,7 +300,7 @@
164 hash table. */
165 if (__glibc_unlikely (tab->size))
166 {
167- assert (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK);
168+ assert (GLRO_dl_debug_mask & DL_DEBUG_PRELINK);
169 goto success;
170 }
171 #endif
172@@ -375,7 +375,7 @@
173 continue;
174
175 /* Print some debugging info if wanted. */
176- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SYMBOLS))
177+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_SYMBOLS))
178 _dl_debug_printf ("symbol=%s; lookup in file=%s [%lu]\n",
179 undef_name, DSO_FILENAME (map->l_name),
180 map->l_ns);
181@@ -698,7 +698,7 @@
182 }
183
184 /* Display information if we are debugging. */
185- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES))
186+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES))
187 _dl_debug_printf ("\
188 \nfile=%s [%lu]; needed by %s [%lu] (relocation dependency)\n\n",
189 DSO_FILENAME (map->l_name),
190@@ -802,7 +802,7 @@
191 {
192 if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
193 && skip_map == NULL
194- && !(GLRO(dl_debug_mask) & DL_DEBUG_UNUSED))
195+ && !(GLRO_dl_debug_mask & DL_DEBUG_UNUSED))
196 {
197 /* We could find no value for a strong reference. */
198 const char *reference_name = undef_map ? undef_map->l_name : "";
199@@ -873,7 +873,7 @@
200 if (__glibc_unlikely (current_value.m->l_used == 0))
201 current_value.m->l_used = 1;
202
203- if (__glibc_unlikely (GLRO(dl_debug_mask)
204+ if (__glibc_unlikely (GLRO_dl_debug_mask
205 & (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK)))
206 _dl_debug_bindings (undef_name, undef_map, ref,
207 &current_value, version, type_class, protected);
208@@ -938,7 +938,7 @@
209 {
210 const char *reference_name = undef_map->l_name;
211
212- if (GLRO(dl_debug_mask) & DL_DEBUG_BINDINGS)
213+ if (GLRO_dl_debug_mask & DL_DEBUG_BINDINGS)
214 {
215 _dl_debug_printf ("binding file %s [%lu] to %s [%lu]: %s symbol `%s'",
216 DSO_FILENAME (reference_name),
217@@ -952,7 +952,7 @@
218 _dl_debug_printf_c ("\n");
219 }
220 #ifdef SHARED
221- if (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)
222+ if (GLRO_dl_debug_mask & DL_DEBUG_PRELINK)
223 {
224 int conflict = 0;
225 struct sym_val val = { NULL, NULL };
226Index: git/elf/get-dynamic-info.h
227===================================================================
228--- git.orig/elf/get-dynamic-info.h 2014-08-27 05:03:59.732070587 +0000
229+++ git/elf/get-dynamic-info.h 2014-08-27 05:03:59.728070587 +0000
230@@ -157,7 +157,7 @@
231 them. Therefore to avoid breaking existing applications the
232 best we can do is add a warning during debugging with the
233 intent of notifying the user of the problem. */
234- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)
235+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0)
236 && l->l_flags_1 & ~DT_1_SUPPORTED_MASK)
237 _dl_debug_printf ("\nWARNING: Unsupported flag value(s) of 0x%x in DT_FLAGS_1.\n",
238 l->l_flags_1 & ~DT_1_SUPPORTED_MASK);
239Index: git/csu/libc-start.c
240===================================================================
241--- git.orig/csu/libc-start.c 2014-08-27 04:59:01.412070587 +0000
242+++ git/csu/libc-start.c 2014-08-27 05:09:28.936070587 +0000
243@@ -238,7 +238,7 @@
244
245 /* Call the initializer of the program, if any. */
246 #ifdef SHARED
247- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0))
248+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_IMPCALLS, 0))
249 GLRO(dl_debug_printf) ("\ninitialize program: %s\n\n", argv[0]);
250 #endif
251 if (init)
252@@ -261,7 +261,7 @@
253 #endif
254
255 #ifdef SHARED
256- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS))
257+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_IMPCALLS))
258 GLRO(dl_debug_printf) ("\ntransferring control: %s\n\n", argv[0]);
259 #endif
260
261Index: git/elf/dl-cache.c
262===================================================================
263--- git.orig/elf/dl-cache.c 2014-08-27 04:59:01.568070587 +0000
264+++ git/elf/dl-cache.c 2014-08-27 05:10:14.384070587 +0000
265@@ -187,7 +187,7 @@
266 const char *best;
267
268 /* Print a message if the loading of libs is traced. */
269- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
270+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS))
271 _dl_debug_printf (" search cache=%s\n", LD_SO_CACHE);
272
273 if (cache == NULL)
274@@ -285,7 +285,7 @@
275 }
276
277 /* Print our result if wanted. */
278- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0)
279+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, 0)
280 && best != NULL)
281 _dl_debug_printf (" trying file=%s\n", best);
282
283Index: git/elf/dl-close.c
284===================================================================
285--- git.orig/elf/dl-close.c 2014-08-27 04:59:01.568070587 +0000
286+++ git/elf/dl-close.c 2014-08-27 05:10:26.456070587 +0000
287@@ -125,7 +125,7 @@
288 dl_close_state = rerun;
289
290 /* There are still references to this object. Do nothing more. */
291- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES))
292+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES))
293 _dl_debug_printf ("\nclosing file=%s; direct_opencount=%u\n",
294 map->l_name, map->l_direct_opencount);
295
296@@ -257,7 +257,7 @@
297 if (imap->l_init_called)
298 {
299 /* When debugging print a message first. */
300- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS,
301+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_IMPCALLS,
302 0))
303 _dl_debug_printf ("\ncalling fini: %s [%lu]\n\n",
304 imap->l_name, nsid);
305@@ -664,7 +664,7 @@
306 free (imap->l_reldeps);
307
308 /* Print debugging message. */
309- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES))
310+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES))
311 _dl_debug_printf ("\nfile=%s [%lu]; destroying link map\n",
312 imap->l_name, imap->l_ns);
313
314Index: git/elf/dl-conflict.c
315===================================================================
316--- git.orig/elf/dl-conflict.c 2014-08-27 04:59:01.568070587 +0000
317+++ git/elf/dl-conflict.c 2014-08-27 05:10:37.652070587 +0000
318@@ -32,7 +32,7 @@
319 ElfW(Rela) *conflictend)
320 {
321 #if ! ELF_MACHINE_NO_RELA
322- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_RELOC))
323+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_RELOC))
324 _dl_debug_printf ("\nconflict processing: %s\n", DSO_FILENAME (l->l_name));
325
326 {
327Index: git/elf/dl-deps.c
328===================================================================
329--- git.orig/elf/dl-deps.c 2014-08-27 04:59:01.568070587 +0000
330+++ git/elf/dl-deps.c 2014-08-27 05:10:48.260070587 +0000
331@@ -127,7 +127,7 @@
332 else \
333 { \
334 /* This is for DT_AUXILIARY. */ \
335- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) \
336+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)) \
337 _dl_debug_printf (N_("\
338 cannot load auxiliary `%s' because of empty dynamic string token " \
339 "substitution\n"), __str); \
340@@ -303,7 +303,7 @@
341 args.name = name;
342
343 /* Say that we are about to load an auxiliary library. */
344- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS,
345+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS,
346 0))
347 _dl_debug_printf ("load auxiliary object=%s"
348 " requested by file=%s\n",
349@@ -520,7 +520,7 @@
350 runp->map->l_reserved = 0;
351 }
352
353- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK, 0) != 0
354+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_PRELINK, 0) != 0
355 && map == GL(dl_ns)[LM_ID_BASE]._ns_loaded)
356 {
357 /* If we are to compute conflicts, we have to build local scope
358Index: git/elf/dl-error.c
359===================================================================
360--- git.orig/elf/dl-error.c 2014-08-27 04:59:01.568070587 +0000
361+++ git/elf/dl-error.c 2014-08-27 05:11:06.752070587 +0000
362@@ -139,7 +139,7 @@
363 _dl_signal_cerror (int errcode, const char *objname, const char *occation,
364 const char *errstring)
365 {
366- if (__builtin_expect (GLRO(dl_debug_mask)
367+ if (__builtin_expect (GLRO_dl_debug_mask
368 & ~(DL_DEBUG_STATISTICS|DL_DEBUG_PRELINK), 0))
369 _dl_debug_printf ("%s: error: %s: %s (%s)\n", objname, occation,
370 errstring, receiver ? "continued" : "fatal");
371Index: git/elf/dl-fini.c
372===================================================================
373--- git.orig/elf/dl-fini.c 2014-08-27 04:59:01.568070587 +0000
374+++ git/elf/dl-fini.c 2014-08-27 05:11:17.544070587 +0000
375@@ -234,7 +234,7 @@
376 || l->l_info[DT_FINI] != NULL)
377 {
378 /* When debugging print a message first. */
379- if (__builtin_expect (GLRO(dl_debug_mask)
380+ if (__builtin_expect (GLRO_dl_debug_mask
381 & DL_DEBUG_IMPCALLS, 0))
382 _dl_debug_printf ("\ncalling fini: %s [%lu]\n\n",
383 DSO_FILENAME (l->l_name),
384@@ -286,7 +286,7 @@
385 goto again;
386 }
387
388- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_STATISTICS))
389+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_STATISTICS))
390 _dl_debug_printf ("\nruntime linker statistics:\n"
391 " final number of relocations: %lu\n"
392 "final number of relocations from cache: %lu\n",
393Index: git/elf/dl-init.c
394===================================================================
395--- git.orig/elf/dl-init.c 2014-08-27 04:59:01.568070587 +0000
396+++ git/elf/dl-init.c 2014-08-27 05:11:28.372070587 +0000
397@@ -52,7 +52,7 @@
398 return;
399
400 /* Print a debug message if wanted. */
401- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS))
402+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_IMPCALLS))
403 _dl_debug_printf ("\ncalling init: %s\n\n",
404 DSO_FILENAME (l->l_name));
405
406@@ -102,7 +102,7 @@
407 ElfW(Addr) *addrs;
408 unsigned int cnt;
409
410- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS))
411+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_IMPCALLS))
412 _dl_debug_printf ("\ncalling preinit: %s\n\n",
413 DSO_FILENAME (main_map->l_name));
414
415Index: git/elf/dl-load.c
416===================================================================
417--- git.orig/elf/dl-load.c 2014-08-27 04:59:01.572070587 +0000
418+++ git/elf/dl-load.c 2014-08-27 05:11:41.156070587 +0000
419@@ -957,7 +957,7 @@
420 }
421
422 /* Print debugging message. */
423- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES))
424+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES))
425 _dl_debug_printf ("file=%s [%lu]; generating link map\n", name, nsid);
426
427 /* This is the ELF header. We read it in `open_verify'. */
428@@ -1361,7 +1361,7 @@
429
430 l->l_entry += l->l_addr;
431
432- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES))
433+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES))
434 _dl_debug_printf ("\
435 dynamic: 0x%0*lx base: 0x%0*lx size: 0x%0*Zx\n\
436 entry: 0x%0*lx phdr: 0x%0*lx phnum: %*u\n\n",
437@@ -1787,7 +1787,7 @@
438
439 /* If we are debugging the search for libraries print the path
440 now if it hasn't happened now. */
441- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)
442+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)
443 && current_what != this_dir->what)
444 {
445 current_what = this_dir->what;
446@@ -1808,7 +1808,7 @@
447 - buf);
448
449 /* Print name we try if this is wanted. */
450- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
451+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS))
452 _dl_debug_printf (" trying file=%s\n", buf);
453
454 fd = open_verify (buf, fbp, loader, whatcode, mode,
455@@ -1953,7 +1953,7 @@
456 }
457
458 /* Display information if we are debugging. */
459- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES)
460+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES)
461 && loader != NULL)
462 _dl_debug_printf ((mode & __RTLD_CALLMAP) == 0
463 ? "\nfile=%s [%lu]; needed by %s [%lu]\n"
464@@ -1995,7 +1995,7 @@
465
466 size_t namelen = strlen (name) + 1;
467
468- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
469+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS))
470 _dl_debug_printf ("find library=%s [%lu]; searching\n", name, nsid);
471
472 fd = -1;
473@@ -2122,7 +2122,7 @@
474 &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
475
476 /* Add another newline when we are tracing the library loading. */
477- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
478+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS))
479 _dl_debug_printf ("\n");
480 }
481 else
482@@ -2155,7 +2155,7 @@
483 if (__glibc_unlikely (fd == -1))
484 {
485 if (trace_mode
486- && __glibc_likely ((GLRO(dl_debug_mask) & DL_DEBUG_PRELINK) == 0))
487+ && __glibc_likely ((GLRO_dl_debug_mask & DL_DEBUG_PRELINK) == 0))
488 {
489 /* We haven't found an appropriate library. But since we
490 are only interested in the list of libraries this isn't
491Index: git/elf/dl-object.c
492===================================================================
493--- git.orig/elf/dl-object.c 2014-08-27 04:59:01.572070587 +0000
494+++ git/elf/dl-object.c 2014-08-27 05:11:51.756070587 +0000
495@@ -98,7 +98,7 @@
496 new->l_type = type;
497 /* If we set the bit now since we know it is never used we avoid
498 dirtying the cache line later. */
499- if ((GLRO(dl_debug_mask) & DL_DEBUG_UNUSED) == 0)
500+ if ((GLRO_dl_debug_mask & DL_DEBUG_UNUSED) == 0)
501 new->l_used = 1;
502 new->l_loader = loader;
503 #if NO_TLS_OFFSET != 0
504Index: git/elf/dl-reloc.c
505===================================================================
506--- git.orig/elf/dl-reloc.c 2014-08-27 04:59:01.572070587 +0000
507+++ git/elf/dl-reloc.c 2014-08-27 05:12:07.056070587 +0000
508@@ -183,7 +183,7 @@
509 && __builtin_expect (l->l_info[DT_BIND_NOW] != NULL, 0))
510 lazy = 0;
511
512- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_RELOC))
513+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_RELOC))
514 _dl_debug_printf ("\nrelocation processing: %s%s\n",
515 DSO_FILENAME (l->l_name), lazy ? " (lazy)" : "");
516
517Index: git/elf/dl-version.c
518===================================================================
519--- git.orig/elf/dl-version.c 2014-08-27 04:59:01.608070587 +0000
520+++ git/elf/dl-version.c 2014-08-27 05:12:19.568070587 +0000
521@@ -82,7 +82,7 @@
522 int result = 0;
523
524 /* Display information about what we are doing while debugging. */
525- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_VERSIONS))
526+ if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_VERSIONS))
527 _dl_debug_printf ("\
528 checking for version `%s' in file %s [%lu] required by file %s [%lu]\n",
529 string, DSO_FILENAME (map->l_name),
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-19 07:43:42 +0000