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 /elf/dynamic-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 'elf/dynamic-link.h')
| -rw-r--r-- | elf/dynamic-link.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h index 9fb6459236..9e9d5a3b28 100644 --- a/elf/dynamic-link.h +++ b/elf/dynamic-link.h @@ -1,5 +1,5 @@ /* Inline functions for dynamic linking. - 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 @@ -42,8 +42,7 @@ && (__builtin_expect ((sym_map)->l_tls_offset != NO_TLS_OFFSET, 1) \ || _dl_try_allocate_static_tls (sym_map) == 0)) -int internal_function attribute_hidden - _dl_try_allocate_static_tls (struct link_map *map); +int _dl_try_allocate_static_tls (struct link_map *map) attribute_hidden; #include <elf.h> @@ -95,7 +94,7 @@ elf_machine_lazy_rel (struct link_map *map, #ifdef RESOLVE_MAP -# ifdef RTLD_BOOTSTRAP +# if defined RTLD_BOOTSTRAP || defined STATIC_PIE_BOOTSTRAP # define ELF_DURING_STARTUP (1) # else # define ELF_DURING_STARTUP (0) |