diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-08-30 23:09:38 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-08-30 23:09:38 +0000 |
| commit | ee0cb67ec23814094bdc7ef973bd48f2ae7c649d (patch) | |
| tree | 08a94635f325f31d0413f9c76975c98cc13cd90f /sysdeps/ia64 | |
| parent | 628880cb788d64728f192a960a7f6c18e72862fc (diff) | |
| download | glibc-ee0cb67ec23814094bdc7ef973bd48f2ae7c649d.tar.gz glibc-ee0cb67ec23814094bdc7ef973bd48f2ae7c649d.tar.xz glibc-ee0cb67ec23814094bdc7ef973bd48f2ae7c649d.zip | |
Update.
2001-08-30 Jakub Jelinek <jakub@redhat.com> * sysdeps/alpha/dl-machine.h (elf_machine_rela): Don't handle R_ALPHA_RELATIVE if RTLD_BOOTSTRAP and HAVE_Z_COMBRELOC. Only check for rtld map if RTLD_BOOTSTRAP nor HAVE_Z_COMBRELOC is defined. * sysdeps/i386/dl-machine.h (elf_machine_rel): Similarly. * sysdeps/ia64/dl-machine.h (elf_machine_rel): Similarly. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rel): Similarly. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rel): Similarly.
Diffstat (limited to 'sysdeps/ia64')
| -rw-r--r-- | sysdeps/ia64/dl-machine.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h index 21e5615e90..2af418c122 100644 --- a/sysdeps/ia64/dl-machine.h +++ b/sysdeps/ia64/dl-machine.h @@ -508,7 +508,7 @@ elf_machine_rela (struct link_map *map, const unsigned long int r_type = ELF64_R_TYPE (reloc->r_info); Elf64_Addr value; -#ifndef RTLD_BOOTSTRAP +#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) @@ -520,28 +520,28 @@ elf_machine_rela (struct link_map *map, /* We cannot use a switch here because we cannot locate the switch jump table until we've self-relocated. */ +#if !defined RTLD_BOOTSTRAP || !defined HAVE_Z_COMBRELOC if (__builtin_expect (R_IA64_TYPE (r_type) == R_IA64_TYPE (R_IA64_REL64LSB), 0)) { assert (ELF64_R_TYPE (reloc->r_info) == R_IA64_REL64LSB); value = *reloc_addr; -#ifndef RTLD_BOOTSTRAP +# if !defined RTLD_BOOTSTRAP && !defined HAVE_Z_COMBRELOC /* Already done in dynamic linker. */ if (map != &_dl_rtld_map) -#endif +# endif value += map->l_addr; } -#ifndef RTLD_BOOTSTRAP +# ifndef RTLD_BOOTSTRAP else if (r_type == R_IA64_NONE) return; -#endif +# endif else +#endif { struct link_map *sym_map; - /* - * RESOLVE_MAP() will return NULL if it fail to locate the symbol - */ + /* RESOLVE_MAP() will return NULL if it fail to locate the symbol. */ if ((sym_map = RESOLVE_MAP (&sym, version, r_type))) { value = sym ? sym_map->l_addr + sym->st_value : 0; |