1998-03-18 22:42:25 +08:00
|
|
|
/* Machine-dependent ELF dynamic relocation inline functions. ARM version.
|
Update.
* elf/dynamic-link.h (elf_get_dynamic_info): Take new argument with
load address. Relocate d_ptr in DT_DTRTAB, DT_SYMTAB, DT_RELA, DT_REL,
DT_JMPREL, DT_PLTGOT, and DT_VERSYM l_info entry.
(_ELF_DYNAMIC_DO_RELOC): Take extra argument which specifies whether
rel and rela relocations can both happen and skip one test if this
is not possible.
(ELF_DYNAMIC_DO_RELA, ELF_DYNAMIC_DO_REL): Call _ELF_DYNAMIC_DO_RELOC
appropriately.
* elf/dl-addr.c (_dl_addr): DT_SYMTAB and DT_STRTAB entries are
already relocated.
* elf/dl-deps.c (_dl_map_object_deps): DT_STRTAB entry is already
relocated.
* elf/dl-load.c (_dl_init_paths): DT_STRTAB entry is already relocated.
(_dl_map_object_from_fd): Call elf_get_dynamic_info with new argument.
(_dl_map_object): DT_STRTAB entry is already relocated.
* elf/dl-lookup.c (do_lookup): DT_STRTAB and DT_SYMTAB entries are
already relocated.
* elf/dl-reloc.c (_dl_relocate_object): DT_STRTAB entry is already
relocated.
* elf/dl-runtime.c (fixup): DT_SYMTAB, DT_STRTAB, DT_JMPREL, and
DT_VERSYM entries are already relocated.
(profile_fixup): Likewise.
* elf/dl-version.c: Rename VERSTAG macro into VERSYMIDX. Replace
all users.
(match_symbol): DT_STRTAB entry is already relocated.
(_dl_check_map_versions): Likewise. Also fo DT_VERSYM.
* elf/do-rel.h (elf_dynamic_do_rel): reladdr is now assumed to be
relocated already. DT_SYMTAB and DT_VERSYM entries are also relocated.
* elf/rtld.c (_dl_start): Pass extra argument to elf_get_dynamic_info.
(find_needed): DT_STRTAB entry is already relocated.
(dl_main): Pass extra argument to elf_get_dynamic_info.
DT_STRTAB entry is already relocated.
* sysdeps/alpha/dl-machine.h (elf_machine_fixup_plt): DT_JMPREL and
DT_PLTGOT entries are already relocated.
(elf_machine_rela): Likewise for DT_SYMTAB.
* sysdeps/arm/dl-machine.h (elf_machine_rel): DT_STRTAB is already
relocated.
* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Likewise.
* sysdeps/mips/dl-machine.h (elf_machine_got_rel): Likewise.
(elf_machine_got_rel): Likewise for DT_SYMTAB and DT_STRTAB.
* grp/initgroups.c (initgroups): If function in current module was
successful don't stop but continue to process to get all the groups.
1999-02-20 23:02:24 +08:00
|
|
|
Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
|
1998-03-18 22:42:25 +08:00
|
|
|
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., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
#ifndef dl_machine_h
|
|
|
|
#define dl_machine_h
|
|
|
|
|
|
|
|
#define ELF_MACHINE_NAME "ARM"
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
|
|
|
/* Return nonzero iff E_MACHINE is compatible with the running host. */
|
|
|
|
static inline int __attribute__ ((unused))
|
|
|
|
elf_machine_matches_host (Elf32_Half e_machine)
|
|
|
|
{
|
|
|
|
switch (e_machine)
|
|
|
|
{
|
|
|
|
case EM_ARM:
|
|
|
|
return 1;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* 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 ("r10");
|
|
|
|
return *got;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the run-time load address of the shared object. */
|
|
|
|
static inline Elf32_Addr __attribute__ ((unused))
|
|
|
|
elf_machine_load_address (void)
|
|
|
|
{
|
1999-06-06 17:23:32 +08:00
|
|
|
extern void __dl_start asm ("_dl_start");
|
|
|
|
Elf32_Addr got_addr = (Elf32_Addr) &__dl_start;
|
|
|
|
Elf32_Addr pcrel_addr;
|
|
|
|
asm ("adr %0, _dl_start" : "=r" (pcrel_addr));
|
|
|
|
return pcrel_addr - got_addr;
|
1998-03-18 22:42:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* 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);
|
|
|
|
extern void _dl_runtime_profile (Elf32_Word);
|
|
|
|
|
|
|
|
if (l->l_info[DT_JMPREL] && lazy)
|
|
|
|
{
|
|
|
|
/* patb: this is different than i386 */
|
|
|
|
/* The GOT entries for functions in the PLT have not yet been filled
|
|
|
|
in. Their initial contents will arrange when called to push an
|
|
|
|
index into the .got section, load ip with &_GLOBAL_OFFSET_TABLE_[3],
|
|
|
|
and then jump to _GLOBAL_OFFSET_TABLE[2]. */
|
1999-03-02 16:07:31 +08:00
|
|
|
got = (Elf32_Addr *) l->l_info[DT_PLTGOT]->d_un.d_ptr;
|
1998-03-18 22:42:25 +08:00
|
|
|
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 (profile)
|
|
|
|
{
|
1998-09-18 17:10:43 +08:00
|
|
|
got[2] = (Elf32_Addr) &_dl_runtime_profile;
|
1998-03-18 22:42:25 +08:00
|
|
|
/* Say that we really want profiling and the timers are started. */
|
|
|
|
_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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This code is used in dl-runtime.c to call the `fixup' function
|
|
|
|
and then redirect to the address it returns. */
|
|
|
|
// macro for handling PIC situation....
|
|
|
|
#ifdef PIC
|
|
|
|
#define CALL_ROUTINE(x) " ldr sl,0f
|
|
|
|
add sl, pc, sl
|
|
|
|
1: ldr r2, 2f
|
|
|
|
mov lr, pc
|
|
|
|
add pc, sl, r2
|
|
|
|
b 3f
|
|
|
|
0: .word _GLOBAL_OFFSET_TABLE_ - 1b - 4
|
|
|
|
2: .word " #x "(GOTOFF)
|
|
|
|
3: "
|
|
|
|
#else
|
|
|
|
#define CALL_ROUTINE(x) " bl " #x
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef PROF
|
|
|
|
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
|
|
|
.text
|
|
|
|
.globl _dl_runtime_resolve
|
|
|
|
.type _dl_runtime_resolve, #function
|
|
|
|
.align 2
|
|
|
|
_dl_runtime_resolve:
|
|
|
|
@ we get called with
|
|
|
|
@ stack[0] contains the return address from this call
|
|
|
|
@ ip contains &GOT[n+3] (pointer to function)
|
|
|
|
@ lr points to &GOT[2]
|
|
|
|
|
|
|
|
@ save almost everything; lr is already on the stack
|
|
|
|
stmdb sp!,{r0-r3,sl,fp}
|
|
|
|
|
|
|
|
@ prepare to call fixup()
|
|
|
|
@ change &GOT[n+3] into 8*n NOTE: reloc are 8 bytes each
|
|
|
|
sub r1, ip, lr
|
|
|
|
sub r1, r1, #4
|
|
|
|
add r1, r1, r1
|
|
|
|
|
|
|
|
@ get pointer to linker struct
|
|
|
|
ldr r0, [lr, #-4]
|
|
|
|
|
1998-08-21 01:40:36 +08:00
|
|
|
@ call fixup routine
|
1998-03-18 22:42:25 +08:00
|
|
|
" CALL_ROUTINE(fixup) "
|
|
|
|
|
|
|
|
@ save the return
|
|
|
|
mov ip, r0
|
|
|
|
|
|
|
|
@ restore the stack
|
|
|
|
ldmia sp!,{r0-r3,sl,fp,lr}
|
|
|
|
|
|
|
|
@ jump to the newly found address
|
|
|
|
mov pc, ip
|
|
|
|
|
|
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve
|
1998-08-29 06:54:57 +08:00
|
|
|
|
1998-03-18 22:42:25 +08:00
|
|
|
.globl _dl_runtime_profile
|
|
|
|
.type _dl_runtime_profile, #function
|
|
|
|
.align 2
|
|
|
|
_dl_runtime_profile:
|
1998-08-21 01:40:36 +08:00
|
|
|
@ save almost everything; lr is already on the stack
|
|
|
|
stmdb sp!,{r0-r3,sl,fp}
|
1998-03-18 22:42:25 +08:00
|
|
|
|
|
|
|
@ prepare to call fixup()
|
|
|
|
@ change &GOT[n+3] into 8*n NOTE: reloc are 8 bytes each
|
|
|
|
sub r1, ip, lr
|
|
|
|
sub r1, r1, #4
|
|
|
|
add r1, r1, r1
|
|
|
|
|
|
|
|
@ get pointer to linker struct
|
|
|
|
ldr r0, [lr, #-4]
|
|
|
|
|
1998-08-21 01:40:36 +08:00
|
|
|
@ call profiling fixup routine
|
1998-03-18 22:42:25 +08:00
|
|
|
" CALL_ROUTINE(profile_fixup) "
|
|
|
|
|
|
|
|
@ save the return
|
|
|
|
mov ip, r0
|
|
|
|
|
|
|
|
@ restore the stack
|
1998-08-21 01:40:36 +08:00
|
|
|
ldmia sp!,{r0-r3,sl,fp,lr}
|
1998-03-18 22:42:25 +08:00
|
|
|
|
|
|
|
@ jump to the newly found address
|
|
|
|
mov pc, ip
|
|
|
|
|
1998-08-21 01:40:36 +08:00
|
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve
|
1998-03-18 22:42:25 +08:00
|
|
|
.previous
|
|
|
|
");
|
|
|
|
#else // PROF
|
|
|
|
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
|
|
|
.text
|
|
|
|
.globl _dl_runtime_resolve
|
|
|
|
.globl _dl_runtime_profile
|
|
|
|
.type _dl_runtime_resolve, #function
|
|
|
|
.type _dl_runtime_profile, #function
|
|
|
|
.align 2
|
|
|
|
_dl_runtime_resolve:
|
|
|
|
_dl_runtime_profile:
|
1998-08-21 01:40:36 +08:00
|
|
|
@ we get called with
|
|
|
|
@ stack[0] contains the return address from this call
|
|
|
|
@ ip contains &GOT[n+3] (pointer to function)
|
|
|
|
@ lr points to &GOT[2]
|
|
|
|
|
|
|
|
@ save almost everything; return add is already on the stack
|
|
|
|
stmdb sp!,{r0-r3,sl,fp}
|
|
|
|
|
|
|
|
@ prepare to call fixup()
|
|
|
|
@ change &GOT[n+3] into 8*n NOTE: reloc are 8 bytes each
|
1998-03-18 22:42:25 +08:00
|
|
|
sub r1, ip, lr
|
|
|
|
sub r1, r1, #4
|
|
|
|
add r1, r1, r1
|
1998-08-21 01:40:36 +08:00
|
|
|
|
|
|
|
@ get pointer to linker struct
|
1998-03-18 22:42:25 +08:00
|
|
|
ldr r0, [lr, #-4]
|
1998-08-21 01:40:36 +08:00
|
|
|
|
|
|
|
@ call profiling fixup routine
|
1998-03-18 22:42:25 +08:00
|
|
|
" CALL_ROUTINE(fixup) "
|
1998-08-21 01:40:36 +08:00
|
|
|
|
|
|
|
@ save the return
|
1998-03-18 22:42:25 +08:00
|
|
|
mov ip, r0
|
1998-08-21 01:40:36 +08:00
|
|
|
|
|
|
|
@ restore the stack
|
|
|
|
ldmia sp!,{r0-r3,sl,fp,lr}
|
|
|
|
|
|
|
|
@ jump to the newly found address
|
1998-03-18 22:42:25 +08:00
|
|
|
mov pc, ip
|
|
|
|
|
|
|
|
.size _dl_runtime_profile, .-_dl_runtime_profile
|
|
|
|
.previous
|
|
|
|
");
|
|
|
|
#endif //PROF
|
|
|
|
|
|
|
|
/* 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 ("\
|
|
|
|
.text
|
|
|
|
.globl _start
|
|
|
|
.globl _dl_start_user
|
|
|
|
_start:
|
|
|
|
@ at start time, all the args are on the stack
|
|
|
|
mov r0, sp
|
|
|
|
bl _dl_start
|
|
|
|
@ returns user entry point in r0
|
|
|
|
_dl_start_user:
|
|
|
|
mov r6, r0
|
|
|
|
@ we are PIC code, so get global offset table
|
|
|
|
ldr sl, .L_GET_GOT
|
|
|
|
add sl, pc, sl
|
|
|
|
.L_GOT_GOT:
|
1998-08-21 01:40:36 +08:00
|
|
|
@ Store the highest stack address
|
|
|
|
ldr r1, .L_STACK_END
|
|
|
|
ldr r1, [sl, r1]
|
|
|
|
str sp, [r1]
|
1998-03-18 22:42:25 +08:00
|
|
|
@ See if we were run as a command with the executable file
|
|
|
|
@ name as an extra leading argument.
|
|
|
|
ldr r1, .L_SKIP_ARGS
|
|
|
|
ldr r1, [sl, r1]
|
|
|
|
@ get the original arg count
|
|
|
|
ldr r0, [sp]
|
|
|
|
@ subtract _dl_skip_args from it
|
|
|
|
sub r0, r0, r1
|
|
|
|
@ adjust the stack pointer to skip them
|
|
|
|
add sp, sp, r1, lsl #2
|
|
|
|
@ store the new argc in the new stack location
|
|
|
|
str r0, [sp]
|
|
|
|
|
|
|
|
@ now we enter a _dl_init_next loop
|
1998-09-18 17:10:43 +08:00
|
|
|
ldr r4, .L_MAIN_SEARCHLIST
|
|
|
|
ldr r4, [sl, r4]
|
1998-12-05 04:58:15 +08:00
|
|
|
ldr r4, [r4]
|
1998-03-18 22:42:25 +08:00
|
|
|
@ call _dl_init_next to get the address of an initalizer
|
|
|
|
0: mov r0, r4
|
|
|
|
bl _dl_init_next(PLT)
|
|
|
|
cmp r0, #0
|
|
|
|
beq 1f
|
|
|
|
@ call the shared-object initializer
|
|
|
|
@ during this call, the stack may get moved around
|
|
|
|
mov lr, pc
|
|
|
|
mov pc, r0
|
|
|
|
@ go back and look for another initializer
|
|
|
|
b 0b
|
|
|
|
1: @ clear the startup flag
|
|
|
|
ldr r2, .L_STARTUP_FLAG
|
|
|
|
ldr r1, [sl, r2]
|
|
|
|
@ we know r0==0 at this point
|
|
|
|
str r0, [r1]
|
|
|
|
@ load the finalizer function
|
|
|
|
ldr r0, .L_FINI_PROC
|
|
|
|
ldr r0, [sl, r0]
|
|
|
|
@ jump to the user_s entry point
|
|
|
|
mov pc, r6
|
|
|
|
.L_GET_GOT:
|
|
|
|
.word _GLOBAL_OFFSET_TABLE_ - .L_GOT_GOT - 4 \n\
|
|
|
|
.L_SKIP_ARGS: \n\
|
|
|
|
.word _dl_skip_args(GOTOFF) \n\
|
|
|
|
.L_STARTUP_FLAG:
|
|
|
|
.word _dl_starting_up(GOT)
|
|
|
|
.L_FINI_PROC:
|
|
|
|
.word _dl_fini(GOT)
|
1998-08-21 01:40:36 +08:00
|
|
|
.L_STACK_END:
|
|
|
|
.word __libc_stack_end(GOT)
|
Update.
1998-10-02 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_PREFER,
SWAP_FLAG_PRIO_MASK,SWAP_FLAG_PRIO_SHIFT): Added.
Remove inclusion of <linux/swap.h>.
1998-10-05 Ulrich Drepper <drepper@cygnus.com>
* io/sys/stat.h: Use __P in definitions of inline stat functions
so that they match the declaration.
1998-10-02 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/quota.h (Q_RSQUASH): Added.
1998-10-02 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/acct.h: Bring in sync with current
linux 2.1 version.
1998-10-02 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/dl-machine.h: Fix typo in last change.
* sysdeps/arm/bits/huge_val.h: New file.
1998-10-02 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/reboot.h (RB_POWER_OFF): Added.
* sysdeps/unix/sysv/linux/sys/ptrace.h (PTRACE_SYSCALL): Add
define.
1998-10-05 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/posix/getcwd.c (__getcwd): Use temporary variable to
store result of realloc instead of using BUF.
1998-10-04 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* misc/sgtty.h (_SGTTY_H): Correct spelling.
Reported by Rouben Rostamian <rostamian@umbc.edu> [PR libc/817].
1998-10-04 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/memory.texi (Obstacks): Document
obstack_alloc_failed_handler usage.
* malloc/obstack.h: Enhance comment about
obstack_alloc_failed_handler usage.
* malloc/obstack.c: Likewise.
1998-10-05 Ulrich Drepper <drepper@cygnus.com>
* misc/sys/cdefs.h (__extension__): Define as empty if no gcc or
gcc before 2.8 is used.
1998-10-01 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/machine-gmon.h: Correct args to mcount(). Patch
from Scott Bambrough.
* sysdeps/unix/sysv/linux/arm/register-dump.h: New file.
* libio/libioP.h (FILEBUF_LITERAL) [! _IO_MTSAFE_IO]: Don't
include the lock member.
1998-09-03 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/fpu/__longjmp.S: Cope with fussy assembler.
1998-09-29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h (__string2_1bptr_p): Don't use a statement
expression.
(__mempcpy, strcpy, __stpcpy, strcmp, strcspn, strspn, strpbrk,
__strsep): Greatly reduce size of expansion by combining common
expressions.
(__mempcpy_small, __strcpy_small, __stpcpy_small): Convert to
inline function.
(__mempcpy_args, __strcpy_args, __stpcpy_args): New macros, used
by the above definitions.
1998-09-27 Geoff Keating <geoffk@ozemail.com.au>
* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: New file, use
correct struct ipc_perm definition.
1998-09-29 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/ypclnt.c (yp_all): Close UDP socket und give CLIENT handle free.
* sysdeps/unix/sysv/linux/alpha/ioperm.c: List Ruffian in platforms[].
* sysdeps/unix/sysv/linux/net/if_shaper.h: New file.
1998-10-05 21:40:47 +08:00
|
|
|
.L_MAIN_SEARCHLIST:
|
1998-09-18 17:10:43 +08:00
|
|
|
.word _dl_main_searchlist(GOT)
|
1998-03-18 22:42:25 +08:00
|
|
|
.previous\n\
|
|
|
|
");
|
|
|
|
|
|
|
|
/* Nonzero iff TYPE should not be allowed to resolve to one of
|
|
|
|
the main executable's symbols, as for a COPY reloc. */
|
|
|
|
#define elf_machine_lookup_noexec_p(type) ((type) == R_ARM_COPY)
|
|
|
|
|
|
|
|
/* Nonzero iff TYPE describes relocation of a PLT entry, so
|
|
|
|
PLT entries should not be allowed to define the value. */
|
1998-06-09 23:16:55 +08:00
|
|
|
#define elf_machine_lookup_noplt_p(type) ((type) == R_ARM_JUMP_SLOT)
|
1998-03-18 22:42:25 +08:00
|
|
|
|
|
|
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
1998-06-09 23:16:55 +08:00
|
|
|
#define ELF_MACHINE_JMP_SLOT R_ARM_JUMP_SLOT
|
1998-03-18 22:42:25 +08:00
|
|
|
|
Update.
1998-07-20 17:09 Ulrich Drepper <drepper@cygnus.com>
* shlib-versions: Remove definition for libSegFault.
* memory.texi: Comment out the relocating allocator description.
* manual/signal.texi: Remove reference to relocating allocator.
* manual/top-menu.texi: Regenerated.
* posix/fnmatch.c: Implement [: :] and change to recognize
^ as negation only when not _POSIXLY_CORRECT.
* sysdeps/generic/glob.c: Add several optimizations.
* posix/glob.h: Undefine __PMT to prevent warnings.
Reported by Roland McGrath.
* posix/regex.c: Define namespace macros only for _LIBC.
* sysdeps/arm/dl-machine.h: Fix typo.
* sysdeps/unix/sysv/sysv4/solaris2/sigpending.c: New file.
* sysdeps/unix/sysv/sysv4/solaris2/sigstack.c: New file.
* sysdeps/unix/sysv/sysv4/solaris2/sigwaitinfo.c: New file.
* sysdeps/unix/sysv/sysv4/solaris2/syscalls.list: Add sigaltstack,
sigpending, sigqueue, and sigtimedwait.
* sysdeps/unix/sysv/sysv4/solaris2/sparc/sparc32/syscall.S: New file.
* timezone/leapseconds: Update from tzdata1998f.
1998-07-18 Mark Kettenis <kettenis@phys.uva.nl>
* stdio/stdio.h [__USE_GNU]: Add prototype for fputs_unlocked.
* stdio/Versions [GLIBC_2.1]: Add fputs_unlocked.
* libio/stdio.h: Fix typo.
1998-07-19 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): #if 0 out the
magic memobj port arg parsing stuff. Fix it someday when we are ready
to really use it.
(_dl_sysdep_output): New function, modified from _dl_sysdep_error.
(_dl_sysdep_error, _dl_sysdep_message, _dl_sysdep_fatal): Removed.
1998-07-19 Roland McGrath <roland@baalperazim.frob.com>
* stdio/fputs.c: Add fputs_unlocked as weak alias for fputs.
1998-07-19 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/posix/sigsuspend.c: Define __sigsuspend with sigsuspend as
a weak alias.
* sysdeps/mach/hurd/sigsuspend.c: Likewise.
* sysdeps/generic/sigsuspend.c: Likewise.
1998-07-19 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/mach/hurd/i386/sigcontextinfo.h: New file.
1998-07-19 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makerules (map-file): Don't use $(wildcard) to find the
generated version script, instead look in $(version-maps).
($(common-objpfx)libc.so): Only depend on libc.map if versioning
is used.
* extra-lib.mk ($(objpfx)$(lib).so): Only depend on version script
if versioning is used. Don't use $(wildcard) to find the
generated version script, instead look in $(verson-maps).
1998-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/segfault.c: Rename GET_EIP to GET_PC. Remove
unused function handle.
* sysdeps/generic/sigcontextinfo.h: Rename GET_EIP to GET_PC.
* sysdeps/unix/sysv/linux/i386/sigcontextinfo.h: Likewise.
* debug/catchsegv.sh: Fix argument processing, quoting and various
typos. Put the crash info always in the current directory. Find
program in $PATH if it contains no directory component.
* Makerules (install-lib.so-versioned,
install-lib.so-unversioned): New variables.
(install-lib-nosubdir): Depend on unversioned libs in
slibdir, not libdir.
1998-07-19 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Make-dist (+tsrcs): Remove references to %-map variables and
*.map files. Add Versions in subdirs.
* Makerules (distinfo-vars): Don't write out %-map variables.
1998-07-20 13:55 Ulrich Drepper <drepper@cygnus.com>
* inet/protocols/rwhod.h: Remove definition of _PATH_RWHODIR.
Include <paths.h> instead.
* sysdeps/generic/paths.h: Define _PATH_RWHODIR.
* sysdeps/unix/sysv/linux/paths.h: Likewise.
Reported by Dale Scheetz <dwarf@polaris.net>.
1998-07-17 21:44 Ulrich Drepper <drepper@cygnus.com>
* catgets/open_catalog.c: Strictly check whether catalog file is
larger enough for the data. Reported by Andries.Brouwer@cwi.nl.
1998-07-21 01:25:48 +08:00
|
|
|
/* The ARM never uses Elf32_Rela relocations. */
|
1998-03-18 22:42:25 +08:00
|
|
|
#define ELF_MACHINE_NO_RELA 1
|
|
|
|
|
|
|
|
/* We define an initialization functions. This is called very early in
|
|
|
|
_dl_sysdep_start. */
|
|
|
|
#define DL_PLATFORM_INIT dl_platform_init ()
|
|
|
|
|
|
|
|
extern const char *_dl_platform;
|
|
|
|
|
|
|
|
static inline void __attribute__ ((unused))
|
|
|
|
dl_platform_init (void)
|
|
|
|
{
|
|
|
|
if (_dl_platform == NULL)
|
|
|
|
/* We default to ARM
|
|
|
|
This is where processors could be distinguished arm2, arm6, sa110, etc */
|
|
|
|
_dl_platform = "ARM";
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
elf_machine_fixup_plt (struct link_map *map, const Elf32_Rel *reloc,
|
|
|
|
Elf32_Addr *reloc_addr, Elf32_Addr value)
|
|
|
|
{
|
|
|
|
*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
|
|
|
|
|
|
|
|
extern char **_dl_argv;
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
{
|
|
|
|
if (ELF32_R_TYPE (reloc->r_info) == R_ARM_RELATIVE)
|
|
|
|
{
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
if (map != &_dl_rtld_map) /* Already done in rtld itself. */
|
|
|
|
#endif
|
|
|
|
*reloc_addr += map->l_addr;
|
|
|
|
}
|
|
|
|
else if (ELF32_R_TYPE (reloc->r_info) != R_ARM_NONE)
|
|
|
|
{
|
|
|
|
const Elf32_Sym *const refsym = sym;
|
|
|
|
Elf32_Addr value = RESOLVE (&sym, version, ELF32_R_TYPE (reloc->r_info));
|
|
|
|
if (sym)
|
|
|
|
value += sym->st_value;
|
|
|
|
|
|
|
|
switch (ELF32_R_TYPE (reloc->r_info))
|
|
|
|
{
|
|
|
|
case R_ARM_COPY:
|
|
|
|
if (sym == NULL)
|
|
|
|
/* This can happen in trace mode if an object could not be
|
|
|
|
found. */
|
|
|
|
break;
|
|
|
|
if (sym->st_size > refsym->st_size
|
|
|
|
|| (_dl_verbose && sym->st_size < refsym->st_size))
|
|
|
|
{
|
|
|
|
const char *strtab;
|
|
|
|
|
Update.
* elf/dynamic-link.h (elf_get_dynamic_info): Take new argument with
load address. Relocate d_ptr in DT_DTRTAB, DT_SYMTAB, DT_RELA, DT_REL,
DT_JMPREL, DT_PLTGOT, and DT_VERSYM l_info entry.
(_ELF_DYNAMIC_DO_RELOC): Take extra argument which specifies whether
rel and rela relocations can both happen and skip one test if this
is not possible.
(ELF_DYNAMIC_DO_RELA, ELF_DYNAMIC_DO_REL): Call _ELF_DYNAMIC_DO_RELOC
appropriately.
* elf/dl-addr.c (_dl_addr): DT_SYMTAB and DT_STRTAB entries are
already relocated.
* elf/dl-deps.c (_dl_map_object_deps): DT_STRTAB entry is already
relocated.
* elf/dl-load.c (_dl_init_paths): DT_STRTAB entry is already relocated.
(_dl_map_object_from_fd): Call elf_get_dynamic_info with new argument.
(_dl_map_object): DT_STRTAB entry is already relocated.
* elf/dl-lookup.c (do_lookup): DT_STRTAB and DT_SYMTAB entries are
already relocated.
* elf/dl-reloc.c (_dl_relocate_object): DT_STRTAB entry is already
relocated.
* elf/dl-runtime.c (fixup): DT_SYMTAB, DT_STRTAB, DT_JMPREL, and
DT_VERSYM entries are already relocated.
(profile_fixup): Likewise.
* elf/dl-version.c: Rename VERSTAG macro into VERSYMIDX. Replace
all users.
(match_symbol): DT_STRTAB entry is already relocated.
(_dl_check_map_versions): Likewise. Also fo DT_VERSYM.
* elf/do-rel.h (elf_dynamic_do_rel): reladdr is now assumed to be
relocated already. DT_SYMTAB and DT_VERSYM entries are also relocated.
* elf/rtld.c (_dl_start): Pass extra argument to elf_get_dynamic_info.
(find_needed): DT_STRTAB entry is already relocated.
(dl_main): Pass extra argument to elf_get_dynamic_info.
DT_STRTAB entry is already relocated.
* sysdeps/alpha/dl-machine.h (elf_machine_fixup_plt): DT_JMPREL and
DT_PLTGOT entries are already relocated.
(elf_machine_rela): Likewise for DT_SYMTAB.
* sysdeps/arm/dl-machine.h (elf_machine_rel): DT_STRTAB is already
relocated.
* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Likewise.
* sysdeps/mips/dl-machine.h (elf_machine_got_rel): Likewise.
(elf_machine_got_rel): Likewise for DT_SYMTAB and DT_STRTAB.
* grp/initgroups.c (initgroups): If function in current module was
successful don't stop but continue to process to get all the groups.
1999-02-20 23:02:24 +08:00
|
|
|
strtab = (const void *) map->l_info[DT_STRTAB]->d_un.d_ptr;
|
1998-03-18 22:42:25 +08:00
|
|
|
_dl_sysdep_error (_dl_argv[0] ?: "<program name unknown>",
|
|
|
|
": Symbol `", strtab + refsym->st_name,
|
|
|
|
"' has different size in shared object, "
|
|
|
|
"consider re-linking\n", NULL);
|
|
|
|
}
|
|
|
|
memcpy (reloc_addr, (void *) value, MIN (sym->st_size,
|
|
|
|
refsym->st_size));
|
|
|
|
break;
|
|
|
|
case R_ARM_GLOB_DAT:
|
1998-06-09 23:16:55 +08:00
|
|
|
case R_ARM_JUMP_SLOT:
|
Update.
* elf/dynamic-link.h (elf_get_dynamic_info): Take new argument with
load address. Relocate d_ptr in DT_DTRTAB, DT_SYMTAB, DT_RELA, DT_REL,
DT_JMPREL, DT_PLTGOT, and DT_VERSYM l_info entry.
(_ELF_DYNAMIC_DO_RELOC): Take extra argument which specifies whether
rel and rela relocations can both happen and skip one test if this
is not possible.
(ELF_DYNAMIC_DO_RELA, ELF_DYNAMIC_DO_REL): Call _ELF_DYNAMIC_DO_RELOC
appropriately.
* elf/dl-addr.c (_dl_addr): DT_SYMTAB and DT_STRTAB entries are
already relocated.
* elf/dl-deps.c (_dl_map_object_deps): DT_STRTAB entry is already
relocated.
* elf/dl-load.c (_dl_init_paths): DT_STRTAB entry is already relocated.
(_dl_map_object_from_fd): Call elf_get_dynamic_info with new argument.
(_dl_map_object): DT_STRTAB entry is already relocated.
* elf/dl-lookup.c (do_lookup): DT_STRTAB and DT_SYMTAB entries are
already relocated.
* elf/dl-reloc.c (_dl_relocate_object): DT_STRTAB entry is already
relocated.
* elf/dl-runtime.c (fixup): DT_SYMTAB, DT_STRTAB, DT_JMPREL, and
DT_VERSYM entries are already relocated.
(profile_fixup): Likewise.
* elf/dl-version.c: Rename VERSTAG macro into VERSYMIDX. Replace
all users.
(match_symbol): DT_STRTAB entry is already relocated.
(_dl_check_map_versions): Likewise. Also fo DT_VERSYM.
* elf/do-rel.h (elf_dynamic_do_rel): reladdr is now assumed to be
relocated already. DT_SYMTAB and DT_VERSYM entries are also relocated.
* elf/rtld.c (_dl_start): Pass extra argument to elf_get_dynamic_info.
(find_needed): DT_STRTAB entry is already relocated.
(dl_main): Pass extra argument to elf_get_dynamic_info.
DT_STRTAB entry is already relocated.
* sysdeps/alpha/dl-machine.h (elf_machine_fixup_plt): DT_JMPREL and
DT_PLTGOT entries are already relocated.
(elf_machine_rela): Likewise for DT_SYMTAB.
* sysdeps/arm/dl-machine.h (elf_machine_rel): DT_STRTAB is already
relocated.
* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Likewise.
* sysdeps/mips/dl-machine.h (elf_machine_got_rel): Likewise.
(elf_machine_got_rel): Likewise for DT_SYMTAB and DT_STRTAB.
* grp/initgroups.c (initgroups): If function in current module was
successful don't stop but continue to process to get all the groups.
1999-02-20 23:02:24 +08:00
|
|
|
#ifdef RTLD_BOOTSTRAP
|
1998-11-27 19:34:40 +08:00
|
|
|
/* Fix weak undefined references. */
|
Update.
* elf/dynamic-link.h (elf_get_dynamic_info): Take new argument with
load address. Relocate d_ptr in DT_DTRTAB, DT_SYMTAB, DT_RELA, DT_REL,
DT_JMPREL, DT_PLTGOT, and DT_VERSYM l_info entry.
(_ELF_DYNAMIC_DO_RELOC): Take extra argument which specifies whether
rel and rela relocations can both happen and skip one test if this
is not possible.
(ELF_DYNAMIC_DO_RELA, ELF_DYNAMIC_DO_REL): Call _ELF_DYNAMIC_DO_RELOC
appropriately.
* elf/dl-addr.c (_dl_addr): DT_SYMTAB and DT_STRTAB entries are
already relocated.
* elf/dl-deps.c (_dl_map_object_deps): DT_STRTAB entry is already
relocated.
* elf/dl-load.c (_dl_init_paths): DT_STRTAB entry is already relocated.
(_dl_map_object_from_fd): Call elf_get_dynamic_info with new argument.
(_dl_map_object): DT_STRTAB entry is already relocated.
* elf/dl-lookup.c (do_lookup): DT_STRTAB and DT_SYMTAB entries are
already relocated.
* elf/dl-reloc.c (_dl_relocate_object): DT_STRTAB entry is already
relocated.
* elf/dl-runtime.c (fixup): DT_SYMTAB, DT_STRTAB, DT_JMPREL, and
DT_VERSYM entries are already relocated.
(profile_fixup): Likewise.
* elf/dl-version.c: Rename VERSTAG macro into VERSYMIDX. Replace
all users.
(match_symbol): DT_STRTAB entry is already relocated.
(_dl_check_map_versions): Likewise. Also fo DT_VERSYM.
* elf/do-rel.h (elf_dynamic_do_rel): reladdr is now assumed to be
relocated already. DT_SYMTAB and DT_VERSYM entries are also relocated.
* elf/rtld.c (_dl_start): Pass extra argument to elf_get_dynamic_info.
(find_needed): DT_STRTAB entry is already relocated.
(dl_main): Pass extra argument to elf_get_dynamic_info.
DT_STRTAB entry is already relocated.
* sysdeps/alpha/dl-machine.h (elf_machine_fixup_plt): DT_JMPREL and
DT_PLTGOT entries are already relocated.
(elf_machine_rela): Likewise for DT_SYMTAB.
* sysdeps/arm/dl-machine.h (elf_machine_rel): DT_STRTAB is already
relocated.
* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Likewise.
* sysdeps/mips/dl-machine.h (elf_machine_got_rel): Likewise.
(elf_machine_got_rel): Likewise for DT_SYMTAB and DT_STRTAB.
* grp/initgroups.c (initgroups): If function in current module was
successful don't stop but continue to process to get all the groups.
1999-02-20 23:02:24 +08:00
|
|
|
if (sym != NULL && sym->st_value == 0)
|
1998-11-27 19:34:40 +08:00
|
|
|
*reloc_addr = 0;
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
*reloc_addr = value;
|
1998-03-18 22:42:25 +08:00
|
|
|
break;
|
1998-06-09 23:16:55 +08:00
|
|
|
case R_ARM_ABS32:
|
1998-03-18 22:42:25 +08:00
|
|
|
{
|
|
|
|
#ifndef RTLD_BOOTSTRAP
|
|
|
|
/* 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. */
|
|
|
|
weak_extern (_dl_rtld_map);
|
|
|
|
if (map == &_dl_rtld_map)
|
|
|
|
/* Undo the relocation done here during bootstrapping.
|
|
|
|
Now we will relocate it anew, possibly using a
|
|
|
|
binding found in the user program or a loaded library
|
|
|
|
rather than the dynamic linker's built-in definitions
|
|
|
|
used while loading those libraries. */
|
|
|
|
value -= map->l_addr + refsym->st_value;
|
|
|
|
#endif
|
|
|
|
*reloc_addr += value;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
1999-07-22 00:58:06 +08:00
|
|
|
_dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 0);
|
1998-03-18 22:42:25 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
1999-07-22 00:58:06 +08:00
|
|
|
elf_machine_lazy_rel (struct link_map *map,
|
|
|
|
Elf32_Addr l_addr, const Elf32_Rel *reloc)
|
1998-03-18 22:42:25 +08:00
|
|
|
{
|
1998-08-29 06:54:57 +08:00
|
|
|
Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
|
1998-09-18 17:10:43 +08:00
|
|
|
/* Check for unexpected PLT reloc type. */
|
1999-07-22 00:58:06 +08:00
|
|
|
if (ELF32_R_TYPE (reloc->r_info) == R_ARM_JUMP_SLOT)
|
|
|
|
*reloc_addr += l_addr;
|
|
|
|
else
|
|
|
|
_dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 1);
|
1998-03-18 22:42:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* RESOLVE */
|