Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From ba069b3107f5ad200c4ab95e69cf368e2353b00a Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 18 Mar 2015 00:46:50 +0000 |
| 4 | Subject: [PATCH 26/27] eglibc: dl_debug_mask is controlled by |
| 5 | __OPTION_EGLIBC_RTLD_DEBUG |
| 6 | |
| 7 | use GLRO_dl_debug_mask |
| 8 | |
| 9 | Singed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | --- |
| 13 | csu/libc-start.c | 4 ++-- |
| 14 | elf/dl-cache.c | 4 ++-- |
| 15 | elf/dl-close.c | 6 +++--- |
| 16 | elf/dl-conflict.c | 2 +- |
| 17 | elf/dl-deps.c | 6 +++--- |
| 18 | elf/dl-error.c | 2 +- |
| 19 | elf/dl-fini.c | 4 ++-- |
| 20 | elf/dl-init.c | 4 ++-- |
| 21 | elf/dl-load.c | 16 ++++++++-------- |
| 22 | elf/dl-lookup.c | 14 +++++++------- |
| 23 | elf/dl-object.c | 2 +- |
| 24 | elf/dl-open.c | 10 +++++----- |
| 25 | elf/dl-reloc.c | 2 +- |
| 26 | elf/dl-version.c | 2 +- |
| 27 | elf/get-dynamic-info.h | 2 +- |
| 28 | elf/rtld.c | 22 +++++++++++----------- |
| 29 | 16 files changed, 51 insertions(+), 51 deletions(-) |
| 30 | |
| 31 | diff --git a/csu/libc-start.c b/csu/libc-start.c |
| 32 | index 0afa7c0..2151fb6 100644 |
| 33 | --- a/csu/libc-start.c |
| 34 | +++ b/csu/libc-start.c |
| 35 | @@ -238,7 +238,7 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), |
| 36 | |
| 37 | /* Call the initializer of the program, if any. */ |
| 38 | #ifdef SHARED |
| 39 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0)) |
| 40 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_IMPCALLS, 0)) |
| 41 | GLRO(dl_debug_printf) ("\ninitialize program: %s\n\n", argv[0]); |
| 42 | #endif |
| 43 | if (init) |
| 44 | @@ -261,7 +261,7 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), |
| 45 | #endif |
| 46 | |
| 47 | #ifdef SHARED |
| 48 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS)) |
| 49 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_IMPCALLS)) |
| 50 | GLRO(dl_debug_printf) ("\ntransferring control: %s\n\n", argv[0]); |
| 51 | #endif |
| 52 | |
| 53 | diff --git a/elf/dl-cache.c b/elf/dl-cache.c |
| 54 | index 862f1d8..dab9c51 100644 |
| 55 | --- a/elf/dl-cache.c |
| 56 | +++ b/elf/dl-cache.c |
| 57 | @@ -194,7 +194,7 @@ _dl_load_cache_lookup (const char *name) |
| 58 | const char *best; |
| 59 | |
| 60 | /* Print a message if the loading of libs is traced. */ |
| 61 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) |
| 62 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)) |
| 63 | _dl_debug_printf (" search cache=%s\n", LD_SO_CACHE); |
| 64 | |
| 65 | if (cache == NULL) |
| 66 | @@ -292,7 +292,7 @@ _dl_load_cache_lookup (const char *name) |
| 67 | } |
| 68 | |
| 69 | /* Print our result if wanted. */ |
| 70 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0) |
| 71 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, 0) |
| 72 | && best != NULL) |
| 73 | _dl_debug_printf (" trying file=%s\n", best); |
| 74 | |
| 75 | diff --git a/elf/dl-close.c b/elf/dl-close.c |
| 76 | index c897247..b1b4bd5 100644 |
| 77 | --- a/elf/dl-close.c |
| 78 | +++ b/elf/dl-close.c |
| 79 | @@ -125,7 +125,7 @@ _dl_close_worker (struct link_map *map, bool force) |
| 80 | dl_close_state = rerun; |
| 81 | |
| 82 | /* There are still references to this object. Do nothing more. */ |
| 83 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES)) |
| 84 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES)) |
| 85 | _dl_debug_printf ("\nclosing file=%s; direct_opencount=%u\n", |
| 86 | map->l_name, map->l_direct_opencount); |
| 87 | |
| 88 | @@ -269,7 +269,7 @@ _dl_close_worker (struct link_map *map, bool force) |
| 89 | if (imap->l_init_called) |
| 90 | { |
| 91 | /* When debugging print a message first. */ |
| 92 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS, |
| 93 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_IMPCALLS, |
| 94 | 0)) |
| 95 | _dl_debug_printf ("\ncalling fini: %s [%lu]\n\n", |
| 96 | imap->l_name, nsid); |
| 97 | @@ -711,7 +711,7 @@ _dl_close_worker (struct link_map *map, bool force) |
| 98 | free (imap->l_reldeps); |
| 99 | |
| 100 | /* Print debugging message. */ |
| 101 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES)) |
| 102 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES)) |
| 103 | _dl_debug_printf ("\nfile=%s [%lu]; destroying link map\n", |
| 104 | imap->l_name, imap->l_ns); |
| 105 | |
| 106 | diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c |
| 107 | index 47a946e..e6a3f21 100644 |
| 108 | --- a/elf/dl-conflict.c |
| 109 | +++ b/elf/dl-conflict.c |
| 110 | @@ -32,7 +32,7 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, |
| 111 | ElfW(Rela) *conflictend) |
| 112 | { |
| 113 | #if ! ELF_MACHINE_NO_RELA |
| 114 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_RELOC)) |
| 115 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_RELOC)) |
| 116 | _dl_debug_printf ("\nconflict processing: %s\n", DSO_FILENAME (l->l_name)); |
| 117 | |
| 118 | { |
| 119 | diff --git a/elf/dl-deps.c b/elf/dl-deps.c |
| 120 | index eee146a..1a4b004 100644 |
| 121 | --- a/elf/dl-deps.c |
| 122 | +++ b/elf/dl-deps.c |
| 123 | @@ -127,7 +127,7 @@ empty dynamic string token substitution")); \ |
| 124 | else \ |
| 125 | { \ |
| 126 | /* This is for DT_AUXILIARY. */ \ |
| 127 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) \ |
| 128 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)) \ |
| 129 | _dl_debug_printf (N_("\ |
| 130 | cannot load auxiliary `%s' because of empty dynamic string token " \ |
| 131 | "substitution\n"), __str); \ |
| 132 | @@ -303,7 +303,7 @@ _dl_map_object_deps (struct link_map *map, |
| 133 | args.name = name; |
| 134 | |
| 135 | /* Say that we are about to load an auxiliary library. */ |
| 136 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, |
| 137 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, |
| 138 | 0)) |
| 139 | _dl_debug_printf ("load auxiliary object=%s" |
| 140 | " requested by file=%s\n", |
| 141 | @@ -520,7 +520,7 @@ _dl_map_object_deps (struct link_map *map, |
| 142 | runp->map->l_reserved = 0; |
| 143 | } |
| 144 | |
| 145 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK, 0) != 0 |
| 146 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_PRELINK, 0) != 0 |
| 147 | && map == GL(dl_ns)[LM_ID_BASE]._ns_loaded) |
| 148 | { |
| 149 | /* If we are to compute conflicts, we have to build local scope |
| 150 | diff --git a/elf/dl-error.c b/elf/dl-error.c |
| 151 | index 0fc3fd8..ea82f4d 100644 |
| 152 | --- a/elf/dl-error.c |
| 153 | +++ b/elf/dl-error.c |
| 154 | @@ -139,7 +139,7 @@ internal_function |
| 155 | _dl_signal_cerror (int errcode, const char *objname, const char *occation, |
| 156 | const char *errstring) |
| 157 | { |
| 158 | - if (__builtin_expect (GLRO(dl_debug_mask) |
| 159 | + if (__builtin_expect (GLRO_dl_debug_mask |
| 160 | & ~(DL_DEBUG_STATISTICS|DL_DEBUG_PRELINK), 0)) |
| 161 | _dl_debug_printf ("%s: error: %s: %s (%s)\n", objname, occation, |
| 162 | errstring, receiver ? "continued" : "fatal"); |
| 163 | diff --git a/elf/dl-fini.c b/elf/dl-fini.c |
| 164 | index 6cfe651..f59f7fe 100644 |
| 165 | --- a/elf/dl-fini.c |
| 166 | +++ b/elf/dl-fini.c |
| 167 | @@ -234,7 +234,7 @@ _dl_fini (void) |
| 168 | || l->l_info[DT_FINI] != NULL) |
| 169 | { |
| 170 | /* When debugging print a message first. */ |
| 171 | - if (__builtin_expect (GLRO(dl_debug_mask) |
| 172 | + if (__builtin_expect (GLRO_dl_debug_mask |
| 173 | & DL_DEBUG_IMPCALLS, 0)) |
| 174 | _dl_debug_printf ("\ncalling fini: %s [%lu]\n\n", |
| 175 | DSO_FILENAME (l->l_name), |
| 176 | @@ -286,7 +286,7 @@ _dl_fini (void) |
| 177 | goto again; |
| 178 | } |
| 179 | |
| 180 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_STATISTICS)) |
| 181 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_STATISTICS)) |
| 182 | _dl_debug_printf ("\nruntime linker statistics:\n" |
| 183 | " final number of relocations: %lu\n" |
| 184 | "final number of relocations from cache: %lu\n", |
| 185 | diff --git a/elf/dl-init.c b/elf/dl-init.c |
| 186 | index 2f85731..e46e8b6 100644 |
| 187 | --- a/elf/dl-init.c |
| 188 | +++ b/elf/dl-init.c |
| 189 | @@ -46,7 +46,7 @@ call_init (struct link_map *l, int argc, char **argv, char **env) |
| 190 | return; |
| 191 | |
| 192 | /* Print a debug message if wanted. */ |
| 193 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS)) |
| 194 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_IMPCALLS)) |
| 195 | _dl_debug_printf ("\ncalling init: %s\n\n", |
| 196 | DSO_FILENAME (l->l_name)); |
| 197 | |
| 198 | @@ -96,7 +96,7 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env) |
| 199 | ElfW(Addr) *addrs; |
| 200 | unsigned int cnt; |
| 201 | |
| 202 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS)) |
| 203 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_IMPCALLS)) |
| 204 | _dl_debug_printf ("\ncalling preinit: %s\n\n", |
| 205 | DSO_FILENAME (main_map->l_name)); |
| 206 | |
| 207 | diff --git a/elf/dl-load.c b/elf/dl-load.c |
| 208 | index f664f50..8c28744 100644 |
| 209 | --- a/elf/dl-load.c |
| 210 | +++ b/elf/dl-load.c |
| 211 | @@ -943,7 +943,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, |
| 212 | } |
| 213 | |
| 214 | /* Print debugging message. */ |
| 215 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES)) |
| 216 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES)) |
| 217 | _dl_debug_printf ("file=%s [%lu]; generating link map\n", name, nsid); |
| 218 | |
| 219 | /* This is the ELF header. We read it in `open_verify'. */ |
| 220 | @@ -1347,7 +1347,7 @@ cannot enable executable stack as shared object requires"); |
| 221 | |
| 222 | l->l_entry += l->l_addr; |
| 223 | |
| 224 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES)) |
| 225 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES)) |
| 226 | _dl_debug_printf ("\ |
| 227 | dynamic: 0x%0*lx base: 0x%0*lx size: 0x%0*Zx\n\ |
| 228 | entry: 0x%0*lx phdr: 0x%0*lx phnum: %*u\n\n", |
| 229 | @@ -1789,7 +1789,7 @@ open_path (const char *name, size_t namelen, int mode, |
| 230 | |
| 231 | /* If we are debugging the search for libraries print the path |
| 232 | now if it hasn't happened now. */ |
| 233 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS) |
| 234 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS) |
| 235 | && current_what != this_dir->what) |
| 236 | { |
| 237 | current_what = this_dir->what; |
| 238 | @@ -1810,7 +1810,7 @@ open_path (const char *name, size_t namelen, int mode, |
| 239 | - buf); |
| 240 | |
| 241 | /* Print name we try if this is wanted. */ |
| 242 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) |
| 243 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)) |
| 244 | _dl_debug_printf (" trying file=%s\n", buf); |
| 245 | |
| 246 | fd = open_verify (buf, fbp, loader, whatcode, mode, |
| 247 | @@ -1955,7 +1955,7 @@ _dl_map_object (struct link_map *loader, const char *name, |
| 248 | } |
| 249 | |
| 250 | /* Display information if we are debugging. */ |
| 251 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES) |
| 252 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES) |
| 253 | && loader != NULL) |
| 254 | _dl_debug_printf ((mode & __RTLD_CALLMAP) == 0 |
| 255 | ? "\nfile=%s [%lu]; needed by %s [%lu]\n" |
| 256 | @@ -1997,7 +1997,7 @@ _dl_map_object (struct link_map *loader, const char *name, |
| 257 | |
| 258 | size_t namelen = strlen (name) + 1; |
| 259 | |
| 260 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) |
| 261 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)) |
| 262 | _dl_debug_printf ("find library=%s [%lu]; searching\n", name, nsid); |
| 263 | |
| 264 | fd = -1; |
| 265 | @@ -2119,7 +2119,7 @@ _dl_map_object (struct link_map *loader, const char *name, |
| 266 | #endif |
| 267 | |
| 268 | /* Add another newline when we are tracing the library loading. */ |
| 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 ("\n"); |
| 272 | } |
| 273 | else |
| 274 | @@ -2152,7 +2152,7 @@ _dl_map_object (struct link_map *loader, const char *name, |
| 275 | if (__glibc_unlikely (fd == -1)) |
| 276 | { |
| 277 | if (trace_mode |
| 278 | - && __glibc_likely ((GLRO(dl_debug_mask) & DL_DEBUG_PRELINK) == 0)) |
| 279 | + && __glibc_likely ((GLRO_dl_debug_mask & DL_DEBUG_PRELINK) == 0)) |
| 280 | { |
| 281 | /* We haven't found an appropriate library. But since we |
| 282 | are only interested in the list of libraries this isn't |
| 283 | diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c |
| 284 | index 11cb44b..588c3e4 100644 |
| 285 | --- a/elf/dl-lookup.c |
| 286 | +++ b/elf/dl-lookup.c |
| 287 | @@ -302,7 +302,7 @@ do_lookup_unique (const char *undef_name, uint_fast32_t new_hash, |
| 288 | hash table. */ |
| 289 | if (__glibc_unlikely (tab->size)) |
| 290 | { |
| 291 | - assert (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK); |
| 292 | + assert (GLRO_dl_debug_mask & DL_DEBUG_PRELINK); |
| 293 | goto success; |
| 294 | } |
| 295 | #endif |
| 296 | @@ -378,7 +378,7 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash, |
| 297 | continue; |
| 298 | |
| 299 | /* Print some debugging info if wanted. */ |
| 300 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SYMBOLS)) |
| 301 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_SYMBOLS)) |
| 302 | _dl_debug_printf ("symbol=%s; lookup in file=%s [%lu]\n", |
| 303 | undef_name, DSO_FILENAME (map->l_name), |
| 304 | map->l_ns); |
| 305 | @@ -755,7 +755,7 @@ add_dependency (struct link_map *undef_map, struct link_map *map, int flags) |
| 306 | } |
| 307 | |
| 308 | /* Display information if we are debugging. */ |
| 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 ("\ |
| 312 | \nfile=%s [%lu]; needed by %s [%lu] (relocation dependency)\n\n", |
| 313 | DSO_FILENAME (map->l_name), |
| 314 | @@ -859,7 +859,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map, |
| 315 | { |
| 316 | if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK) |
| 317 | && skip_map == NULL |
| 318 | - && !(GLRO(dl_debug_mask) & DL_DEBUG_UNUSED)) |
| 319 | + && !(GLRO_dl_debug_mask & DL_DEBUG_UNUSED)) |
| 320 | { |
| 321 | /* We could find no value for a strong reference. */ |
| 322 | const char *reference_name = undef_map ? undef_map->l_name : ""; |
| 323 | @@ -935,7 +935,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map, |
| 324 | if (__glibc_unlikely (current_value.m->l_used == 0)) |
| 325 | current_value.m->l_used = 1; |
| 326 | |
| 327 | - if (__glibc_unlikely (GLRO(dl_debug_mask) |
| 328 | + if (__glibc_unlikely (GLRO_dl_debug_mask |
| 329 | & (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK))) |
| 330 | _dl_debug_bindings (undef_name, undef_map, ref, |
| 331 | ¤t_value, version, type_class, protected); |
| 332 | @@ -1000,7 +1000,7 @@ _dl_debug_bindings (const char *undef_name, struct link_map *undef_map, |
| 333 | { |
| 334 | const char *reference_name = undef_map->l_name; |
| 335 | |
| 336 | - if (GLRO(dl_debug_mask) & DL_DEBUG_BINDINGS) |
| 337 | + if (GLRO_dl_debug_mask & DL_DEBUG_BINDINGS) |
| 338 | { |
| 339 | _dl_debug_printf ("binding file %s [%lu] to %s [%lu]: %s symbol `%s'", |
| 340 | DSO_FILENAME (reference_name), |
| 341 | @@ -1014,7 +1014,7 @@ _dl_debug_bindings (const char *undef_name, struct link_map *undef_map, |
| 342 | _dl_debug_printf_c ("\n"); |
| 343 | } |
| 344 | #ifdef SHARED |
| 345 | - if (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK) |
| 346 | + if (GLRO_dl_debug_mask & DL_DEBUG_PRELINK) |
| 347 | { |
| 348 | int conflict = 0; |
| 349 | struct sym_val val = { NULL, NULL }; |
| 350 | diff --git a/elf/dl-object.c b/elf/dl-object.c |
| 351 | index 1d58bbc..938a257 100644 |
| 352 | --- a/elf/dl-object.c |
| 353 | +++ b/elf/dl-object.c |
| 354 | @@ -98,7 +98,7 @@ _dl_new_object (char *realname, const char *libname, int type, |
| 355 | new->l_type = type; |
| 356 | /* If we set the bit now since we know it is never used we avoid |
| 357 | dirtying the cache line later. */ |
| 358 | - if ((GLRO(dl_debug_mask) & DL_DEBUG_UNUSED) == 0) |
| 359 | + if ((GLRO_dl_debug_mask & DL_DEBUG_UNUSED) == 0) |
| 360 | new->l_used = 1; |
| 361 | new->l_loader = loader; |
| 362 | #if NO_TLS_OFFSET != 0 |
| 363 | diff --git a/elf/dl-open.c b/elf/dl-open.c |
| 364 | index 2db1c02..1288604 100644 |
| 365 | --- a/elf/dl-open.c |
| 366 | +++ b/elf/dl-open.c |
| 367 | @@ -147,7 +147,7 @@ add_to_global (struct link_map *new) |
| 368 | ns->_ns_main_searchlist->r_list[new_nlist++] = map; |
| 369 | |
| 370 | /* We modify the global scope. Report this. */ |
| 371 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES)) |
| 372 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_SCOPES)) |
| 373 | _dl_debug_printf ("\nadd %s [%lu] to global scope\n", |
| 374 | map->l_name, map->l_ns); |
| 375 | } |
| 376 | @@ -251,7 +251,7 @@ dl_open_worker (void *a) |
| 377 | if (__glibc_unlikely (new->l_searchlist.r_list != NULL)) |
| 378 | { |
| 379 | /* Let the user know about the opencount. */ |
| 380 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES)) |
| 381 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES)) |
| 382 | _dl_debug_printf ("opening file=%s [%lu]; direct_opencount=%u\n\n", |
| 383 | new->l_name, new->l_ns, new->l_direct_opencount); |
| 384 | |
| 385 | @@ -302,7 +302,7 @@ dl_open_worker (void *a) |
| 386 | LIBC_PROBE (map_complete, 3, args->nsid, r, new); |
| 387 | |
| 388 | /* Print scope information. */ |
| 389 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES)) |
| 390 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_SCOPES)) |
| 391 | _dl_show_scope (new, 0); |
| 392 | |
| 393 | /* Only do lazy relocation if `LD_BIND_NOW' is not set. */ |
| 394 | @@ -519,7 +519,7 @@ dl_open_worker (void *a) |
| 395 | } |
| 396 | |
| 397 | /* Print scope information. */ |
| 398 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES)) |
| 399 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_SCOPES)) |
| 400 | _dl_show_scope (imap, from_scope); |
| 401 | } |
| 402 | |
| 403 | @@ -577,7 +577,7 @@ TLS generation counter wrapped! Please report this.")); |
| 404 | #endif |
| 405 | |
| 406 | /* Let the user know about the opencount. */ |
| 407 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES)) |
| 408 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_FILES)) |
| 409 | _dl_debug_printf ("opening file=%s [%lu]; direct_opencount=%u\n\n", |
| 410 | new->l_name, new->l_ns, new->l_direct_opencount); |
| 411 | } |
| 412 | diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c |
| 413 | index 61252d7..4c83815 100644 |
| 414 | --- a/elf/dl-reloc.c |
| 415 | +++ b/elf/dl-reloc.c |
| 416 | @@ -178,7 +178,7 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], |
| 417 | && __builtin_expect (l->l_info[DT_BIND_NOW] != NULL, 0)) |
| 418 | lazy = 0; |
| 419 | |
| 420 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_RELOC)) |
| 421 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_RELOC)) |
| 422 | _dl_debug_printf ("\nrelocation processing: %s%s\n", |
| 423 | DSO_FILENAME (l->l_name), lazy ? " (lazy)" : ""); |
| 424 | |
| 425 | diff --git a/elf/dl-version.c b/elf/dl-version.c |
| 426 | index f6e5cd9..320628c 100644 |
| 427 | --- a/elf/dl-version.c |
| 428 | +++ b/elf/dl-version.c |
| 429 | @@ -82,7 +82,7 @@ match_symbol (const char *name, Lmid_t ns, ElfW(Word) hash, const char *string, |
| 430 | int result = 0; |
| 431 | |
| 432 | /* Display information about what we are doing while debugging. */ |
| 433 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_VERSIONS)) |
| 434 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_VERSIONS)) |
| 435 | _dl_debug_printf ("\ |
| 436 | checking for version `%s' in file %s [%lu] required by file %s [%lu]\n", |
| 437 | string, DSO_FILENAME (map->l_name), |
| 438 | diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h |
| 439 | index dc8359d..7774fda 100644 |
| 440 | --- a/elf/get-dynamic-info.h |
| 441 | +++ b/elf/get-dynamic-info.h |
| 442 | @@ -166,7 +166,7 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) |
| 443 | them. Therefore to avoid breaking existing applications the |
| 444 | best we can do is add a warning during debugging with the |
| 445 | intent of notifying the user of the problem. */ |
| 446 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0) |
| 447 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0) |
| 448 | && l->l_flags_1 & ~DT_1_SUPPORTED_MASK) |
| 449 | _dl_debug_printf ("\nWARNING: Unsupported flag value(s) of 0x%x in DT_FLAGS_1.\n", |
| 450 | l->l_flags_1 & ~DT_1_SUPPORTED_MASK); |
| 451 | diff --git a/elf/rtld.c b/elf/rtld.c |
| 452 | index fc3a2db..59c4637 100644 |
| 453 | --- a/elf/rtld.c |
| 454 | +++ b/elf/rtld.c |
| 455 | @@ -323,7 +323,7 @@ _dl_start_final (void *arg, struct dl_start_final_info *info) |
| 456 | } |
| 457 | #endif |
| 458 | |
| 459 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_STATISTICS)) |
| 460 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_STATISTICS)) |
| 461 | { |
| 462 | #ifndef HP_TIMING_NONAVAIL |
| 463 | print_statistics (&rtld_total_time); |
| 464 | @@ -1701,7 +1701,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", |
| 465 | after relocation. */ |
| 466 | struct link_map *l; |
| 467 | |
| 468 | - if (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK) |
| 469 | + if (GLRO_dl_debug_mask & DL_DEBUG_PRELINK) |
| 470 | { |
| 471 | struct r_scope_elem *scope = &main_map->l_searchlist; |
| 472 | |
| 473 | @@ -1731,7 +1731,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", |
| 474 | _dl_printf ("\n"); |
| 475 | } |
| 476 | } |
| 477 | - else if (GLRO(dl_debug_mask) & DL_DEBUG_UNUSED) |
| 478 | + else if (GLRO_dl_debug_mask & DL_DEBUG_UNUSED) |
| 479 | { |
| 480 | /* Look through the dependencies of the main executable |
| 481 | and determine which of them is not actually |
| 482 | @@ -1839,7 +1839,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", |
| 483 | } |
| 484 | } |
| 485 | |
| 486 | - if ((GLRO(dl_debug_mask) & DL_DEBUG_PRELINK) |
| 487 | + if ((GLRO_dl_debug_mask & DL_DEBUG_PRELINK) |
| 488 | && rtld_multiple_ref) |
| 489 | { |
| 490 | /* Mark the link map as not yet relocated again. */ |
| 491 | @@ -1972,7 +1972,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", |
| 492 | if (r_list == r_listend && liblist == liblistend) |
| 493 | prelinked = true; |
| 494 | |
| 495 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) |
| 496 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)) |
| 497 | _dl_debug_printf ("\nprelink checking: %s\n", |
| 498 | prelinked ? "ok" : "failed"); |
| 499 | } |
| 500 | @@ -1990,7 +1990,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", |
| 501 | GLRO(dl_init_all_dirs) = GL(dl_all_dirs); |
| 502 | |
| 503 | /* Print scope information. */ |
| 504 | - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES)) |
| 505 | + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_SCOPES)) |
| 506 | { |
| 507 | _dl_debug_printf ("\nInitial object scopes\n"); |
| 508 | |
| 509 | @@ -2265,7 +2265,7 @@ process_dl_debug (const char *dl_debug) |
| 510 | if (debopts[cnt].len == len |
| 511 | && memcmp (dl_debug, debopts[cnt].name, len) == 0) |
| 512 | { |
| 513 | - GLRO(dl_debug_mask) |= debopts[cnt].mask; |
| 514 | + GLRO_dl_debug_mask |= debopts[cnt].mask; |
| 515 | any_debug = 1; |
| 516 | break; |
| 517 | } |
| 518 | @@ -2286,7 +2286,7 @@ warning: debug option `%s' unknown; try LD_DEBUG=help\n", copy); |
| 519 | ++dl_debug; |
| 520 | } |
| 521 | |
| 522 | - if (GLRO(dl_debug_mask) & DL_DEBUG_UNUSED) |
| 523 | + if (GLRO_dl_debug_mask & DL_DEBUG_UNUSED) |
| 524 | { |
| 525 | /* In order to get an accurate picture of whether a particular |
| 526 | DT_NEEDED entry is actually used we have to process both |
| 527 | @@ -2294,7 +2294,7 @@ warning: debug option `%s' unknown; try LD_DEBUG=help\n", copy); |
| 528 | GLRO(dl_lazy) = 0; |
| 529 | } |
| 530 | |
| 531 | - if (GLRO(dl_debug_mask) & DL_DEBUG_HELP) |
| 532 | + if (GLRO_dl_debug_mask & DL_DEBUG_HELP) |
| 533 | { |
| 534 | size_t cnt; |
| 535 | |
| 536 | @@ -2499,7 +2499,7 @@ process_envvars (enum mode *modep) |
| 537 | mode = trace; |
| 538 | GLRO(dl_verbose) = 1; |
| 539 | #if __OPTION_EGLIBC_RTLD_DEBUG |
| 540 | - GLRO(dl_debug_mask) |= DL_DEBUG_PRELINK; |
| 541 | + GLRO_dl_debug_mask |= DL_DEBUG_PRELINK; |
| 542 | #endif |
| 543 | GLRO(dl_trace_prelink) = &envline[17]; |
| 544 | } |
| 545 | @@ -2548,7 +2548,7 @@ process_envvars (enum mode *modep) |
| 546 | { |
| 547 | unsetenv ("MALLOC_CHECK_"); |
| 548 | #if __OPTION_EGLIBC_RTLD_DEBUG |
| 549 | - GLRO(dl_debug_mask) = 0; |
| 550 | + GLRO_dl_debug_mask = 0; |
| 551 | #endif |
| 552 | } |
| 553 | |
| 554 | -- |
| 555 | 2.1.4 |
| 556 | |