mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
ce460d04a5
changed from [USE_TLS && HAVE___THREAD]. * sysdeps/i386/dl-machine.h (elf_machine_type_class, elf_machine_rel): Disable TLS relocs if [RTLD_BOOTSTRAP && !USE___THREAD]. * sysdeps/x86_64/dl-machine.h (elf_machine_type_class, elf_machine_rela): Likewise. * sysdeps/sh/dl-machine.h (elf_machine_type_class, elf_machine_rela): Likewise. * include/link.h (struct link_map): Remove member l_tls_tp_initialized. * elf/rtld.c (_dl_start_final, dl_main): Don't use it. (_dl_start): Conditionalize PT_TLS check on [USE___THREAD]. * sysdeps/i386/dl-tls.h (__TLS_GET_ADDR): Use ___tls_get_addr_internal instead of ___tls_get_addr. (___tls_get_addr_internal): Add attribute_hidden to decl. * sysdeps/generic/ldsodefs.h (struct rtld_global): New variable _dl_error_catch_tsd. * elf/rtld.c (startup_error_tsd): New function. (dl_main): Point _dl_error_catch_tsd at that. * elf/dl-error.c: Don't use libc-tsd.h for DL_ERROR, use new function pointer instead. * elf/dl-tsd.c: New file. * elf/Makefile (routines): Add it. 2002-10-07 Roland McGrath <roland@redhat.com> * elf/dl-misc.c (_dl_debug_vdprintf): Use INTERNAL_SYSCALL macro for writev if it's available. Otherwise if [RTLD_PRIVATE_ERRNO] then take _dl_load_lock around calling __writev. * sysdeps/unix/sysv/linux/i386/sysdep.h (INTERNAL_SYSCALL): New macro. (INLINE_SYSCALL): Use that. * sysdeps/generic/dl-sysdep.h: New file. * sysdeps/mach/hurd/dl-sysdep.h: New file. * sysdeps/generic/ldsodefs.h: Include <dl-sysdep.h>. * include/errno.h [IS_IN_rtld]: Include <dl-sysdep.h> to define ... [RTLD_PRIVATE_ERRNO]: Use a hidden global variable for errno and access it directly. * elf/dl-minimal.c (__errno_location): Removed. * sysdeps/unix/i386/sysdep.S (__syscall_errno) [RTLD_PRIVATE_ERRNO]: Use GOTOFF access for errno. * sysdeps/unix/sysv/linux/i386/sysdep.h [RTLD_PRIVATE_ERRNO] (SYSCALL_ERROR_HANDLER): Likewise. * sysdeps/unix/x86_64/sysdep.S (__syscall_errno) [RTLD_PRIVATE_ERRNO]: Use PC-relative access for errno. * sysdeps/unix/sysv/linux/x86_64/sysdep.h [RTLD_PRIVATE_ERRNO] (SYSCALL_ERROR_HANDLER): Likewise. * include/tls.h: New file. (USE___THREAD): New macro. Define to 1 under [USE_TLS && HAVE___THREAD] and only when compiling libc or libpthread. * sysdeps/unix/sysv/linux/i386/sysdep.h [USE___THREAD]: Conditional changed from [USE_TLS && HAVE___THREAD]. * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise. * sysdeps/unix/i386/sysdep.S: Likewise. * sysdeps/unix/x86_64/sysdep.S: Likewise. * include/errno.h: Likewise. * include/netdb.h: Likewise. * include/resolv.h: Likewise. * sysdeps/generic/errno.c: New file. * csu/Makefile (aux): New variable, list errno. * sysdeps/unix/sysv/linux/i386/sysdep.S (errno, _errno): Remove defns. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/arm/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/cris/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/hppa/sysdep.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/sysdep.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/sh/sysdep.S: Likewise. * sysdeps/unix/alpha/sysdep.S: Likewise. * sysdeps/generic/start.c: Likewise. * sysdeps/unix/start.c: Likewise. * sysdeps/unix/arm/start.c: Likewise. * sysdeps/unix/bsd/ultrix4/mips/start.S: Likewise. * sysdeps/unix/sparc/start.c: Likewise. * sysdeps/unix/sysv/irix4/start.c: Likewise. * sysdeps/unix/sysv/linux/mips/sysdep.S: File removed. * manual/search.texi (Tree Search Function, Hash Search Function): Mention search.h clearly. 2002-10-05 Roland McGrath <roland@redhat.com> * elf/dl-fxstat64.c: File removed. * elf/dl-xstat64.c: File removed. * elf/Makefile (rtld-routines): Remove them. * sysdeps/unix/sysv/linux/xstat64.c: Remove RTLD_STAT64 conditionals. Instead, use strong_alias instead of versioned_symbol in the !SHLIB_COMPAT case. * sysdeps/unix/sysv/linux/fxstat64.c: Likewise. * sysdeps/unix/sysv/linux/lxstat64.c: Likewise. * include/shlib-compat.h (SHLIB_COMPAT): Require that IS_IN_##lib be defined nonzero. [! NOT_IN_libc] (IS_IN_libc): Define it. * cppflags-iterator.mk (CPPFLAGS-$(cpp-src)): Use -Dx=1 not just -Dx. * elf/Makefile (CPPFLAGS-.os): Likewise. * sunrpc/rpc_main.c (main): Don't declare with noreturn attribute. Return the status instead of calling exit. * Makeconfig (CFLAGS): Prepend -std=gnu99. * Makerules (+make-deps): Use $(CFLAGS) only for .c sources. Remove superfluous rm command, whose @ plus make bugs hid all these commands from the make output. * include/stubs-prologue.h: New file. Give #error under #ifdef _LIBC. * Makefile ($(inst_includedir)/gnu/stubs.h): Depend on it. Use that file's contents instead of literal echo's for the prologue. * include/features.h: Include <gnu/stubs.h> unconditionally. * include/gnu/stubs.h: New file. 2002-09-30 Roland McGrath <roland@redhat.com> * elf/rtld-Rules: New file. * elf/Makefile ($(objpfx)librtld.map, $(objpfx)librtld.mk, $(objpfx)rtld-libc.a): New targets. (generated): Add them. (reloc-link): Remove -o $@ from the variable. ($(objpfx)dl-allobjs.os): Add -o $@ after $(reloc-link). (distribute): Add rtld-Rules. (CPPFLAGS-.os): Define this instead of CFLAGS-.os. * Makerules ($(+sysdir_pfx)sysd-rules): Emit rules for rtld-% targets. (common-mostlyclean, common-clean): Clean up rtld-* files. * sysdeps/unix/make-syscalls.sh: Add rtld-*.os target name to rules.
192 lines
5.8 KiB
C
192 lines
5.8 KiB
C
/* Error handling for runtime dynamic linker.
|
|
Copyright (C) 1995,96,97,98,99,2000,2001,2002 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <libintl.h>
|
|
#include <setjmp.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <ldsodefs.h>
|
|
|
|
/* This structure communicates state between _dl_catch_error and
|
|
_dl_signal_error. */
|
|
struct catch
|
|
{
|
|
const char *objname; /* Object/File name. */
|
|
const char *errstring; /* Error detail filled in here. */
|
|
jmp_buf env; /* longjmp here on error. */
|
|
};
|
|
|
|
/* Multiple threads at once can use the `_dl_catch_error' function. The
|
|
calls can come from `_dl_map_object_deps', `_dlerror_run', or from
|
|
any of the libc functionality which loads dynamic objects (NSS, iconv).
|
|
Therefore we have to be prepared to save the state in thread-local
|
|
memory. The _dl_error_catch_tsd function pointer is reset by the thread
|
|
library so that it returns the address of a thread-local variable. */
|
|
|
|
|
|
/* This message we return as a last resort. We define the string in a
|
|
variable since we have to avoid freeing it and so have to enable
|
|
a pointer comparison. See below and in dlfcn/dlerror.c. */
|
|
const char _dl_out_of_memory[] = "out of memory";
|
|
INTVARDEF(_dl_out_of_memory)
|
|
|
|
|
|
/* This points to a function which is called when an continuable error is
|
|
received. Unlike the handling of `catch' this function may return.
|
|
The arguments will be the `errstring' and `objname'.
|
|
|
|
Since this functionality is not used in normal programs (only in ld.so)
|
|
we do not care about multi-threaded programs here. We keep this as a
|
|
global variable. */
|
|
static receiver_fct receiver;
|
|
|
|
|
|
void
|
|
internal_function
|
|
_dl_signal_error (int errcode, const char *objname, const char *occation,
|
|
const char *errstring)
|
|
{
|
|
struct catch *lcatch;
|
|
|
|
if (! errstring)
|
|
errstring = N_("DYNAMIC LINKER BUG!!!");
|
|
|
|
lcatch = *((*GL(dl_error_catch_tsd)) ());
|
|
if (objname == NULL)
|
|
objname = "";
|
|
if (lcatch != NULL)
|
|
{
|
|
/* We are inside _dl_catch_error. Return to it. We have to
|
|
duplicate the error string since it might be allocated on the
|
|
stack. The object name is always a string constant. */
|
|
size_t len_objname = strlen (objname) + 1;
|
|
size_t len_errstring = strlen (errstring) + 1;
|
|
|
|
lcatch->errstring = (char *) malloc (len_objname + len_errstring);
|
|
if (lcatch->errstring != NULL)
|
|
/* Make a copy of the object file name and the error string. */
|
|
lcatch->objname = memcpy (__mempcpy ((char *) lcatch->errstring,
|
|
errstring, len_errstring),
|
|
objname, len_objname);
|
|
else
|
|
{
|
|
/* This is better than nothing. */
|
|
lcatch->objname = "";
|
|
lcatch->errstring = INTUSE(_dl_out_of_memory);
|
|
}
|
|
longjmp (lcatch->env, errcode ?: -1);
|
|
}
|
|
else
|
|
{
|
|
/* Lossage while resolving the program's own symbols is always fatal. */
|
|
char buffer[1024];
|
|
_dl_fatal_printf ("%s: %s: %s%s%s%s%s\n",
|
|
rtld_progname ?: "<program name unknown>",
|
|
occation ?: N_("error while loading shared libraries"),
|
|
objname, *objname ? ": " : "",
|
|
errstring, errcode ? ": " : "",
|
|
(errcode
|
|
? __strerror_r (errcode, buffer, sizeof buffer)
|
|
: ""));
|
|
}
|
|
}
|
|
INTDEF (_dl_signal_error)
|
|
|
|
|
|
void
|
|
internal_function
|
|
_dl_signal_cerror (int errcode, const char *objname, const char *occation,
|
|
const char *errstring)
|
|
{
|
|
if (__builtin_expect (GL(dl_debug_mask)
|
|
& ~(DL_DEBUG_STATISTICS|DL_DEBUG_PRELINK), 0))
|
|
INTUSE(_dl_debug_printf) ("%s: error: %s: %s (%s)\n", objname, occation,
|
|
errstring, receiver ? "continued" : "fatal");
|
|
|
|
if (receiver)
|
|
{
|
|
/* We are inside _dl_receive_error. Call the user supplied
|
|
handler and resume the work. The receiver will still be
|
|
installed. */
|
|
(*receiver) (errcode, objname, errstring);
|
|
}
|
|
else
|
|
INTUSE(_dl_signal_error) (errcode, objname, occation, errstring);
|
|
}
|
|
|
|
|
|
int
|
|
internal_function
|
|
_dl_catch_error (const char **objname, const char **errstring,
|
|
void (*operate) (void *), void *args)
|
|
{
|
|
int errcode;
|
|
struct catch *volatile old;
|
|
struct catch c;
|
|
/* We need not handle `receiver' since setting a `catch' is handled
|
|
before it. */
|
|
|
|
/* Some systems (e.g., SPARC) handle constructors to local variables
|
|
inefficient. So we initialize `c' by hand. */
|
|
c.errstring = NULL;
|
|
|
|
void **catchp = (*GL(dl_error_catch_tsd)) ();
|
|
old = *catchp;
|
|
errcode = setjmp (c.env);
|
|
if (__builtin_expect (errcode, 0) == 0)
|
|
{
|
|
*catchp = &c;
|
|
(*operate) (args);
|
|
*catchp = old;
|
|
*objname = NULL;
|
|
*errstring = NULL;
|
|
return 0;
|
|
}
|
|
|
|
/* We get here only if we longjmp'd out of OPERATE. */
|
|
*catchp = old;
|
|
*objname = c.objname;
|
|
*errstring = c.errstring;
|
|
return errcode == -1 ? 0 : errcode;
|
|
}
|
|
INTDEF (_dl_catch_error)
|
|
|
|
|
|
void
|
|
internal_function
|
|
_dl_receive_error (receiver_fct fct, void (*operate) (void *), void *args)
|
|
{
|
|
void **catchp = (*GL(dl_error_catch_tsd)) ();
|
|
struct catch *old_catch;
|
|
receiver_fct old_receiver;
|
|
|
|
old_catch = *catchp;
|
|
old_receiver = receiver;
|
|
|
|
/* Set the new values. */
|
|
*catchp = NULL;
|
|
receiver = fct;
|
|
|
|
(*operate) (args);
|
|
|
|
*catchp = old_catch;
|
|
receiver = old_receiver;
|
|
}
|