diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
| commit | 8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5 (patch) | |
| tree | 196eec145dc3a6fb925a5b07d831b21d761d7c20 /include/link.h | |
| parent | 48b752c9f6499f0de89766c94b3b1bedbfd6476e (diff) | |
Updated to fedora-glibc-20061029T2155cvs/fedora-glibc-2_5_90-3
Diffstat (limited to 'include/link.h')
| -rw-r--r-- | include/link.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/link.h b/include/link.h index 80eff3a677..b45deabf7f 100644 --- a/include/link.h +++ b/include/link.h @@ -42,7 +42,7 @@ extern unsigned int la_objopen (struct link_map *__map, Lmid_t __lmid, #include <stddef.h> #include <bits/linkmap.h> #include <dl-lookupcfg.h> -#include <tls.h> /* Defines USE_TLS. */ +#include <tls.h> #include <bits/libc-lock.h> #include <rtld-lowlevel.h> @@ -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. */ |