diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | elf/Makefile | 6 | ||||
| -rw-r--r-- | elf/dl-iteratephdr.c | 32 | ||||
| -rw-r--r-- | sysdeps/generic/dl-iteratephdr-static.c | 31 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/sysdep.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/dl-iteratephdr-static.c | 61 |
6 files changed, 48 insertions, 97 deletions
diff --git a/ChangeLog b/ChangeLog index 9263b3eec1..3a64ebd654 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2003-10-18 Carlos O'Donell <carlos@baldric.uwo.ca> + + * sysdeps/unix/sysv/linux/hppa/sysdep.h: Fix merge error. + +2003-10-15 Roland McGrath <roland@redhat.com> + + * elf/dl-iteratephdr.c [! SHARED] (dl_iterate_phdr): New function. + Fake an entry for the main executable and then call __dl_iterate_phdr. + * elf/Makefile (routines): Remove dl-iteratephdr-static. + (elide-routines.os): Likewise. + (CFLAGS-dl-iterate-phdr-static.c): Variable removed. + * sysdeps/generic/dl-iteratephdr-static.c: File removed. + * sysdeps/unix/sysv/linux/ia64/dl-iteratephdr-static.c: File removed. + 2003-10-15 Jakub Jelinek <jakub@redhat.com> * elf/rtld.c (print_statistics): Print also number of relative diff --git a/elf/Makefile b/elf/Makefile index 2e6b6cb2b2..ead590bdc1 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -22,7 +22,7 @@ subdir := elf headers = elf.h bits/elfclass.h link.h routines = $(dl-routines) dl-open dl-close dl-support dl-iteratephdr \ - dl-iteratephdr-static dl-addr enbl-secure dl-profstub \ + dl-addr enbl-secure dl-profstub \ dl-origin dl-libc dl-sym dl-tsd # The core dynamic linking functions are in libc for the static and @@ -33,8 +33,7 @@ dl-routines = $(addprefix dl-,load cache lookup object reloc deps \ execstack) all-dl-routines = $(dl-routines) $(sysdep-dl-routines) # But they are absent from the shared libc, because that code is in ld.so. -elide-routines.os = $(all-dl-routines) dl-support enbl-secure \ - dl-iteratephdr-static dl-origin +elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin # ld.so uses those routines, plus some special stuff for being the program # interpreter and operating independent of libc. @@ -87,7 +86,6 @@ distribute := rtld-Rules \ CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-dl-iterate-phdr.c = $(uses-callbacks) -CFLAGS-dl-iterate-phdr-static.c = $(uses-callbacks) include ../Makeconfig diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c index d4feb690c3..fd45f8529f 100644 --- a/elf/dl-iteratephdr.c +++ b/elf/dl-iteratephdr.c @@ -29,6 +29,7 @@ cancel_handler (void *arg __attribute__((unused))) __rtld_lock_unlock_recursive (GL(dl_load_lock)); } +hidden_proto (__dl_iterate_phdr) int __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, size_t size, void *data), void *data) @@ -58,7 +59,38 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, return ret; } +hidden_def (__dl_iterate_phdr) #ifdef SHARED + weak_alias (__dl_iterate_phdr, dl_iterate_phdr); + +#else + +/* dl-support.c defines these and initializes them early on. */ +extern ElfW(Phdr) *_dl_phdr; +extern size_t _dl_phnum; + +int +dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, + size_t size, void *data), void *data) +{ + if (_dl_phnum != 0) + { + /* This entry describes this statically-linked program itself. */ + struct dl_phdr_info info; + int ret; + info.dlpi_addr = 0; + info.dlpi_name = ""; + info.dlpi_phdr = _dl_phdr; + info.dlpi_phnum = _dl_phnum; + ret = (*callback) (&info, sizeof (struct dl_phdr_info), data); + if (ret) + return ret; + } + + return __dl_iterate_phdr (callback, data); +} + + #endif diff --git a/sysdeps/generic/dl-iteratephdr-static.c b/sysdeps/generic/dl-iteratephdr-static.c deleted file mode 100644 index eab0656740..0000000000 --- a/sysdeps/generic/dl-iteratephdr-static.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Get static program's program headers. - Copyright (C) 2001 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <errno.h> -#include <elf/link.h> -#include <stddef.h> - -int -dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, - size_t size, void *data), void *data) -{ - __set_errno (ENOSYS); - return -1; -} diff --git a/sysdeps/unix/sysv/linux/hppa/sysdep.h b/sysdeps/unix/sysv/linux/hppa/sysdep.h index bb5e31dbb9..1085db3fc7 100644 --- a/sysdeps/unix/sysv/linux/hppa/sysdep.h +++ b/sysdeps/unix/sysv/linux/hppa/sysdep.h @@ -371,7 +371,6 @@ LDW_ASM_PIC \ : "=r" (__res) \ : "i" (SYS_ify(name)) ASM_ARGS_##nr \ - ); \ : CALL_CLOB_REGS CLOB_ARGS_##nr \ ); \ __sys_res = (long)__res; \ diff --git a/sysdeps/unix/sysv/linux/ia64/dl-iteratephdr-static.c b/sysdeps/unix/sysv/linux/ia64/dl-iteratephdr-static.c deleted file mode 100644 index 38f7e7eeb4..0000000000 --- a/sysdeps/unix/sysv/linux/ia64/dl-iteratephdr-static.c +++ /dev/null @@ -1,61 +0,0 @@ -/* Get static program's program headers. IA-64 version. - Copyright (C) 2001 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <assert.h> -#include <errno.h> -#include <link.h> -#include <stddef.h> - -extern unsigned long ip_segrel; - -asm (".section .rodata; ip_segrel: data8 @segrel(ip#); .previous"); - -int -dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, - size_t size, void *data), void *data) -{ - char *ip; - ElfW(Ehdr) *ehdr; - struct dl_phdr_info info; - int ret; - - asm ("ip: mov %0 = ip" : "=r" (ip)); - ehdr = (ElfW(Ehdr) *) (ip - ip_segrel); - - assert (ehdr->e_ident[0] == 0x7f - && ehdr->e_ident[1] == 'E' - && ehdr->e_ident[2] == 'L' - && ehdr->e_ident[3] == 'F' - && ehdr->e_ident[EI_CLASS] == ELFCLASS64 - && ehdr->e_ident[EI_DATA] == ELFDATA2LSB - && ehdr->e_machine == EM_IA_64 - && ehdr->e_type == ET_EXEC); - - info.dlpi_addr = 0; - info.dlpi_name = NULL; - info.dlpi_phdr = (ElfW(Phdr) *) ((char *) ehdr + ehdr->e_phoff); - info.dlpi_phnum = ehdr->e_phnum; - - ret = callback (&info, sizeof (struct dl_phdr_info), data); - if (ret) - return ret; - - return __dl_iterate_phdr (callback, data); -} |