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-profile.c | |
| parent | 20c37dfde1a836a139f6269e8617260f2b90bf52 (diff) | |
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-profile.c')
| -rw-r--r-- | elf/dl-profile.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/elf/dl-profile.c b/elf/dl-profile.c index be706cefbf..164ae98f99 100644 --- a/elf/dl-profile.c +++ b/elf/dl-profile.c @@ -1,5 +1,5 @@ /* Profiling of shared libraries. - Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1997-2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. Based on the BSD mcount implementation. @@ -198,9 +198,9 @@ _dl_start_profile (struct link_map *map, const char *output_dir) for (ph = map->l_phdr; ph < &map->l_phdr[map->l_phnum]; ++ph) if (ph->p_type == PT_LOAD && (ph->p_flags & PF_X)) { - ElfW(Addr) start = (ph->p_vaddr & ~(GL(dl_pagesize) - 1)); - ElfW(Addr) end = ((ph->p_vaddr + ph->p_memsz + GL(dl_pagesize) - 1) - & ~(GL(dl_pagesize) - 1)); + ElfW(Addr) start = (ph->p_vaddr & ~(GLRO(dl_pagesize) - 1)); + ElfW(Addr) end = ((ph->p_vaddr + ph->p_memsz + GLRO(dl_pagesize) - 1) + & ~(GLRO(dl_pagesize) - 1)); if (start < mapstart) mapstart = start; @@ -273,11 +273,11 @@ _dl_start_profile (struct link_map *map, const char *output_dir) /* First determine the output name. We write in the directory OUTPUT_DIR and the name is composed from the shared objects soname (or the file name) and the ending ".profile". */ - filename = (char *) alloca (strlen (output_dir) + 1 + strlen (GL(dl_profile)) - + sizeof ".profile"); + filename = (char *) alloca (strlen (output_dir) + 1 + + strlen (GLRO(dl_profile)) + sizeof ".profile"); cp = __stpcpy (filename, output_dir); *cp++ = '/'; - __stpcpy (__stpcpy (cp, GL(dl_profile)), ".profile"); + __stpcpy (__stpcpy (cp, GLRO(dl_profile)), ".profile"); #ifdef O_NOFOLLOW # define EXTRA_FLAGS | O_NOFOLLOW @@ -310,11 +310,11 @@ _dl_start_profile (struct link_map *map, const char *output_dir) if (st.st_size == 0) { /* We have to create the file. */ - char buf[GL(dl_pagesize)]; + char buf[GLRO(dl_pagesize)]; - memset (buf, '\0', GL(dl_pagesize)); + memset (buf, '\0', GLRO(dl_pagesize)); - if (__lseek (fd, expected_size & ~(GL(dl_pagesize) - 1), SEEK_SET) == -1) + if (__lseek (fd, expected_size & ~(GLRO(dl_pagesize) - 1), SEEK_SET) == -1) { char buf[400]; int errnum; @@ -327,7 +327,7 @@ _dl_start_profile (struct link_map *map, const char *output_dir) } if (TEMP_FAILURE_RETRY (__libc_write (fd, buf, (expected_size - & (GL(dl_pagesize) + & (GLRO(dl_pagesize) - 1)))) < 0) goto cannot_create; @@ -341,7 +341,7 @@ _dl_start_profile (struct link_map *map, const char *output_dir) __munmap ((void *) addr, expected_size); _dl_error_printf ("%s: file is no correct profile data file for `%s'\n", - filename, GL(dl_profile)); + filename, GLRO(dl_profile)); return; } |