diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-03-05 10:29:47 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-03-05 10:29:47 +0000 |
| commit | afdca0f2a3a18fb0dcfc334c205e0fb96e90e839 (patch) | |
| tree | 59ba9a29d6174ebbbbe09258ea52e9f956e33c2e /elf/dl-open.c | |
| parent | 20c37dfde1a836a139f6269e8617260f2b90bf52 (diff) | |
| download | glibc-afdca0f2a3a18fb0dcfc334c205e0fb96e90e839.zip glibc-afdca0f2a3a18fb0dcfc334c205e0fb96e90e839.tar.gz glibc-afdca0f2a3a18fb0dcfc334c205e0fb96e90e839.tar.bz2 | |
Update.
* sysdeps/sparc/sparc64/dl-machine.h: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h: Likewise.
* sysdeps/s390/s390-64/dl-machine.h: Likewise.
* sysdeps/s390/s390-32/dl-machine.h: Likewise.
* sysdeps/powerpc/powerpc64/dl-machine.h: Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.c: Likewise.
* sysdeps/m68k/dl-machine.h: Likewise.
* sysdeps/ia64/dl-machine.h: Likewise.
* sysdeps/arm/dl-machine.h: Likewise.
* sysdeps/alpha/dl-machine.h: Likewise.
Diffstat (limited to 'elf/dl-open.c')
| -rw-r--r-- | elf/dl-open.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c index 9befbc4..09687d8 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -308,7 +308,7 @@ dl_open_worker (void *a) if (new->l_searchlist.r_list != NULL) { /* Let the user know about the opencount. */ - if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_FILES, 0)) + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) _dl_debug_printf ("opening file=%s; opencount == %u\n\n", new->l_name, new->l_opencount); @@ -336,7 +336,7 @@ dl_open_worker (void *a) #endif /* Only do lazy relocation if `LD_BIND_NOW' is not set. */ - lazy = (mode & RTLD_BINDING_MASK) == RTLD_LAZY && GL(dl_lazy); + lazy = (mode & RTLD_BINDING_MASK) == RTLD_LAZY && GLRO(dl_lazy); /* Relocate the objects loaded. We do this in reverse order so that copy relocs of earlier objects overwrite the data written by later objects. */ @@ -349,7 +349,7 @@ dl_open_worker (void *a) if (! l->l_relocated) { #ifdef SHARED - if (GL(dl_profile) != NULL) + if (GLRO(dl_profile) != NULL) { /* If this here is the shared object which we want to profile make sure the profile is started. We can find out whether @@ -362,7 +362,8 @@ dl_open_worker (void *a) if (old_profile_map == NULL && GL(dl_profile_map) != NULL) /* We must prepare the profiling. */ - _dl_start_profile (GL(dl_profile_map), GL(dl_profile_output)); + _dl_start_profile (GL(dl_profile_map), + GLRO(dl_profile_output)); } else #endif @@ -548,7 +549,7 @@ dl_open_worker (void *a) #endif /* Let the user know about the opencount. */ - if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_FILES, 0)) + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) _dl_debug_printf ("opening file=%s; opencount == %u\n\n", new->l_name, new->l_opencount); } |