mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +00:00
aff4519d38
2003-01-11 Jim Meyering <jim@meyering.net> * io/ftw.c [HAVE_CONFIG_H]: Include <config.h>. [HAVE_SYS_PARAM_H || _LIBC]: Guard inclusion of <sys/param.h>. Include <sys/stat.h>, not <include/sys/stat.h>, if !_LIBC. [!_LIBC] (__chdir, __closedir, __fchdir, __getcwd, __opendir): Define. [!_LIBC] (__readdir64, __tdestroy, __tfind, __tsearch): Define. [!_LIBC] (internal_function, dirent64, MAX): Define. (__set_errno): Define if not already defined. (open_dir_stream): When FTW_CHDIR is enabled, invoke opendir on the basename, not the entire file name. (process_entry): When FTW_CHDIR is enabled, invoke XSTAT or LXSTAT on the basename, not the entire file name. 2003-01-12 Ulrich Drepper <drepper@redhat.com> * string/tester.c (test_strcpy): Disable last added strcpy until it is fixed. 2003-01-11 Philip Blundell <philb@gnu.org> * sysdeps/unix/sysv/linux/arm/socket.S: Add cancellation support. 2003-01-11 Andreas Schwab <schwab@suse.de> * Makerules: Add vpath for %.dynsym and %.so so that the implicit rule chaining for check-abi works. 2003-01-11 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sysdep.h (SYSCALL_ERROR_HANDLER): Add non-PIC case. 2003-01-11 Jakub Jelinek <jakub@redhat.com> * elf/tls-macros.h [__ia64__] (__TLS_CALL_CLOBBERS): Define. [__ia64__] (TLS_LE, TLS_IE): Fix typos. Add ;; at start of asm if gp is used early. [__ia64__] (TLS_LD, TLS_GD): Likewise. Use __TLS_CALL_CLOBBERS. * elf/Makefile ($(objpfx)tst-tlsmod5.so, $(objpfx)tst-tlsmod6.so): Ensure libc.so in DT_NEEDED. * sysdeps/alpha/dl-machine.h (elf_machine_rela): Move CHECK_STATIC_TLS before l_tls_offset use. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela): Likewise. * sysdeps/sh/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/generic/dl-tls.c (_dl_allocate_tls_storage) [TLS_DTV_AT_TP]: Allocate TLS_PRE_TCB_SIZE bytes below result. (_dl_deallocate_tls) [TLS_DTV_AT_TP]: Adjust before freeing. * sysdeps/generic/libc-tls.c (__libc_setup_tls): If TLS_INIT_TP_EXPENSIVE is not defined, allocate even if no PT_TLS segment has been found. If TLS_DTV_AT_TP, allocate TLS_PRE_TCB_SIZE bytes below result and add tcb_offset to memsz. * sysdeps/ia64/dl-tls.h (__tls_get_addr): New prototype. * sysdeps/ia64/dl-machine.h: Include tls.h. (elf_machine_type_class): Return ELF_RTYPE_CLASS_PLT for TLS relocs too. (elf_machine_rela): Assume if sym_map != NULL sym is non-NULL too. Handle R_IA64_DTPMOD*, R_IA64_DTPREL* and R_IA64_TPREL* relocations. * sysdeps/ia64/libc-tls.c: New file. 2003-01-10 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/powerpc64/sysdep.h (PSEUDO_RET): Add branch hit. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h (STAT_VER_LINUX): Fix type. Move definition out of #if. * sysdeps/unix/sysv/linux/powerpc/powerpc64/ftruncate64.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S: Add cancellation support. * sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list: Remove ftruncate64, pread64, pwrite64, truncate64 entries. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (INLINE_SYSCALL): New version that supports function call like syscalls. Add __builtin_expect. (LOADARGS_n): Add argument size safety checks. (INTERNAL_SYSCALL): New Macro. * sysdeps/unix/sysv/linux/powerpc/powerpc64/truncate64.c: New file. * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h [__PPC_ELF_H]: Avoid redefinition of elf_fpreg_t and elf_fpregset_t. 2003-01-12 Ulrich Drepper <drepper@redhat.com> * elf/dl-close.c (_dl_close): Add several asserts. Correct and simplify test for unloading. If loader of a DSO is unloaded do not use its scope anymore. Fall back to own scope and adjust opencounts. Fix several comments. * elf/dl-deps.c (_dl_map_object_deps): Always allocate memory for the l_searchlist, not only for l_initfini. * elf/dl-lookup.c (add_dependencies): Avoid creating relocation dependencies if objects cannot be removed. Remove object with the definition as not unloadable if necessary. * elf/reldep6.c: Create relocation dependency before closing the first module. 2003-01-10 Guido Günther <agx@sigxcpu.org> * elf/Makefile: Add rules to build and run reldep9 test. * elf/reldep9.c: New file. * elf/reldep9mod1.c: New file. * elf/reldep9mod2.c: New file. * elf/reldep9mod3.c: New file. 2003-01-09 Jakub Jelinek <jakub@redhat.com> * elf/Makefile: Add rules to build and run nodelete2 test. * elf/nodelete2.c: New file. * elf/nodel2mod1.c: New file. * elf/nodel2mod2.c: New file. * elf/nodel2mod3.c: New file. 2003-01-09 Jakub Jelinek <jakub@redhat.com>
654 lines
21 KiB
C
654 lines
21 KiB
C
/* Machine-dependent ELF dynamic relocation inline functions. i386 version.
|
|
Copyright (C) 1995-2002, 2003 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. */
|
|
|
|
#ifndef dl_machine_h
|
|
#define dl_machine_h
|
|
|
|
#define ELF_MACHINE_NAME "i386"
|
|
|
|
#include <sys/param.h>
|
|
|
|
#include <tls.h>
|
|
|
|
/* Return nonzero iff ELF header is compatible with the running host. */
|
|
static inline int __attribute__ ((unused))
|
|
elf_machine_matches_host (const Elf32_Ehdr *ehdr)
|
|
{
|
|
return ehdr->e_machine == EM_386;
|
|
}
|
|
|
|
|
|
#if defined PI_STATIC_AND_HIDDEN \
|
|
&& defined HAVE_VISIBILITY_ATTRIBUTE && defined HAVE_HIDDEN \
|
|
&& !defined HAVE_BROKEN_VISIBILITY_ATTRIBUTE
|
|
|
|
/* Return the link-time address of _DYNAMIC. Conveniently, this is the
|
|
first element of the GOT, a special entry that is never relocated. */
|
|
static inline Elf32_Addr __attribute__ ((unused, const))
|
|
elf_machine_dynamic (void)
|
|
{
|
|
/* This produces a GOTOFF reloc that resolves to zero at link time, so in
|
|
fact just loads from the GOT register directly. By doing it without
|
|
an asm we can let the compiler choose any register. */
|
|
extern const Elf32_Addr _GLOBAL_OFFSET_TABLE_[] attribute_hidden;
|
|
return _GLOBAL_OFFSET_TABLE_[0];
|
|
}
|
|
|
|
/* Return the run-time load address of the shared object. */
|
|
static inline Elf32_Addr __attribute__ ((unused))
|
|
elf_machine_load_address (void)
|
|
{
|
|
/* Compute the difference between the runtime address of _DYNAMIC as seen
|
|
by a GOTOFF reference, and the link-time address found in the special
|
|
unrelocated first GOT entry. */
|
|
extern Elf32_Dyn bygotoff[] asm ("_DYNAMIC") attribute_hidden;
|
|
return (Elf32_Addr) &bygotoff - elf_machine_dynamic ();
|
|
}
|
|
|
|
#else /* Without .hidden support, we can't compile the code above. */
|
|
|
|
/* Return the link-time address of _DYNAMIC. Conveniently, this is the
|
|
first element of the GOT. This must be inlined in a function which
|
|
uses global data. */
|
|
static inline Elf32_Addr __attribute__ ((unused))
|
|
elf_machine_dynamic (void)
|
|
{
|
|
register Elf32_Addr *got asm ("%ebx");
|
|
return *got;
|
|
}
|
|
|
|
|
|
/* Return the run-time load address of the shared object. */
|
|
static inline Elf32_Addr __attribute__ ((unused))
|
|
elf_machine_load_address (void)
|
|
{
|
|
/* It doesn't matter what variable this is, the reference never makes
|
|
it to assembly. We need a dummy reference to some global variable
|
|
via the GOT to make sure the compiler initialized %ebx in time. */
|
|
extern int _dl_argc;
|
|
Elf32_Addr addr;
|
|
asm ("leal _dl_start@GOTOFF(%%ebx), %0\n"
|
|
"subl _dl_start@GOT(%%ebx), %0"
|
|
: "=r" (addr) : "m" (_dl_argc) : "cc");
|
|
return addr;
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
/* Set up the loaded object described by L so its unrelocated PLT
|
|
entries will jump to the on-demand fixup code in dl-runtime.c. */
|
|
|
|
static inline int __attribute__ ((unused))
|
|
elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
|
|
{
|
|
Elf32_Addr *got;
|
|
extern void _dl_runtime_resolve (Elf32_Word) attribute_hidden;
|
|
extern void _dl_runtime_profile (Elf32_Word) attribute_hidden;
|
|
|
|
if (l->l_info[DT_JMPREL] && lazy)
|
|
{
|
|
/* The GOT entries for functions in the PLT have not yet been filled
|
|
in. Their initial contents will arrange when called to push an
|
|
offset into the .rel.plt section, push _GLOBAL_OFFSET_TABLE_[1],
|
|
and then jump to _GLOBAL_OFFSET_TABLE[2]. */
|
|
got = (Elf32_Addr *) D_PTR (l, l_info[DT_PLTGOT]);
|
|
/* If a library is prelinked but we have to relocate anyway,
|
|
we have to be able to undo the prelinking of .got.plt.
|
|
The prelinker saved us here address of .plt + 0x16. */
|
|
if (got[1])
|
|
{
|
|
l->l_mach.plt = got[1] + l->l_addr;
|
|
l->l_mach.gotplt = (Elf32_Addr) &got[3];
|
|
}
|
|
got[1] = (Elf32_Addr) l; /* Identify this shared object. */
|
|
|
|
/* The got[2] entry contains the address of a function which gets
|
|
called to get the address of a so far unresolved function and
|
|
jump to it. The profiling extension of the dynamic linker allows
|
|
to intercept the calls to collect information. In this case we
|
|
don't store the address in the GOT so that all future calls also
|
|
end in this function. */
|
|
if (__builtin_expect (profile, 0))
|
|
{
|
|
got[2] = (Elf32_Addr) &_dl_runtime_profile;
|
|
|
|
if (_dl_name_match_p (GL(dl_profile), l))
|
|
/* This is the object we are looking for. Say that we really
|
|
want profiling and the timers are started. */
|
|
GL(dl_profile_map) = l;
|
|
}
|
|
else
|
|
/* This function will get called to fix up the GOT entry indicated by
|
|
the offset on the stack, and then jump to the resolved address. */
|
|
got[2] = (Elf32_Addr) &_dl_runtime_resolve;
|
|
}
|
|
|
|
return lazy;
|
|
}
|
|
|
|
#ifdef IN_DL_RUNTIME
|
|
|
|
# if !defined PROF && !__BOUNDED_POINTERS__
|
|
/* We add a declaration of this function here so that in dl-runtime.c
|
|
the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters
|
|
in registers.
|
|
|
|
We cannot use this scheme for profiling because the _mcount call
|
|
destroys the passed register information. */
|
|
/* GKM FIXME: Fix trampoline to pass bounds so we can do
|
|
without the `__unbounded' qualifier. */
|
|
static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset)
|
|
__attribute__ ((regparm (2), unused));
|
|
static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset,
|
|
ElfW(Addr) retaddr)
|
|
__attribute__ ((regparm (3), unused));
|
|
# endif
|
|
|
|
/* This code is used in dl-runtime.c to call the `fixup' function
|
|
and then redirect to the address it returns. */
|
|
# if !defined PROF && !__BOUNDED_POINTERS__
|
|
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
|
.text\n\
|
|
.globl _dl_runtime_resolve\n\
|
|
.type _dl_runtime_resolve, @function\n\
|
|
.align 16\n\
|
|
_dl_runtime_resolve:\n\
|
|
pushl %eax # Preserve registers otherwise clobbered.\n\
|
|
pushl %ecx\n\
|
|
pushl %edx\n\
|
|
movl 16(%esp), %edx # Copy args pushed by PLT in register. Note\n\
|
|
movl 12(%esp), %eax # that `fixup' takes its parameters in regs.\n\
|
|
call fixup # Call resolver.\n\
|
|
popl %edx # Get register content back.\n\
|
|
popl %ecx\n\
|
|
xchgl %eax, (%esp) # Get %eax contents end store function address.\n\
|
|
ret $8 # Jump to function address.\n\
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
|
|
\n\
|
|
.globl _dl_runtime_profile\n\
|
|
.type _dl_runtime_profile, @function\n\
|
|
.align 16\n\
|
|
_dl_runtime_profile:\n\
|
|
pushl %eax # Preserve registers otherwise clobbered.\n\
|
|
pushl %ecx\n\
|
|
pushl %edx\n\
|
|
movl 20(%esp), %ecx # Load return address\n\
|
|
movl 16(%esp), %edx # Copy args pushed by PLT in register. Note\n\
|
|
movl 12(%esp), %eax # that `fixup' takes its parameters in regs.\n\
|
|
call profile_fixup # Call resolver.\n\
|
|
popl %edx # Get register content back.\n\
|
|
popl %ecx\n\
|
|
xchgl %eax, (%esp) # Get %eax contents end store function address.\n\
|
|
ret $8 # Jump to function address.\n\
|
|
.size _dl_runtime_profile, .-_dl_runtime_profile\n\
|
|
.previous\n\
|
|
");
|
|
# else
|
|
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\n\
|
|
.text\n\
|
|
.globl _dl_runtime_resolve\n\
|
|
.globl _dl_runtime_profile\n\
|
|
.type _dl_runtime_resolve, @function\n\
|
|
.type _dl_runtime_profile, @function\n\
|
|
.align 16\n\
|
|
_dl_runtime_resolve:\n\
|
|
_dl_runtime_profile:\n\
|
|
pushl %eax # Preserve registers otherwise clobbered.\n\
|
|
pushl %ecx\n\
|
|
pushl %edx\n\
|
|
movl 16(%esp), %edx # Push the arguments for `fixup'\n\
|
|
movl 12(%esp), %eax\n\
|
|
pushl %edx\n\
|
|
pushl %eax\n\
|
|
call fixup # Call resolver.\n\
|
|
popl %edx # Pop the parameters\n\
|
|
popl %ecx\n\
|
|
popl %edx # Get register content back.\n\
|
|
popl %ecx\n\
|
|
xchgl %eax, (%esp) # Get %eax contents end store function address.\n\
|
|
ret $8 # Jump to function address.\n\
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
|
|
.size _dl_runtime_profile, .-_dl_runtime_profile\n\
|
|
.previous\n\
|
|
");
|
|
# endif
|
|
#endif
|
|
|
|
/* Mask identifying addresses reserved for the user program,
|
|
where the dynamic linker should not map anything. */
|
|
#define ELF_MACHINE_USER_ADDRESS_MASK 0xf8000000UL
|
|
|
|
/* Initial entry point code for the dynamic linker.
|
|
The C function `_dl_start' is the real entry point;
|
|
its return value is the user program's entry point. */
|
|
|
|
#define RTLD_START asm ("\n\
|
|
.text\n\
|
|
.align 16\n\
|
|
0: movl (%esp), %ebx\n\
|
|
ret\n\
|
|
.align 16\n\
|
|
.globl _start\n\
|
|
.globl _dl_start_user\n\
|
|
_start:\n\
|
|
# Note that _dl_start gets the parameter in %eax.\n\
|
|
movl %esp, %eax\n\
|
|
call _dl_start\n\
|
|
_dl_start_user:\n\
|
|
# Save the user entry point address in %edi.\n\
|
|
movl %eax, %edi\n\
|
|
# Point %ebx at the GOT.\n\
|
|
call 0b\n\
|
|
addl $_GLOBAL_OFFSET_TABLE_, %ebx\n\
|
|
# Store the highest stack address\n\
|
|
movl __libc_stack_end@GOT(%ebx), %eax\n\
|
|
movl %esp, (%eax)\n\
|
|
# See if we were run as a command with the executable file\n\
|
|
# name as an extra leading argument.\n\
|
|
movl _dl_skip_args@GOTOFF(%ebx), %eax\n\
|
|
# Pop the original argument count.\n\
|
|
popl %edx\n\
|
|
# Adjust the stack pointer to skip _dl_skip_args words.\n\
|
|
leal (%esp,%eax,4), %esp\n\
|
|
# Subtract _dl_skip_args from argc.\n\
|
|
subl %eax, %edx\n\
|
|
# Push argc back on the stack.\n\
|
|
push %edx\n\
|
|
# The special initializer gets called with the stack just\n\
|
|
# as the application's entry point will see it; it can\n\
|
|
# switch stacks if it moves these contents over.\n\
|
|
" RTLD_START_SPECIAL_INIT "\n\
|
|
# Load the parameters again.\n\
|
|
# (eax, edx, ecx, *--esp) = (_dl_loaded, argc, argv, envp)\n\
|
|
movl _rtld_local@GOTOFF(%ebx), %eax\n\
|
|
leal 8(%esp,%edx,4), %esi\n\
|
|
leal 4(%esp), %ecx\n\
|
|
pushl %esi\n\
|
|
# Call the function to run the initializers.\n\
|
|
call _dl_init_internal@PLT\n\
|
|
# Pass our finalizer function to the user in %edx, as per ELF ABI.\n\
|
|
leal _dl_fini@GOTOFF(%ebx), %edx\n\
|
|
# Jump to the user's entry point.\n\
|
|
jmp *%edi\n\
|
|
.previous\n\
|
|
");
|
|
|
|
#ifndef RTLD_START_SPECIAL_INIT
|
|
# define RTLD_START_SPECIAL_INIT /* nothing */
|
|
#endif
|
|
|
|
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or
|
|
TLS variable, so undefined references should not be allowed to
|
|
define the value.
|
|
ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one
|
|
of the main executable's symbols, as for a COPY reloc. */
|
|
#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
|
|
# define elf_machine_type_class(type) \
|
|
((((type) == R_386_JMP_SLOT || (type) == R_386_TLS_DTPMOD32 \
|
|
|| (type) == R_386_TLS_DTPOFF32 || (type) == R_386_TLS_TPOFF32 \
|
|
|| (type) == R_386_TLS_TPOFF) \
|
|
* ELF_RTYPE_CLASS_PLT) \
|
|
| (((type) == R_386_COPY) * ELF_RTYPE_CLASS_COPY))
|
|
#else
|
|
# define elf_machine_type_class(type) \
|
|
((((type) == R_386_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) \
|
|
| (((type) == R_386_COPY) * ELF_RTYPE_CLASS_COPY))
|
|
#endif
|
|
|
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
|
#define ELF_MACHINE_JMP_SLOT R_386_JMP_SLOT
|
|
|
|
/* The i386 never uses Elf32_Rela relocations for the dynamic linker.
|
|
Prelinked libraries may use Elf32_Rela though. */
|
|
#define ELF_MACHINE_PLT_REL 1
|
|
|
|
/* We define an initialization functions. This is called very early in
|
|
_dl_sysdep_start. */
|
|
#define DL_PLATFORM_INIT dl_platform_init ()
|
|
|
|
static inline void __attribute__ ((unused))
|
|
dl_platform_init (void)
|
|
{
|
|
if (GL(dl_platform) != NULL && *GL(dl_platform) == '\0')
|
|
/* Avoid an empty string which would disturb us. */
|
|
GL(dl_platform) = NULL;
|
|
}
|
|
|
|
static inline Elf32_Addr
|
|
elf_machine_fixup_plt (struct link_map *map, lookup_t t,
|
|
const Elf32_Rel *reloc,
|
|
Elf32_Addr *reloc_addr, Elf32_Addr value)
|
|
{
|
|
return *reloc_addr = value;
|
|
}
|
|
|
|
/* Return the final value of a plt relocation. */
|
|
static inline Elf32_Addr
|
|
elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
|
|
Elf32_Addr value)
|
|
{
|
|
return value;
|
|
}
|
|
|
|
#endif /* !dl_machine_h */
|
|
|
|
#ifdef RESOLVE
|
|
|
|
/* The i386 never uses Elf32_Rela relocations for the dynamic linker.
|
|
Prelinked libraries may use Elf32_Rela though. */
|
|
#ifdef RTLD_BOOTSTRAP
|
|
# define ELF_MACHINE_NO_RELA 1
|
|
#endif
|
|
|
|
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
MAP is the object containing the reloc. */
|
|
|
|
static inline void
|
|
elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
|
|
const Elf32_Sym *sym, const struct r_found_version *version,
|
|
Elf32_Addr *const reloc_addr)
|
|
{
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
|
|
|
#if !defined RTLD_BOOTSTRAP || !defined HAVE_Z_COMBRELOC
|
|
if (__builtin_expect (r_type == R_386_RELATIVE, 0))
|
|
{
|
|
# if !defined RTLD_BOOTSTRAP && !defined HAVE_Z_COMBRELOC
|
|
/* This is defined in rtld.c, but nowhere in the static libc.a;
|
|
make the reference weak so static programs can still link.
|
|
This declaration cannot be done when compiling rtld.c
|
|
(i.e. #ifdef RTLD_BOOTSTRAP) because rtld.c contains the
|
|
common defn for _dl_rtld_map, which is incompatible with a
|
|
weak decl in the same file. */
|
|
# ifndef SHARED
|
|
weak_extern (_dl_rtld_map);
|
|
# endif
|
|
if (map != &GL(dl_rtld_map)) /* Already done in rtld itself. */
|
|
# endif
|
|
*reloc_addr += map->l_addr;
|
|
}
|
|
# ifndef RTLD_BOOTSTRAP
|
|
else if (__builtin_expect (r_type == R_386_NONE, 0))
|
|
return;
|
|
# endif
|
|
else
|
|
#endif /* !RTLD_BOOTSTRAP and have no -z combreloc */
|
|
{
|
|
const Elf32_Sym *const refsym = sym;
|
|
#if defined USE_TLS && !defined RTLD_BOOTSTRAP
|
|
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
|
|
Elf32_Addr value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value;
|
|
#else
|
|
Elf32_Addr value = RESOLVE (&sym, version, r_type);
|
|
|
|
# ifndef RTLD_BOOTSTRAP
|
|
if (sym != NULL)
|
|
# endif
|
|
value += sym->st_value;
|
|
#endif /* use TLS and !RTLD_BOOTSTRAP */
|
|
|
|
switch (r_type)
|
|
{
|
|
case R_386_GLOB_DAT:
|
|
case R_386_JMP_SLOT:
|
|
*reloc_addr = value;
|
|
break;
|
|
|
|
#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
|
|
case R_386_TLS_DTPMOD32:
|
|
# ifdef RTLD_BOOTSTRAP
|
|
/* During startup the dynamic linker is always the module
|
|
with index 1.
|
|
XXX If this relocation is necessary move before RESOLVE
|
|
call. */
|
|
*reloc_addr = 1;
|
|
# else
|
|
/* Get the information from the link map returned by the
|
|
resolv function. */
|
|
if (sym_map != NULL)
|
|
*reloc_addr = sym_map->l_tls_modid;
|
|
# endif
|
|
break;
|
|
case R_386_TLS_DTPOFF32:
|
|
# ifndef RTLD_BOOTSTRAP
|
|
/* During relocation all TLS symbols are defined and used.
|
|
Therefore the offset is already correct. */
|
|
if (sym != NULL)
|
|
*reloc_addr = sym->st_value;
|
|
# endif
|
|
break;
|
|
case R_386_TLS_TPOFF32:
|
|
/* The offset is positive, backward from the thread pointer. */
|
|
# ifdef RTLD_BOOTSTRAP
|
|
*reloc_addr += map->l_tls_offset - sym->st_value;
|
|
# else
|
|
/* We know the offset of object the symbol is contained in.
|
|
It is a positive value which will be subtracted from the
|
|
thread pointer. To get the variable position in the TLS
|
|
block we subtract the offset from that of the TLS block. */
|
|
if (sym != NULL)
|
|
{
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
*reloc_addr += sym_map->l_tls_offset - sym->st_value;
|
|
}
|
|
# endif
|
|
break;
|
|
case R_386_TLS_TPOFF:
|
|
/* The offset is negative, forward from the thread pointer. */
|
|
# ifdef RTLD_BOOTSTRAP
|
|
*reloc_addr += sym->st_value - map->l_tls_offset;
|
|
# else
|
|
/* We know the offset of object the symbol is contained in.
|
|
It is a negative value which will be added to the
|
|
thread pointer. */
|
|
if (sym != NULL)
|
|
{
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
*reloc_addr += sym->st_value - sym_map->l_tls_offset;
|
|
}
|
|
# endif
|
|
break;
|
|
#endif /* use TLS */
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
case R_386_32:
|
|
*reloc_addr += value;
|
|
break;
|
|
case R_386_PC32:
|
|
*reloc_addr += (value - (Elf32_Addr) reloc_addr);
|
|
break;
|
|
case R_386_COPY:
|
|
if (sym == NULL)
|
|
/* This can happen in trace mode if an object could not be
|
|
found. */
|
|
break;
|
|
if (__builtin_expect (sym->st_size > refsym->st_size, 0)
|
|
|| (__builtin_expect (sym->st_size < refsym->st_size, 0)
|
|
&& GL(dl_verbose)))
|
|
{
|
|
const char *strtab;
|
|
|
|
strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]);
|
|
_dl_error_printf ("\
|
|
%s: Symbol `%s' has different size in shared object, consider re-linking\n",
|
|
rtld_progname ?: "<program name unknown>",
|
|
strtab + refsym->st_name);
|
|
}
|
|
memcpy (reloc_addr, (void *) value, MIN (sym->st_size,
|
|
refsym->st_size));
|
|
break;
|
|
default:
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
|
break;
|
|
#endif /* !RTLD_BOOTSTRAP */
|
|
}
|
|
}
|
|
}
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
static inline void
|
|
elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
|
const Elf32_Sym *sym, const struct r_found_version *version,
|
|
Elf32_Addr *const reloc_addr)
|
|
{
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
|
|
|
if (ELF32_R_TYPE (reloc->r_info) == R_386_RELATIVE)
|
|
*reloc_addr = map->l_addr + reloc->r_addend;
|
|
else if (r_type != R_386_NONE)
|
|
{
|
|
# ifndef RESOLVE_CONFLICT_FIND_MAP
|
|
const Elf32_Sym *const refsym = sym;
|
|
# endif
|
|
# ifdef USE_TLS
|
|
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
|
|
Elf32_Addr value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value;
|
|
# else
|
|
Elf32_Addr value = RESOLVE (&sym, version, ELF32_R_TYPE (reloc->r_info));
|
|
if (sym != NULL)
|
|
value += sym->st_value;
|
|
# endif
|
|
|
|
switch (ELF32_R_TYPE (reloc->r_info))
|
|
{
|
|
case R_386_GLOB_DAT:
|
|
case R_386_JMP_SLOT:
|
|
case R_386_32:
|
|
*reloc_addr = value + reloc->r_addend;
|
|
break;
|
|
case R_386_PC32:
|
|
*reloc_addr = (value + reloc->r_addend - (Elf32_Addr) reloc_addr);
|
|
break;
|
|
|
|
# ifdef USE_TLS
|
|
case R_386_TLS_DTPMOD32:
|
|
/* Get the information from the link map returned by the
|
|
resolv function. */
|
|
if (sym_map != NULL)
|
|
*reloc_addr = sym_map->l_tls_modid;
|
|
break;
|
|
case R_386_TLS_DTPOFF32:
|
|
/* During relocation all TLS symbols are defined and used.
|
|
Therefore the offset is already correct. */
|
|
*reloc_addr = (sym == NULL ? 0 : sym->st_value) + reloc->r_addend;
|
|
break;
|
|
case R_386_TLS_TPOFF32:
|
|
/* The offset is positive, backward from the thread pointer. */
|
|
/* We know the offset of object the symbol is contained in.
|
|
It is a positive value which will be subtracted from the
|
|
thread pointer. To get the variable position in the TLS
|
|
block we subtract the offset from that of the TLS block. */
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
*reloc_addr
|
|
= (sym == NULL ? 0 : sym_map->l_tls_offset - sym->st_value)
|
|
+ reloc->r_addend;
|
|
break;
|
|
case R_386_TLS_TPOFF:
|
|
/* The offset is negative, forward from the thread pointer. */
|
|
/* We know the offset of object the symbol is contained in.
|
|
It is a negative value which will be added to the
|
|
thread pointer. */
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
*reloc_addr
|
|
= (sym == NULL ? 0 : sym->st_value - sym_map->l_tls_offset)
|
|
+ reloc->r_addend;
|
|
break;
|
|
# endif /* use TLS */
|
|
# ifndef RESOLVE_CONFLICT_FIND_MAP
|
|
/* Not needed for dl-conflict.c. */
|
|
case R_386_COPY:
|
|
if (sym == NULL)
|
|
/* This can happen in trace mode if an object could not be
|
|
found. */
|
|
break;
|
|
if (__builtin_expect (sym->st_size > refsym->st_size, 0)
|
|
|| (__builtin_expect (sym->st_size < refsym->st_size, 0)
|
|
&& GL(dl_verbose)))
|
|
{
|
|
const char *strtab;
|
|
|
|
strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]);
|
|
_dl_error_printf ("\
|
|
%s: Symbol `%s' has different size in shared object, consider re-linking\n",
|
|
rtld_progname ?: "<program name unknown>",
|
|
strtab + refsym->st_name);
|
|
}
|
|
memcpy (reloc_addr, (void *) value, MIN (sym->st_size,
|
|
refsym->st_size));
|
|
break;
|
|
# endif /* !RESOLVE_CONFLICT_FIND_MAP */
|
|
default:
|
|
/* We add these checks in the version to relocate ld.so only
|
|
if we are still debugging. */
|
|
_dl_reloc_bad_type (map, r_type, 0);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
#endif /* !RTLD_BOOTSTRAP */
|
|
|
|
static inline void
|
|
elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
|
|
Elf32_Addr *const reloc_addr)
|
|
{
|
|
assert (ELF32_R_TYPE (reloc->r_info) == R_386_RELATIVE);
|
|
*reloc_addr += l_addr;
|
|
}
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
static inline void
|
|
elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
|
|
Elf32_Addr *const reloc_addr)
|
|
{
|
|
*reloc_addr = l_addr + reloc->r_addend;
|
|
}
|
|
#endif /* !RTLD_BOOTSTRAP */
|
|
|
|
static inline void
|
|
elf_machine_lazy_rel (struct link_map *map,
|
|
Elf32_Addr l_addr, const Elf32_Rel *reloc)
|
|
{
|
|
Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
|
|
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
|
|
/* Check for unexpected PLT reloc type. */
|
|
if (__builtin_expect (r_type == R_386_JMP_SLOT, 1))
|
|
{
|
|
if (__builtin_expect (map->l_mach.plt, 0) == 0)
|
|
*reloc_addr += l_addr;
|
|
else
|
|
*reloc_addr = (map->l_mach.plt
|
|
+ (((Elf32_Addr) reloc_addr) - map->l_mach.gotplt) * 4);
|
|
}
|
|
else
|
|
_dl_reloc_bad_type (map, r_type, 1);
|
|
}
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
static inline void
|
|
elf_machine_lazy_rela (struct link_map *map,
|
|
Elf32_Addr l_addr, const Elf32_Rela *reloc)
|
|
{
|
|
}
|
|
|
|
#endif /* !RTLD_BOOTSTRAP */
|
|
|
|
#endif /* RESOLVE */
|