aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-30 23:09:38 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-30 23:09:38 +0000
commitee0cb67ec23814094bdc7ef973bd48f2ae7c649d (patch)
tree08a94635f325f31d0413f9c76975c98cc13cd90f /sysdeps/i386
parent628880cb788d64728f192a960a7f6c18e72862fc (diff)
downloadglibc-ee0cb67ec23814094bdc7ef973bd48f2ae7c649d.tar
glibc-ee0cb67ec23814094bdc7ef973bd48f2ae7c649d.tar.gz
glibc-ee0cb67ec23814094bdc7ef973bd48f2ae7c649d.tar.bz2
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/i386')
-rw-r--r--sysdeps/i386/dl-machine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index bb3e89c71b..2f7f96d487 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -308,7 +308,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
#if !defined RTLD_BOOTSTRAP || !defined HAVE_Z_COMBRELOC
if (__builtin_expect (r_type == R_386_RELATIVE, 0))
{
-# 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