From 2430d57a13f4f10312e13c58962cd9104e6428fd Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 17 Oct 2002 12:10:17 +0000 Subject: * elf/dl-load.c (_dl_map_object_from_fd): Don't check DF_STATIC_TLS. * elf/dl-reloc.c (_dl_relocate_object: CHECK_STATIC_TLS): New macro to signal error if an IE-model TLS reloc resolved to a dlopen'd module. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela): Call it after performing TPOFF relocs. * sysdeps/x86_64/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sh/dl-machine.h (elf_machine_rela): Likewise. * elf/dl-conflict.c (CHECK_STATIC_TLS): New macro (no-op). * elf/dl-close.c (remove_slotinfo): Change asserts so as not to crash when closing a partially-initialized object. * elf/dl-load.c (_dl_map_object_from_fd) [! USE_TLS]: Call lose instead of _dl_fatal_printf when we see PT_TLS. --- linuxthreads/unload.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linuxthreads/unload.c') diff --git a/linuxthreads/unload.c b/linuxthreads/unload.c index ca949196b4..234d27f904 100644 --- a/linuxthreads/unload.c +++ b/linuxthreads/unload.c @@ -1,5 +1,5 @@ /* Tests for non-unloading of libpthread. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2002 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 2000. The GNU C Library is free software; you can redistribute it and/or @@ -29,13 +29,13 @@ main (void) if (p == NULL) { - puts ("failed to load " LIBPTHREAD_SO); + printf ("failed to load %s: %s\n", LIBPTHREAD_SO, dlerror ()); exit (1); } if (dlclose (p) != 0) { - puts ("dlclose (" LIBPTHREAD_SO ") failed"); + printf ("dlclose (%s) failed: %s\n", LIBPTHREAD_SO, dlerror ()); exit (1); } -- cgit v1.2.3