Module Name: src
Committed By: skrll
Date: Thu Apr 25 12:29:00 UTC 2013
Modified Files:
src/libexec/ld.elf_so: map_object.c
Log Message:
Adjust exidx_start by relocbase
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/libexec/ld.elf_so/map_object.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/map_object.c
diff -u src/libexec/ld.elf_so/map_object.c:1.46 src/libexec/ld.elf_so/map_object.c:1.47
--- src/libexec/ld.elf_so/map_object.c:1.46 Thu Apr 25 09:01:23 2013
+++ src/libexec/ld.elf_so/map_object.c Thu Apr 25 12:28:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: map_object.c,v 1.46 2013/04/25 09:01:23 skrll Exp $ */
+/* $NetBSD: map_object.c,v 1.47 2013/04/25 12:28:59 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: map_object.c,v 1.46 2013/04/25 09:01:23 skrll Exp $");
+__RCSID("$NetBSD: map_object.c,v 1.47 2013/04/25 12:28:59 skrll Exp $");
#endif /* not lint */
#include <errno.h>
@@ -401,6 +401,10 @@ _rtld_map_object(const char *path, int f
obj->interp = (void *)(obj->relocbase + (Elf_Addr)(uintptr_t)obj->interp);
if (obj->phdr_loaded)
obj->phdr = (void *)(obj->relocbase + (Elf_Addr)(uintptr_t)obj->phdr);
+#ifdef __ARM_EABI__
+ if (obj->exidx_start)
+ obj->exidx_start = (void *)(obj->relocbase + (Elf_Addr)(uintptr_t)obj->exidx_start);
+#endif
return obj;
