[src/trunk]: src/libexec/ld.elf_so Implement a self-relocate function for the...

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/91a9349a4aab
branches:  trunk
changeset: 537106:91a9349a4aab
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Thu Sep 26 22:26:26 2002 +0000

description:
Implement a self-relocate function for the VAX.

diffstat:

 libexec/ld.elf_so/arch/vax/mdreloc.c    |  29 ++++++++++++++++++++++++++++-
 libexec/ld.elf_so/arch/vax/rtld_start.S |  18 ++++++++++++------
 libexec/ld.elf_so/rtld.c                |   6 +-----
 3 files changed, 41 insertions(+), 12 deletions(-)

diffs (105 lines):

diff -r 2a5db99bf085 -r 91a9349a4aab libexec/ld.elf_so/arch/vax/mdreloc.c
--- a/libexec/ld.elf_so/arch/vax/mdreloc.c      Thu Sep 26 21:35:27 2002 +0000
+++ b/libexec/ld.elf_so/arch/vax/mdreloc.c      Thu Sep 26 22:26:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mdreloc.c,v 1.14 2002/09/26 20:42:12 mycroft Exp $     */
+/*     $NetBSD: mdreloc.c,v 1.15 2002/09/26 22:26:27 mycroft Exp $     */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -7,6 +7,7 @@
 #include "rtld.h"
 
 void _rtld_bind_start(void);
+void _rtld_relocate_nonplt_self(Elf_Dyn *, Elf_Addr);
 caddr_t _rtld_bind __P((const Obj_Entry *, Elf_Word));
 
 void
@@ -16,6 +17,32 @@
        obj->pltgot[2] = (Elf_Addr) &_rtld_bind_start;
 }
 
+void
+_rtld_relocate_nonplt_self(dynp, relocbase)
+       Elf_Dyn *dynp;
+       Elf_Addr relocbase;
+{
+       const Elf_Rela *rela = 0, *relalim;
+       Elf_Addr relasz = 0;
+       Elf_Addr *where;
+
+       for (; dynp->d_tag != DT_NULL; dynp++) {
+               switch (dynp->d_tag) {
+               case DT_RELA:
+                       rela = (const Elf_Rela *)(relocbase + dynp->d_un.d_ptr);
+                       break;
+               case DT_RELASZ:
+                       relasz = dynp->d_un.d_val;
+                       break;
+               }
+       }
+       relalim = (const Elf_Rela *)((caddr_t)rela + relasz);
+       for (; rela < relalim; rela++) {
+               where = (Elf_Addr *)(relocbase + rela->r_offset);
+               *where = (Elf_Addr)(relocbase + rela->r_addend);
+       }
+}
+
 int
 _rtld_relocate_nonplt_objects(obj)
        const Obj_Entry *obj;
diff -r 2a5db99bf085 -r 91a9349a4aab libexec/ld.elf_so/arch/vax/rtld_start.S
--- a/libexec/ld.elf_so/arch/vax/rtld_start.S   Thu Sep 26 21:35:27 2002 +0000
+++ b/libexec/ld.elf_so/arch/vax/rtld_start.S   Thu Sep 26 22:26:26 2002 +0000
@@ -1,7 +1,8 @@
-/*     $NetBSD: rtld_start.S,v 1.8 2002/09/12 17:43:30 mycroft Exp $   */
+/*     $NetBSD: rtld_start.S,v 1.9 2002/09/26 22:26:27 mycroft Exp $   */
 
 /*
  * Copyright 1996 Matt Thomas <matt%3am-software.com@localhost>
+ * Portions copyright 2002 Charles M. Hannum.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,11 +45,16 @@
        clrl    %fp
        subl2   $8,%sp
 
-       movab   _GLOBAL_OFFSET_TABLE_,%r0
-       subl2   .L1,%r0
-       movl    %sp,%r1
-       pushl   %r0             /* relocbase */
-       pushl   %r1             /* sp */
+       movab   _DYNAMIC,%r0
+       movab   _GLOBAL_OFFSET_TABLE_,%r1
+       subl2   .L1,%r1
+       pushl   %r1             /* relocbase */
+       pushl   %r0             /* &_DYNAMIC */
+       calls   $2,_rtld_relocate_nonplt_self
+
+       movl    %sp,%r0
+       pushl   %r1             /* relocbase */
+       pushl   %r0             /* sp */
        calls   $2,_rtld        /* entry = _rtld(sp, relocbase) */
 
        movq    (%sp)+,%r7      /* grab cleanup and obj_main into %r7/%r8 */
diff -r 2a5db99bf085 -r 91a9349a4aab libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Thu Sep 26 21:35:27 2002 +0000
+++ b/libexec/ld.elf_so/rtld.c  Thu Sep 26 22:26:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.c,v 1.81 2002/09/26 20:42:10 mycroft Exp $         */
+/*     $NetBSD: rtld.c,v 1.82 2002/09/26 22:26:26 mycroft Exp $         */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -163,10 +163,6 @@
        assert(!_rtld_objself.pltgot && !_rtld_objself.textrel);
 #endif
 
-#ifdef __vax__
-       _rtld_relocate_nonplt_objects(&_rtld_objself);
-#endif
-
        _rtld_add_paths(&_rtld_default_paths, RTLD_DEFAULT_LIBRARY_PATH);
 
        /*