aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-12-01 22:14:57 +0000
committerRoland McGrath <roland@gnu.org>2002-12-01 22:14:57 +0000
commitdde2652bb6db2a9d524f46aafbac0112d1e7ae53 (patch)
treeea867a029693f3c700d39799f35968359f224018
parent2002-12-01 Roland McGrath <roland@redhat.com> (diff)
downloadglibc-dde2652bb6db2a9d524f46aafbac0112d1e7ae53.tar.gz
glibc-dde2652bb6db2a9d524f46aafbac0112d1e7ae53.tar.bz2
glibc-dde2652bb6db2a9d524f46aafbac0112d1e7ae53.zip
* sysdeps/generic/libc-start.c (__libc_start_main): Do
DL_SYSDEP_OSCHECK here. * sysdeps/unix/sysv/linux/init-first.c (init): Not here. * sysdeps/unix/sysv/linux/dl-osinfo.h: Include <fcntl.h>. * sysdeps/generic/libc-tls.c (__libc_setup_tls): Bail if argument TCBSIZE <= TLS_INIT_TCB_SIZE, not just if it's zero. * sysdeps/generic/dl-tls.c (_dl_allocate_tls_init): Check l_tls_offset instead of l_type to decide whether to use TLS_DTV_UNALLOCATED. * include/link.h: Comment typo fix. 2002-12-01 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/bits/posix_opt.h (_POSIX_FSYNC): Set to 200112L. (_POSIX_SPAWN, _POSIX_MAPPED_FILES, _POSIX_MEMLOCK_RANGE, _POSIX_MEMORY_PROTECTION): Likewise. (_POSIX_POLL, _POSIX_SELECT): Removed.
-rw-r--r--ChangeLog22
-rw-r--r--sysdeps/generic/dl-tls.c2
-rw-r--r--sysdeps/generic/libc-start.c10
-rw-r--r--sysdeps/generic/libc-tls.c2
-rw-r--r--sysdeps/unix/sysv/linux/dl-osinfo.h1
-rw-r--r--sysdeps/unix/sysv/linux/init-first.c7
6 files changed, 35 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index c0d846204d..a6f0b34117 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2002-12-01 Roland McGrath <roland@redhat.com>
+
+ * sysdeps/generic/libc-start.c (__libc_start_main): Do
+ DL_SYSDEP_OSCHECK here.
+ * sysdeps/unix/sysv/linux/init-first.c (init): Not here.
+ * sysdeps/unix/sysv/linux/dl-osinfo.h: Include <fcntl.h>.
+
+ * sysdeps/generic/libc-tls.c (__libc_setup_tls): Bail if
+ argument TCBSIZE <= TLS_INIT_TCB_SIZE, not just if it's zero.
+
+ * sysdeps/generic/dl-tls.c (_dl_allocate_tls_init): Check l_tls_offset
+ instead of l_type to decide whether to use TLS_DTV_UNALLOCATED.
+
+ * include/link.h: Comment typo fix.
+
+2002-12-01 Roland McGrath <roland@frob.com>
+
+ * sysdeps/mach/hurd/bits/posix_opt.h (_POSIX_FSYNC): Set to 200112L.
+ (_POSIX_SPAWN, _POSIX_MAPPED_FILES, _POSIX_MEMLOCK_RANGE,
+ _POSIX_MEMORY_PROTECTION): Likewise.
+ (_POSIX_POLL, _POSIX_SELECT): Removed.
+
2002-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/bits/posix_opt.h: Define macros which
diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c
index 014c3a4809..850df8d76f 100644
--- a/sysdeps/generic/dl-tls.c
+++ b/sysdeps/generic/dl-tls.c
@@ -309,7 +309,7 @@ _dl_allocate_tls_init (void *result)
/* Unused entry. */
continue;
- if (map->l_type == lt_loaded)
+ if (map->l_tls_offset == 0)
{
/* For dynamically loaded modules we simply store
the value indicating deferred allocation. */
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index ef02b1819f..5b2728b8ba 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -17,6 +17,7 @@
02111-1307 USA. */
#include <stdlib.h>
+#include <stdio.h>
#include <unistd.h>
#include <ldsodefs.h>
#include <bp-start.h>
@@ -29,6 +30,7 @@ extern void *__libc_stack_end;
#include <tls.h>
#ifndef SHARED
+# include <dl-osinfo.h>
extern void __pthread_initialize_minimal (void)
# if !(USE_TLS - 0)
__attribute__ ((weak))
@@ -81,6 +83,14 @@ BP_SYM (__libc_start_main) (int (*main) (int, char **, char **),
++auxvec;
_dl_aux_init ((ElfW(auxv_t) *) auxvec);
# endif
+# ifdef DL_SYSDEP_OSCHECK
+ if (!__libc_multiple_libcs)
+ {
+ /* This needs to run to initiliaze _dl_osversion before TLS
+ setup might check it. */
+ DL_SYSDEP_OSCHECK (__libc_fatal);
+ }
+# endif
/* Initialize the thread library at least a bit since the libgcc
functions are using thread functions if these are available and
diff --git a/sysdeps/generic/libc-tls.c b/sysdeps/generic/libc-tls.c
index 26fd6e09c9..a403e95065 100644
--- a/sysdeps/generic/libc-tls.c
+++ b/sysdeps/generic/libc-tls.c
@@ -102,7 +102,7 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign)
break;
}
- if (memsz == 0 && tcbsize == 0)
+ if (memsz == 0 && tcbsize <= TLS_INIT_TCB_SIZE)
/* We do not need a TLS block and no thread descriptor. */
return;
diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index 1510b5b8c7..b60a202ff0 100644
--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -18,6 +18,7 @@
02111-1307 USA. */
#include <string.h>
+#include <fcntl.h>
#include <sys/sysctl.h>
#include <sys/utsname.h>
#include "kernel-features.h"
diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c
index 65e275cfe1..870331f4e4 100644
--- a/sysdeps/unix/sysv/linux/init-first.c
+++ b/sysdeps/unix/sysv/linux/init-first.c
@@ -28,9 +28,6 @@
#include <libc-internal.h>
#include <ldsodefs.h>
-#ifndef SHARED
-# include "dl-osinfo.h"
-#endif
/* The function is called from assembly stubs the compiler can't see. */
static void init (int, char **, char **) __attribute__ ((unused));
@@ -57,10 +54,6 @@ init (int argc, char **argv, char **envp)
/* Make sure we don't initialize twice. */
if (!__libc_multiple_libcs)
{
-#ifndef SHARED
- DL_SYSDEP_OSCHECK (__libc_fatal);
-#endif
-
/* Set the FPU control word to the proper default value if the
kernel would use a different value. (In a static program we
don't have this information.) */