diff options
Diffstat (limited to 'include/link.h')
| -rw-r--r-- | include/link.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/include/link.h b/include/link.h index 9311256aff..b45deabf7f 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-2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1995-2002,2003,2004,2005,2006 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 @@ -44,6 +44,7 @@ extern unsigned int la_objopen (struct link_map *__map, Lmid_t __lmid, #include <dl-lookupcfg.h> #include <tls.h> #include <bits/libc-lock.h> +#include <rtld-lowlevel.h> /* Some internal data structures of the dynamic linker used in the @@ -121,7 +122,7 @@ struct link_map are indexed by DT_ADDRTAGIDX(tagvalue), see <elf.h>. */ ElfW(Dyn) *l_info[DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM - + DT_EXTRANUM + DT_VALNUM + DT_ADDRNUM]; + + DT_EXTRANUM + DT_VALNUM + DT_ADDRNUM]; const ElfW(Phdr) *l_phdr; /* Pointer to program header table in core. */ ElfW(Addr) l_entry; /* Entry point location. */ ElfW(Half) l_phnum; /* Number of program header entries. */ @@ -182,9 +183,6 @@ struct link_map is interested in the PLT interception.*/ unsigned int l_removed:1; /* Nozero if the object cannot be used anymore since it is removed. */ - unsigned int l_contiguous:1; /* Nonzero if inter-segment holes are - mprotected or if no holes are present at - all. */ /* Array with version names. */ unsigned int l_nversions; @@ -222,6 +220,8 @@ struct link_map /* This is an array defining the lookup scope for this link map. There are initially at most three different scope lists. */ struct r_scope_elem **l_scope; + /* We need to protect using the SCOPEREC. */ + __rtld_mrlock_define (, l_scope_lock) /* A similar array, this time only with the local scope. This is used occasionally. */ @@ -261,7 +261,6 @@ struct link_map const ElfW(Sym) *ret; } l_lookup_cache; -#ifdef USE_TLS /* Thread-local storage related info. */ /* Start of the initialization image. */ @@ -274,14 +273,13 @@ struct link_map size_t l_tls_align; /* Offset of first byte module alignment. */ size_t l_tls_firstbyte_offset; -# ifndef NO_TLS_OFFSET -# define NO_TLS_OFFSET 0 -# endif +#ifndef NO_TLS_OFFSET +# define NO_TLS_OFFSET 0 +#endif /* For objects present at startup time: offset in the static TLS block. */ ptrdiff_t l_tls_offset; /* Index of the module in the dtv array. */ size_t l_tls_modid; -#endif /* Information used to change permission after the relocations are done. */ |