summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2006-01-06 02:53:47 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2006-01-06 02:53:47 +0000
commitb8fce912b9167c3513c2fcd853b45d58501c0837 (patch)
treedb19c1586c816749c9095bc6012d1be66d0d49fb
parent82efaae8d784674285fac6fcfcd4460a1901865d (diff)
Merge from NPTL branch.
-rw-r--r--include/link.h27
-rw-r--r--include/sched.h6
2 files changed, 33 insertions, 0 deletions
diff --git a/include/link.h b/include/link.h
index 6fa4d0fc0..dc6502476 100644
--- a/include/link.h
+++ b/include/link.h
@@ -25,6 +25,9 @@
#include <elf.h>
#include <dlfcn.h>
#include <sys/types.h>
+#ifdef _LIBC
+#include <tls.h>
+#endif
/* We use this macro to refer to ELF types independent of the native wordsize.
`ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'. */
@@ -90,6 +93,30 @@ struct link_map
char *l_name; /* Absolute file name object was found in. */
ElfW(Dyn) *l_ld; /* Dynamic section of the shared object. */
struct link_map *l_next, *l_prev; /* Chain of loaded objects. */
+
+#ifdef USE_TLS
+ /* Thread-local storage related info. */
+
+ /* Start of the initialization image. */
+ void *l_tls_initimage;
+ /* Size of the initialization image. */
+ size_t l_tls_initimage_size;
+ /* Size of the TLS block. */
+ size_t l_tls_blocksize;
+ /* Alignment requirement of the TLS block. */
+ 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
+ /* 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;
+ /* Nonzero if _dl_init_static_tls should be called for this module */
+ unsigned int l_need_tls_init:1;
+#endif
};
#ifdef __USE_GNU
diff --git a/include/sched.h b/include/sched.h
index e476928be..9ed13b10c 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -62,6 +62,12 @@ extern int sched_get_priority_min (int __algorithm) __THROW;
/* Get the SCHED_RR interval for the named process. */
extern int sched_rr_get_interval (__pid_t __pid, struct timespec *__t) __THROW;
+/* These are Linux specific. */
+extern int __clone (int (*__fn) (void *__arg), void *__child_stack,
+ int __flags, void *__arg, ...);
+extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base,
+ size_t __child_stack_size, int __flags, void *__arg, ...);
+
__END_DECLS
#endif /* sched.h */