diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-03-27 13:22:15 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-03-27 13:22:15 +0000 |
| commit | ca1bbff0ee443807a36d8c7bf798672589ac37f6 (patch) | |
| tree | 5c44adf6728cbd3c1c4cf17f106a8c7801206be2 /libc/sysdeps/generic | |
| parent | 1bc40ce17eb32360b2e6e8752e0c5a4ef729e375 (diff) | |
| download | eglibc2-ca1bbff0ee443807a36d8c7bf798672589ac37f6.tar.gz | |
Merge changes between r5247 and r5678 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@5679 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/generic')
| -rw-r--r-- | libc/sysdeps/generic/ldsodefs.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libc/sysdeps/generic/ldsodefs.h b/libc/sysdeps/generic/ldsodefs.h index 958a099b8..9d1ebdf61 100644 --- a/libc/sysdeps/generic/ldsodefs.h +++ b/libc/sysdeps/generic/ldsodefs.h @@ -1,5 +1,5 @@ /* Run-time dynamic linker data structures for loaded ELF shared objects. - Copyright (C) 1995-2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1995-2006, 2007, 2008 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 @@ -655,6 +655,10 @@ struct rtld_global_ro void *(*_dl_open) (const char *file, int mode, const void *caller_dlopen, Lmid_t nsid, int argc, char *argv[], char *env[]); void (*_dl_close) (void *map); + void *(*_dl_tls_get_addr_soft) (struct link_map *); +#ifdef HAVE_DL_DISCOVER_OSVERSION + int (*_dl_discover_osversion) (void); +#endif /* List of auditing interfaces. */ struct audit_ifaces *_dl_audit; @@ -1069,7 +1073,7 @@ extern struct link_map *_dl_update_slotinfo (unsigned long int req_modid); /* Look up the module's TLS block as for __tls_get_addr, but never touch anything. Return null if it's not allocated yet. */ -extern void *_dl_tls_get_addr_soft (struct link_map *l) internal_function; +extern void *_dl_tls_get_addr_soft (struct link_map *l) attribute_hidden; extern int _dl_addr_inside_object (struct link_map *l, const ElfW(Addr) addr) internal_function attribute_hidden; |