aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-03-01 20:34:40 +0000
committerRoland McGrath <roland@gnu.org>2005-03-01 20:34:40 +0000
commitc5cb341b7214beaba08096180729020d7a543b91 (patch)
treeba252c414e5044bafedb560d5000acb19ad398ae
parent68f3ec56719c41f72b8212c3f9daaa0ec8080ff7 (diff)
downloadglibc-c5cb341b7214beaba08096180729020d7a543b91.tar.xz
glibc-c5cb341b7214beaba08096180729020d7a543b91.zip
2005-03-01 Roland McGrath <roland@redhat.com>
[BZ #721] * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside of [RESOLVE_MAP].
-rw-r--r--sysdeps/arm/dl-machine.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
index 761f8daeaa..e8015ac5fe 100644
--- a/sysdeps/arm/dl-machine.h
+++ b/sysdeps/arm/dl-machine.h
@@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. ARM version.
- Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -350,13 +350,14 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
#endif /* !dl_machine_h */
-#ifdef RESOLVE
/* ARM 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
+#ifdef RTLD_BOOTSTRAP
+# define ELF_MACHINE_NO_RELA 1
+#endif
+
+#ifdef RESOLVE
/* Deal with an out-of-range PC24 reloc. */
static Elf32_Addr