2001-07-25  Jakub Jelinek  <jakub@redhat.com>

	* elf/Makefile (routines): Add dl-iteratephdr and
	dl-iteratephdr-static.
	(elide-routines.os): Add dl-iteratephdr-static.
	* elf/dl-iteratephdr.c: New file.
	* elf/link.h (struct dl_phdr_info): New definition.
	(dl_iterate_phdr): New prototype.
	* elf/Versions (dl_iterate_phdr): Add at GLIBC_2.2.4.
	* include/link.h (struct dl_phdr_info): New definition.
	(dl_iterate_phdr, __dl_iterate_phdr): New prototypes.
	* sysdeps/generic/dl-iteratephdr-static.c: New file.
	* sysdeps/unix/sysv/linux/ia64/dl-iteratephdr-static.c: New file.

	* hurd/hurdsig.c (_hurdsig_init): Fix incorrect initialization
	of pending signals.
This commit is contained in:
Ulrich Drepper 2001-07-25 20:47:02 +00:00
parent 39ab0fdf56
commit 48ab1c2ff5
7 changed files with 208 additions and 3 deletions

View File

@ -1,7 +1,21 @@
2001-07-25 Jakub Jelinek <jakub@redhat.com>
* elf/Makefile (routines): Add dl-iteratephdr and
dl-iteratephdr-static.
(elide-routines.os): Add dl-iteratephdr-static.
* elf/dl-iteratephdr.c: New file.
* elf/link.h (struct dl_phdr_info): New definition.
(dl_iterate_phdr): New prototype.
* elf/Versions (dl_iterate_phdr): Add at GLIBC_2.2.4.
* include/link.h (struct dl_phdr_info): New definition.
(dl_iterate_phdr, __dl_iterate_phdr): New prototypes.
* sysdeps/generic/dl-iteratephdr-static.c: New file.
* sysdeps/unix/sysv/linux/ia64/dl-iteratephdr-static.c: New file.
2001-07-24 Igor Khavkine <i_khavki@alcor.concordia.ca>
* hurd/hurdsig.c (_hurdsig_init): Fix incorrect initialization
of pending signals.
* hurd/hurdsig.c (_hurdsig_init): Fix incorrect initialization
of pending signals.
2001-06-22 Jakub Jelinek <jakub@redhat.com>

View File

@ -14,6 +14,9 @@ libc {
# functions used in other libraries
_dl_sym; _dl_vsym;
}
GLIBC_2.2.4 {
dl_iterate_phdr;
}
}
ld {

61
elf/dl-iteratephdr.c Normal file
View File

@ -0,0 +1,61 @@
/* Get loaded objects 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 Library General Public License as
published by the Free Software Foundation; either version 2 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
Library General Public License for more details.
You should have received a copy of the GNU Library 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 <ldsodefs.h>
#include <stddef.h>
#include <bits/libc-lock.h>
__libc_lock_define (extern, _dl_load_lock)
int
__dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
size_t size, void *data), void *data)
{
struct link_map *l;
struct dl_phdr_info info;
int ret = 0;
/* Make sure we are alone. */
__libc_lock_lock (_dl_load_lock);
for (l = _dl_loaded; l != NULL; l = l->l_next)
{
/* Skip the dynamic linker. */
if (l->l_phdr == NULL)
continue;
info.dlpi_addr = l->l_addr;
info.dlpi_name = l->l_name;
info.dlpi_phdr = l->l_phdr;
info.dlpi_phnum = l->l_phnum;
ret = callback (&info, sizeof (struct dl_phdr_info), data);
if (ret)
break;
}
/* Release the lock. */
__libc_lock_unlock (_dl_load_lock);
return ret;
}
#ifdef SHARED
weak_alias (__dl_iterate_phdr, dl_iterate_phdr);
#endif

View File

@ -1,6 +1,6 @@
/* Data structure for communication from the run-time dynamic linker for
loaded ELF shared objects.
Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -92,4 +92,24 @@ struct link_map
struct link_map *l_next, *l_prev; /* Chain of loaded objects. */
};
#ifdef __USE_GNU
struct dl_phdr_info
{
ElfW(Addr) dlpi_addr;
const char *dlpi_name;
const ElfW(Phdr) *dlpi_phdr;
ElfW(Half) dlpi_phnum;
};
__BEGIN_DECLS
extern int dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
size_t size, void *data),
void *data) __THROW;
__END_DECLS
#endif
#endif /* link.h */

View File

@ -230,4 +230,19 @@ struct link_map
unsigned int l_idx;
};
struct dl_phdr_info
{
ElfW(Addr) dlpi_addr;
const char *dlpi_name;
const ElfW(Phdr) *dlpi_phdr;
ElfW(Half) dlpi_phnum;
};
extern int dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
size_t size, void *data),
void *data);
extern int __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
size_t size, void *data),
void *data);
#endif /* link.h */

View File

@ -0,0 +1,31 @@
/* 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 Library General Public License as
published by the Free Software Foundation; either version 2 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
Library General Public License for more details.
You should have received a copy of the GNU Library 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;
}

View File

@ -0,0 +1,61 @@
/* 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 Library General Public License as
published by the Free Software Foundation; either version 2 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
Library General Public License for more details.
You should have received a copy of the GNU Library 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);
}