mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-11 05:40:06 +00:00
1fb05e3db1
1997-02-19 03:28 Miles Bader <miles@gnu.ai.mit.edu> * argp/argp-help.c: Add support for user provided filter of help messages. * argp/argp-parse.c: Likewise. * argp/argp.h: Likewise. * argp/argp-namefrob.h: Define __argp_input. * argp/argp-test.c: Add example for filter. 1997-02-19 02:58 Ulrich Drepper <drepper@cygnus.com> * argp.h: New file. * locale/programs/locale.c: Switch to use argp. * errno.h: Make it possible to get definition of error_t even after having errno.h already. * elf/dl-hash.h: New file. ELF hashing function. Extracted from dl-lookup.c. * elf/dl-lookup.c (_dl_elf_hash): Remove definition. * elf/dl-load.c: Rename _dl_does_name_match_p to _dl_name_match_p. * elf/dl-version.c: Likewise. * elf/dl-lookup.c: Implement new versioning lookup scheme. * elf/dl-version.c (_dl_check_map_versions): Initialize new field in l_versions member. * elf/dlvsym.c: Correct call of _dl_lookup_versioned_symbol_skip and _dl_lookup_versioned_symbol. * elf/link.h: Rename hash_name_pair to struct r_found_version. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/mips/dl-machine.h: Likewise. * intl/l10nflist.c: (_nl_make_l10nflist): Fix bug in computation of length of abs_filename. * locale/Makefile (CPPFLAGS): Define LOCALE_ALIAS_PATH. * locale/programs/ld-monetary.c (monetary_add): Allow value 0 in mon_grouping information. This means no more grouping. * locale/programs/ld-numeric.c (numeric_add): Write value \377 when seein value 0 in grouping information. * locale/programs/linereader.c (lr_close): Don't free fname since it might be used in error messages. * locale/programs/locale.c: Check whether output of `locale -a' really is locale directory. Also print locale aliases. * misc/search.h (__action_fn_t): Parameters VALUE and LEVEL cannot be const. 1997-02-19 02:16 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Correct #defin to #define. Reported by Rick Flower <FLOWER@sdvax2.sdd.TRW.COM>. 1997-02-19 01:37 Erik Troan <ewt@redhat.com> * shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields. 1997-02-19 01:02 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/mman/syscalls.list: msync takes 3 arguments. Reported by Andreas Jaeger <aj@arthur.pfalz.de>. * sysdeps/stub/msync.c (msync): Add missing third parameter. 1997-02-19 00:29 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/bsd/sigsuspend.c: Call __sigpause with needed additional argument. 1997-02-18 22:13 Ulrich Drepper <drepper@cygnus.com> * inet/net/ethernet.h: New file. * sysdeps/unix/sysv/linux/netinet/if_ether.c: Add BSD compatibility. * sysdeps/unix/sysv/linux/net/if_slip.h: New file. Contributed by a sun <asun@zoology.washington.edu>. * sysdeps/unix/sysv/linux/net/if_arp.h: Include <sys/socket.h>. * sunrpc/rpc/rpc_msg.h: Include <rpc/clnt.h>. Reported by a sun <asun@zoology.washington.edu>. 1997-02-16 14:25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules ((common-objpfx)distinfo-$(subdir)): Depend on sysdep makefiles which may change the distinfo variables. 1997-02-16 14:03 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=misc]: Add sys/quota.h. (sysdep_headers) [$(subdir)=inet]: Add netinet/udp.h. 1997-02-17 13:12 aleph1@dfw.net * sunrpc/clnt_simp.c (callrpc): Prevent buffer overflow by using strncpy. 1997-02-18 03:28 Ulrich Drepper <drepper@cygnus.com> * stdio-common/bug10.c (main): Correct parameter. 1997-02-17 02:51 Ulrich Drepper <drepper@cygnus.com> * malloc/obstack.h: Add `extern "C"' protection. * posix/regex.h: Likewise. * io/ftw.h: Likewise. * misc/libgen.h: Likewise. * login/utmp.h: Likewise. * sysdeps/unix/sysv/linux/sys/reboot.h: Likewise. * sysdeps/unix/sysv/linux/netinet/in.h: Likewise. * sunrpc/rpc/pmap_rmt.h: Likewise. * sunrpc/rpc/auth_des.h: Likewise. * elf/link.h: Likewise. Reported by HJ Lu. 1997-02-17 01:45 a sun <asun@zoology.washington.edu> Linux specific network headers. * sysdeps/unix/sysv/linux/netinet/if_fddi.h: New file. * sysdeps/unix/sysv/linux/netinet/if_tr.h: New file. * sysdeps/unix/sysv/linux/netinet/ip_icmp.h: New file. * sysdeps/unix/sysv/linux/netinet/ip_fw.h: New file. * sysdeps/unix/sysv/linux/netinet/igmp.h: New file. * sysdeps/unix/sysv/linux/netinet/icmp.h: New file. * sysdeps/unix/sysv/linux/netinet/ip.h: New file. * sysdeps/unix/sysv/linux/netinet/tcp.h: New file. * sysdeps/unix/sysv/linux/netipx/ipx.h: New file. * sysdeps/unix/sysv/linux/netatalk/atalk.h: New file. * sysdeps/unix/sysv/linux/Dist: Add new network headers. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=misc] (sysdep_headers): Add sys/quota.h. [$(subdir)=inet] (sysdep_headers): Add new network header. * sysdeps/unix/sysv/linux/netinet/udp.h: Add Linux specific changes. * inet/netinet/ip.h: Move to sysdeps/generic. * inet/netinet/tcp.h: Likewise. * sysdeps/generic/netinet/ip.h: Moved to here from inet/netinet. * sysdeps/generic/netinet/tcp.h: Likewise. 1997-02-17 01:18 Ulrich Drepper <drepper@cygnus.com> * misc/sys/syslog.h (prioritynames): Correct definition to use braces where necessary. (facilitynames): Likewise. Patch by Ronald F. Guilmette <rfg@monkeys.com>. Comment and beautify declarations. 1997-02-16 19:54 1997 Philip Blundell <Philip.Blundell@pobox.com> * inet/Makefile (routines): Add in6_addr, getnameinfo. * inet/getnameinfo.c: New file. Implementation of getnameinfo() by Craig Metz. * inet/in6_addr.c: New file. IPv6 addressing constants. * posix/Makefile (routines): Add gai_strerror. * resolv/netdb.h: Add more constants for IPv6 basic API. * sysdeps/posix/gai_strerror.c: New file. * sysdeps/stub/gai_strerror.c New file. * sysdeps/unix/sysv/linux/netinet/in.h: Add definitions for IPv6 basic API. * sysdeps/posix/getaddrinfo.c: Update from latest version by Craig Metz and use reentrant getXXbyYY functions. 1997-02-15 14:32 Andreas Jaeger <aj@arthur.pfalz.de> * argp/argp.h: Declare argp_program_version as const char. * argp/argp-test.c: Likewise * stdlib/testrand.c (main): Declare main prototype. * stdlib/testdiv.c (main): Likewise. * string/testcopy.c (main): Likewise. * string/test-ffs.c (main): Likewise. * time/test_time.c (main): Likewise. * locale/duplocale.c (__duplocale): Return result. 1997-02-16 03:54 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/in.h: Declare bindresvport. Reported by fabsoft@fabserver1.zarm.uni-bremen.de. * nss/nss.h: Remove declaration of __nss_shlib_revision. * nss/nsswitch.c: Don't use NSS_SHLIB_VERSION macro. 1997-02-16 03:48 Thorsten Kukuk <kukuk@weber.uni-paderborn.de> * nis/nss_nis/nis-ethers.c (_nss_nis_getethernam_r): Rename to _nss_nis_gethostton_r. (_nss_nis_getetherbyaddr_r): Rename to _nss_nis_getntohost_r. 1997-02-15 22:37 Andy Berkheimer <andy@tho.org> * resolv/gethnamaddr.c (gethostbyname2): Test for ':' in name before trying to resolv name as numeric IPv6 address. * nss/digits_dots.c: Likewise. Sat Feb 15 04:51:08 1997 Ulrich Drepper <drepper@cygnus.com> * locale/setlocale.c (setlocale): Don't try to be clever about unused locales. When the existence of the locale files isn't tested the result of setlocale might be different. 1997-02-15 03:34 Ulrich Drepper <drepper@cygnus.com> * locale/setlocale.c (setlocale): Don't increment usage_count of new locale if it already has the value MAX_USAGE_COUNT (it might be the C locale data which is read-only).
284 lines
9.4 KiB
C
284 lines
9.4 KiB
C
/* Machine-dependent ELF dynamic relocation inline functions. i386 version.
|
|
Copyright (C) 1995, 1996, 1997 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., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#ifndef dl_machine_h
|
|
#define dl_machine_h
|
|
|
|
#define ELF_MACHINE_NAME "i386"
|
|
|
|
#include <assert.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_386:
|
|
case EM_486:
|
|
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
|
|
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)
|
|
{
|
|
Elf32_Addr addr;
|
|
asm (" call here\n"
|
|
"here: popl %0\n"
|
|
" subl $here, %0"
|
|
: "=r" (addr));
|
|
return addr;
|
|
}
|
|
/* The `subl' insn above will contain an R_386_32 relocation entry
|
|
intended to insert the run-time address of the label `here'.
|
|
This will be the first relocation in the text of the dynamic linker;
|
|
we skip it to avoid trying to modify read-only text in this early stage. */
|
|
#define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info) \
|
|
++(const Elf32_Rel *) (dynamic_info)[DT_REL]->d_un.d_ptr; \
|
|
(dynamic_info)[DT_RELSZ]->d_un.d_val -= sizeof (Elf32_Rel);
|
|
|
|
|
|
/* 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. */
|
|
static ElfW(Addr) fixup (struct link_map *l, ElfW(Word) reloc_offset)
|
|
__attribute__ ((regparm (2), unused));
|
|
|
|
/* 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 void __attribute__ ((unused))
|
|
elf_machine_runtime_setup (struct link_map *l, int lazy)
|
|
{
|
|
Elf32_Addr *got;
|
|
extern void _dl_runtime_resolve (Elf32_Word);
|
|
|
|
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 *) (l->l_addr + l->l_info[DT_PLTGOT]->d_un.d_ptr);
|
|
got[1] = (Elf32_Addr) l; /* Identify this shared object. */
|
|
/* 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;
|
|
}
|
|
|
|
|
|
/* This code is used in dl-runtime.c to call the `fixup' function
|
|
and then redirect to the address it returns. */
|
|
#define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
|
.globl _dl_runtime_resolve
|
|
.type _dl_runtime_resolve, @function
|
|
_dl_runtime_resolve:
|
|
pushl %eax # Preserve registers otherwise clobbered.
|
|
pushl %ecx
|
|
pushl %edx
|
|
movl 16(%esp), %edx # Copy args pushed by PLT in register. Note
|
|
movl 12(%esp), %eax # that `fixup' takes its parameters in regs.
|
|
call fixup # Call resolver.
|
|
popl %edx # Get register content back.
|
|
popl %ecx
|
|
xchgl %eax, (%esp) # Get %eax contents end store function address.
|
|
ret $8 # Jump to function address.
|
|
.size _dl_runtime_resolve, .-_dl_runtime_resolve
|
|
");
|
|
/* The PLT uses Elf32_Rel relocs. */
|
|
#define elf_machine_relplt elf_machine_rel
|
|
}
|
|
|
|
/* 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\n\
|
|
.globl _start\n\
|
|
.globl _dl_start_user\n\
|
|
_start:\n\
|
|
pushl %esp\n\
|
|
call _dl_start\n\
|
|
popl %ebx\n\
|
|
_dl_start_user:\n\
|
|
# Save the user entry point address in %edi.\n\
|
|
movl %eax, %edi\n\
|
|
# Point %ebx at the GOT.
|
|
call 0f\n\
|
|
0: popl %ebx\n\
|
|
addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx\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@GOT(%ebx), %eax\n\
|
|
movl (%eax), %eax\n\
|
|
# Pop the original argument count.\n\
|
|
popl %ecx\n\
|
|
# Subtract _dl_skip_args from it.\n\
|
|
subl %eax, %ecx\n\
|
|
# Adjust the stack pointer to skip _dl_skip_args words.\n\
|
|
leal (%esp,%eax,4), %esp\n\
|
|
# Push back the modified argument count.\n\
|
|
pushl %ecx\n\
|
|
# Push _dl_default_scope[2] as argument in _dl_init_next call below.\n\
|
|
movl _dl_default_scope@GOT(%ebx), %eax\n\
|
|
movl 8(%eax), %esi\n\
|
|
0: pushl %esi\n\
|
|
# Call _dl_init_next to return the address of an initializer\n\
|
|
# function to run.\n\
|
|
call _dl_init_next@PLT\n\
|
|
addl $4, %esp # Pop argument.\n\
|
|
# Check for zero return, when out of initializers.\n\
|
|
testl %eax, %eax\n\
|
|
jz 1f\n\
|
|
# Call the shared object initializer function.\n\
|
|
# NOTE: We depend only on the registers (%ebx, %esi and %edi)\n\
|
|
# and the return address pushed by this call;\n\
|
|
# the initializer is called with the stack just\n\
|
|
# as it appears on entry, and it is free to move\n\
|
|
# the stack around, as long as it winds up jumping to\n\
|
|
# the return address on the top of the stack.\n\
|
|
call *%eax\n\
|
|
# Loop to call _dl_init_next for the next initializer.\n\
|
|
jmp 0b\n\
|
|
1: # Clear the startup flag.\n\
|
|
movl _dl_starting_up@GOT(%ebx), %eax\n\
|
|
movl $0, (%eax)\n\
|
|
# Pass our finalizer function to the user in %edx, as per ELF ABI.\n\
|
|
movl _dl_fini@GOT(%ebx), %edx\n\
|
|
# Jump to the user's entry point.\n\
|
|
jmp *%edi\n\
|
|
");
|
|
|
|
/* Nonzero iff TYPE describes relocation of a PLT entry, so
|
|
PLT entries should not be allowed to define the value. */
|
|
#define elf_machine_pltrel_p(type) ((type) == R_386_JMP_SLOT)
|
|
|
|
/* The i386 never uses Elf32_Rela relocations. */
|
|
#define ELF_MACHINE_NO_RELA 1
|
|
|
|
#endif /* !dl_machine_h */
|
|
|
|
#ifdef RESOLVE
|
|
|
|
/* 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 = (void *) (map->l_addr + reloc->r_offset);
|
|
Elf32_Addr loadbase;
|
|
|
|
switch (ELF32_R_TYPE (reloc->r_info))
|
|
{
|
|
case R_386_COPY:
|
|
loadbase = RESOLVE (&sym, version, DL_LOOKUP_NOEXEC);
|
|
memcpy (reloc_addr, (void *) (loadbase + sym->st_value), sym->st_size);
|
|
break;
|
|
case R_386_GLOB_DAT:
|
|
loadbase = RESOLVE (&sym, version, 0);
|
|
*reloc_addr = sym ? (loadbase + sym->st_value) : 0;
|
|
break;
|
|
case R_386_JMP_SLOT:
|
|
loadbase = RESOLVE (&sym, version, DL_LOOKUP_NOPLT);
|
|
*reloc_addr = sym ? (loadbase + sym->st_value) : 0;
|
|
break;
|
|
case R_386_32:
|
|
{
|
|
Elf32_Addr undo = 0;
|
|
#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. */
|
|
undo = map->l_addr + sym->st_value;
|
|
#endif
|
|
loadbase = RESOLVE (&sym, version, 0);
|
|
*reloc_addr += (sym ? (loadbase + sym->st_value) : 0) - undo;
|
|
break;
|
|
}
|
|
case R_386_RELATIVE:
|
|
#ifndef RTLD_BOOTSTRAP
|
|
if (map != &_dl_rtld_map) /* Already done in rtld itself. */
|
|
#endif
|
|
*reloc_addr += map->l_addr;
|
|
break;
|
|
case R_386_PC32:
|
|
loadbase = RESOLVE (&sym, version, 0);
|
|
*reloc_addr += ((sym ? (loadbase + sym->st_value) : 0) -
|
|
(Elf32_Addr) reloc_addr);
|
|
break;
|
|
case R_386_NONE: /* Alright, Wilbur. */
|
|
break;
|
|
default:
|
|
assert (! "unexpected dynamic reloc type");
|
|
break;
|
|
}
|
|
|
|
}
|
|
|
|
static inline void
|
|
elf_machine_lazy_rel (struct link_map *map, const Elf32_Rel *reloc)
|
|
{
|
|
Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
|
|
switch (ELF32_R_TYPE (reloc->r_info))
|
|
{
|
|
case R_386_JMP_SLOT:
|
|
*reloc_addr += map->l_addr;
|
|
break;
|
|
default:
|
|
assert (! "unexpected PLT reloc type");
|
|
break;
|
|
}
|
|
}
|
|
|
|
#endif /* RESOLVE */
|