diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-03-18 16:44:23 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-03-18 16:44:23 +0000 |
| commit | 8751114637bcc3caaf16a4216da0afb84456558a (patch) | |
| tree | f3eca66b88003bc49c309a95827d461ae5b66aed /libc/sysdeps/generic | |
| parent | b261131fe2b94b53fe4950d9265ae10bef228455 (diff) | |
Merge changes between r22552 and r22663 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22664 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/generic')
| -rw-r--r-- | libc/sysdeps/generic/bp-sym.h | 25 | ||||
| -rw-r--r-- | libc/sysdeps/generic/ldsodefs.h | 7 |
2 files changed, 7 insertions, 25 deletions
diff --git a/libc/sysdeps/generic/bp-sym.h b/libc/sysdeps/generic/bp-sym.h deleted file mode 100644 index 089912a68..000000000 --- a/libc/sysdeps/generic/bp-sym.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Bounded-pointer symbol modifier. - Copyright (C) 2000-2013 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Greg McGary <greg@mcgary.org> - - 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; if not, see - <http://www.gnu.org/licenses/>. */ - -#define BP_SYM(name) _BP_SYM (name) -#if __BOUNDED_POINTERS__ -# define _BP_SYM(name) __BP_##name -#else -# define _BP_SYM(name) name -#endif diff --git a/libc/sysdeps/generic/ldsodefs.h b/libc/sysdeps/generic/ldsodefs.h index 1781574a9..b89691a97 100644 --- a/libc/sysdeps/generic/ldsodefs.h +++ b/libc/sysdeps/generic/ldsodefs.h @@ -1018,6 +1018,13 @@ extern struct link_map *_dl_find_dso_for_object (const ElfW(Addr) addr) internal_function; rtld_hidden_proto (_dl_find_dso_for_object) +/* Initialization which is normally done by the dynamic linker. */ +extern void _dl_non_dynamic_init (void) internal_function; + +/* Used by static binaries to check the auxiliary vector. */ +extern void _dl_aux_init (ElfW(auxv_t) *av) internal_function; + + __END_DECLS #endif /* ldsodefs.h */ |