diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:33:27 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:33:27 +0000 |
| commit | 064374be911f72dfaec8a75f06da1f9fc1827712 (patch) | |
| tree | ad96fd1f1b9b57a50005db7803f6b79e748bb820 /include/link.h | |
| parent | 4dc1e6e42f1f602e1d2227e112f2db8dce9da763 (diff) | |
| parent | 7c7d34a16f08f84427b3f617313d9633423ad5eb (diff) | |
Merge commit 'refs/top-bases/t/hurdsig-global-dispositions' into t/hurdsig-global-dispositions
Diffstat (limited to 'include/link.h')
| -rw-r--r-- | include/link.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/link.h b/include/link.h index 32a7392f38..5924594548 100644 --- a/include/link.h +++ b/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. - Copyright (C) 1995-2016 Free Software Foundation, Inc. + Copyright (C) 1995-2018 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 @@ -24,12 +24,18 @@ # error this should be impossible #endif +# ifndef _ISOMAC /* Get most of the contents from the public header, but we define a different `struct link_map' type for private use. The la_objopen prototype uses the type, so we have to declare it separately. */ -#define link_map link_map_public -#define la_objopen la_objopen_wrongproto +# define link_map link_map_public +# define la_objopen la_objopen_wrongproto +# endif + #include <elf/link.h> + +# ifndef _ISOMAC + #undef link_map #undef la_objopen @@ -197,6 +203,8 @@ struct link_map freed, ie. not allocated with the dummy malloc in ld.so. */ +#include <link_map.h> + /* Collected information about own RPATH directories. */ struct r_search_path_struct l_rpath_dirs; @@ -335,10 +343,12 @@ struct link_map extern int __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, size_t size, void *data), void *data); +hidden_proto (__dl_iterate_phdr) /* We use this macro to refer to ELF macros independent of the native wordsize. `ELFW(R_TYPE)' is used in place of `ELF32_R_TYPE' or `ELF64_R_TYPE'. */ #define ELFW(type) _ElfW (ELF, __ELF_NATIVE_CLASS, type) +# endif /* !_ISOMAC */ #endif /* include/link.h */ |