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 /sysdeps/powerpc | |
| parent | 20c37dfde1a836a139f6269e8617260f2b90bf52 (diff) | |
| download | glibc-afdca0f2a3a18fb0dcfc334c205e0fb96e90e839.tar glibc-afdca0f2a3a18fb0dcfc334c205e0fb96e90e839.tar.gz glibc-afdca0f2a3a18fb0dcfc334c205e0fb96e90e839.tar.bz2 glibc-afdca0f2a3a18fb0dcfc334c205e0fb96e90e839.zip | |
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 'sysdeps/powerpc')
| -rw-r--r-- | sysdeps/powerpc/powerpc32/dl-machine.c | 10 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-machine.h | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sysdeps/powerpc/powerpc32/dl-machine.c b/sysdeps/powerpc/powerpc32/dl-machine.c index 642cad48a2..0dce04088b 100644 --- a/sysdeps/powerpc/powerpc32/dl-machine.c +++ b/sysdeps/powerpc/powerpc32/dl-machine.c @@ -120,8 +120,8 @@ __elf_preferred_address(struct link_map *loader, size_t maplength, for (l = GL(dl_loaded); l; l = l->l_next) { ElfW(Addr) mapstart, mapend; - mapstart = l->l_map_start & ~(GL(dl_pagesize) - 1); - mapend = l->l_map_end | (GL(dl_pagesize) - 1); + mapstart = l->l_map_start & ~(GLRO(dl_pagesize) - 1); + mapend = l->l_map_end | (GLRO(dl_pagesize) - 1); assert (mapend > mapstart); /* Prefer gaps below the main executable, note that l == @@ -142,7 +142,7 @@ __elf_preferred_address(struct link_map *loader, size_t maplength, } high -= 0x10000; /* Allow some room between objects. */ - maplength = (maplength | (GL(dl_pagesize) - 1)) + 1; + maplength = (maplength | (GLRO(dl_pagesize) - 1)) + 1; if (high <= low || high - low < maplength ) return 0; return high - maplength; /* Both high and maplength are page-aligned. */ @@ -240,7 +240,7 @@ __elf_machine_runtime_setup (struct link_map *map, int lazy, int profile) : _dl_runtime_resolve); Elf32_Word offset; - if (profile && _dl_name_match_p (GL(dl_profile), map)) + if (profile && _dl_name_match_p (GLRO(dl_profile), map)) /* This is the object we are looking for. Say that we really want profiling and the timers are started. */ GL(dl_profile_map) = map; @@ -499,7 +499,7 @@ __process_machine_rela (struct link_map *map, found. */ return; if (sym->st_size > refsym->st_size - || (GL(dl_verbose) && sym->st_size < refsym->st_size)) + || (GLRO(dl_verbose) && sym->st_size < refsym->st_size)) { const char *strtab; diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index 843737eb86..3edbadf6a4 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -1,6 +1,6 @@ /* Machine-dependent ELF dynamic relocation inline functions. PowerPC64 version. - Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 + Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -416,7 +416,7 @@ elf_machine_runtime_setup (struct link_map *map, int lazy, int profile) resolve_fd = (Elf64_FuncDesc *) (profile ? _dl_profile_resolve : _dl_runtime_resolve); - if (profile && _dl_name_match_p (GL(dl_profile), map)) + if (profile && _dl_name_match_p (GLRO(dl_profile), map)) /* This is the object we are looking for. Say that we really want profiling and the timers are started. */ GL(dl_profile_map) = map; @@ -757,7 +757,8 @@ elf_machine_rela (struct link_map *map, /* This can happen in trace mode when an object could not be found. */ return; if (dont_expect (sym->st_size > refsym->st_size - || (GL(dl_verbose) && sym->st_size < refsym->st_size))) + || (GLRO(dl_verbose) + && sym->st_size < refsym->st_size))) { const char *strtab; |