summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2001-07-15 03:09:22 +0000
committermatt <matt@NetBSD.org>2001-07-15 03:09:22 +0000
commit1c2ce68f11204a7d7a9f1134524c849c485f7662 (patch)
tree67d7ae64cfa4ca4ad5b5b1699759ead697446e3d /libexec
parenta61a40997d0e138a7b92655462d5fca50cc8994d (diff)
Enable arm if OBJECT_FMT is ELF. Initialize first few GOT entries for ARM.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/Makefile3
-rw-r--r--libexec/ld.elf_so/reloc.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile
index d9774cce148..c52691be0ec 100644
--- a/libexec/ld.elf_so/Makefile
+++ b/libexec/ld.elf_so/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2001/06/19 01:11:03 fvdl Exp $
+# $NetBSD: Makefile,v 1.38 2001/07/15 03:09:22 matt Exp $
.include <bsd.own.mk> # for OBJECT_FMT definition
@@ -6,6 +6,7 @@ ARCHSUBDIR= ${MACHINE_ARCH:C/mipse[bl]/mips/}
M= ${.CURDIR}/arch/${ARCHSUBDIR}
.if ((${MACHINE_ARCH} == "alpha") || \
+ (${MACHINE_ARCH} == "arm") || \
(${MACHINE_ARCH} == "i386") || \
(${MACHINE_ARCH} == "m68k") || \
(${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb") || \
diff --git a/libexec/ld.elf_so/reloc.c b/libexec/ld.elf_so/reloc.c
index dc05fdc2246..4e12bb8a4ff 100644
--- a/libexec/ld.elf_so/reloc.c
+++ b/libexec/ld.elf_so/reloc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: reloc.c,v 1.37 2001/07/15 01:44:10 matt Exp $ */
+/* $NetBSD: reloc.c,v 1.38 2001/07/15 03:09:22 matt Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -721,7 +721,8 @@ _rtld_relocate_objects(first, bind_now, dodebug)
/* Set the special PLTGOT entries. */
if (obj->pltgot != NULL) {
-#if defined(__i386__) || defined(__m68k__) || defined(__x86_64__)
+#if defined(__arm__) || defined(__i386__) || defined(__m68k__) || \
+ defined(__x86_64__)
obj->pltgot[1] = (Elf_Addr) obj;
obj->pltgot[2] = (Elf_Addr) & _rtld_bind_start;
#endif