mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 08:30:00 +00:00
5bf62f2d3a
* elf/rtld.c [! NDEBUG] (__assert_perror_fail): New function. * hurd/hurdstartup.c (_hurd_startup): Fancier kludge to guess phdr and user entry point addresses. * elf/dl-load.c (open_path): Don't do strlen on DIRPATH if it's null. (_dl_map_object): DT_RPATH value is relative to DT_STRTAB value. * Makerules (install-lib.so): Don't include libc.so. [$(build-shared)=yes] (install): Depend on the installed libc.so file. [$(build-shared)=yes] (install-no-libc.a): Make this, rather than install, depend on the installed $(install-lib.so) files. [$(build-shared)=yes] (install-lib.so): Append libc.so after that rule. * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Add kludge to allocate high addresses to avoid random mappings appearing there. (mmap): Comment out mask; always pass zero. Tue Jun 6 13:34:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * sysdeps/i386/dl-machine.h (ELF_MACHINE_USER_ADDRESS_MASK): New macro. * sysdeps/mach/hurd/dl-sysdep.c (mmap): Use it as mask in vm_map call. * elf/dl-error.c (_dl_catch_error): Clear *ERRSTRING and *OBJNAME when successful. * sysdeps/mach/hurd/dl-sysdep.c (threadvars): New static variable. (__hurd_threadvar_max, __hurd_threadvar_stack_offset): Define these variables, using the `threadvars' buffer. * elf/dl-reloc.c: Don't dereference L->l_prev when it's null. * sysdeps/i386/dl-runtime.c: Likewise. * elf/rtld.c (dl_main): Add missing NULL terminating argument in _dl_sysdep_fatal call. (__assert_fail): Likewise. * locale/Makefile (localedef-modules): Renamed ctype to locale-ctype so as not to conflict with the object file for ctype/ctype.c in the build directory. * sysdeps/i386/dl-machine.h (elf_machine_rel): If MAP->l_type is lt_interpreter, first undo relocation done during bootstrapping.
58 lines
1.7 KiB
C
58 lines
1.7 KiB
C
/* Error handling for runtime dynamic linker.
|
|
Copyright (C) 1995 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <stddef.h>
|
|
#include <link.h>
|
|
#include <setjmp.h>
|
|
|
|
static jmp_buf catch_env;
|
|
static const char *signalled_errstring, *signalled_objname;
|
|
|
|
void
|
|
_dl_signal_error (int errcode,
|
|
const char *objname,
|
|
const char *errstring)
|
|
{
|
|
signalled_errstring = errstring ?: "DYNAMIC LINKER BUG!!!";
|
|
signalled_objname = objname;
|
|
longjmp (catch_env, errcode ?: -1);
|
|
}
|
|
|
|
int
|
|
_dl_catch_error (const char **errstring,
|
|
const char **objname,
|
|
void (*operate) (void))
|
|
{
|
|
int errcode;
|
|
|
|
signalled_errstring = signalled_objname = NULL;
|
|
errcode = setjmp (catch_env);
|
|
if (errcode == 0)
|
|
{
|
|
(*operate) ();
|
|
*errstring = *objname = NULL;
|
|
return 0;
|
|
}
|
|
|
|
/* We get here only if we longjmp'd out of OPERATE. */
|
|
*errstring = signalled_errstring;
|
|
*objname = signalled_objname;
|
|
return errcode == -1 ? 0 : errcode;
|
|
}
|