Author: br
Date: Thu Dec 24 15:47:51 2015
New Revision: 292691
URL: https://svnweb.freebsd.org/changeset/base/292691

Log:
  Add support for RISC-V architecture.
  
  Reviewed by:  andrew, kib
  Sponsored by: DARPA, AFRL
  Sponsored by: HEIF5
  Differential Revision:        https://reviews.freebsd.org/D4679

Added:
  head/libexec/rtld-elf/riscv/
  head/libexec/rtld-elf/riscv/reloc.c   (contents, props changed)
  head/libexec/rtld-elf/riscv/rtld_machdep.h   (contents, props changed)
  head/libexec/rtld-elf/riscv/rtld_start.S   (contents, props changed)
Modified:
  head/libexec/rtld-elf/rtld.c

Added: head/libexec/rtld-elf/riscv/reloc.c
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/libexec/rtld-elf/riscv/reloc.c Thu Dec 24 15:47:51 2015        
(r292691)
@@ -0,0 +1,400 @@
+/*-
+ * Copyright (c) 2015 Ruslan Bukin <b...@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * This software was developed by the University of Cambridge Computer
+ * Laboratory as part of the CTSRD Project, with support from the UK Higher
+ * Education Innovation Fund (HEIF).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+
+#include <stdlib.h>
+
+#include "debug.h"
+#include "rtld.h"
+#include "rtld_printf.h"
+
+/*
+ * It is possible for the compiler to emit relocations for unaligned data.
+ * We handle this situation with these inlines.
+ */
+#define        RELOC_ALIGNED_P(x) \
+       (((uintptr_t)(x) & (sizeof(void *) - 1)) == 0)
+
+void _exit(int);
+
+uint64_t
+set_gp(Obj_Entry *obj)
+{
+       uint64_t old;
+       SymLook req;
+       uint64_t gp;
+       int res;
+
+       __asm __volatile("mv    %0, gp" : "=r"(old));
+
+       symlook_init(&req, "_gp");
+       req.ventry = NULL;
+       req.flags = SYMLOOK_EARLY;
+       res = symlook_obj(&req, obj);
+
+       if (res == 0) {
+               gp = req.sym_out->st_value;
+               __asm __volatile("mv    gp, %0" :: "r"(gp));
+       }
+
+       return (old);
+}
+
+void
+init_pltgot(Obj_Entry *obj)
+{
+
+       if (obj->pltgot != NULL) {
+               obj->pltgot[0] = (Elf_Addr)&_rtld_bind_start;
+               obj->pltgot[1] = (Elf_Addr)obj;
+       }
+}
+
+int
+do_copy_relocations(Obj_Entry *dstobj)
+{
+       const Obj_Entry *srcobj, *defobj;
+       const Elf_Rela *relalim;
+       const Elf_Rela *rela;
+       const Elf_Sym *srcsym;
+       const Elf_Sym *dstsym;
+       const void *srcaddr;
+       const char *name;
+       void *dstaddr;
+       SymLook req;
+       size_t size;
+       int res;
+
+       /*
+        * COPY relocs are invalid outside of the main program
+        */
+       assert(dstobj->mainprog);
+
+       relalim = (const Elf_Rela *)((char *)dstobj->rela +
+           dstobj->relasize);
+       for (rela = dstobj->rela; rela < relalim; rela++) {
+               if (ELF_R_TYPE(rela->r_info) != R_RISCV_COPY)
+                       continue;
+
+               dstaddr = (void *)(dstobj->relocbase + rela->r_offset);
+               dstsym = dstobj->symtab + ELF_R_SYM(rela->r_info);
+               name = dstobj->strtab + dstsym->st_name;
+               size = dstsym->st_size;
+
+               symlook_init(&req, name);
+               req.ventry = fetch_ventry(dstobj, ELF_R_SYM(rela->r_info));
+               req.flags = SYMLOOK_EARLY;
+
+               for (srcobj = dstobj->next; srcobj != NULL;
+                    srcobj = srcobj->next) {
+                       res = symlook_obj(&req, srcobj);
+                       if (res == 0) {
+                               srcsym = req.sym_out;
+                               defobj = req.defobj_out;
+                               break;
+                       }
+               }
+               if (srcobj == NULL) {
+                       _rtld_error(
+"Undefined symbol \"%s\" referenced from COPY relocation in %s",
+                           name, dstobj->path);
+                       return (-1);
+               }
+
+               srcaddr = (const void *)(defobj->relocbase + srcsym->st_value);
+               memcpy(dstaddr, srcaddr, size);
+       }
+
+       return (0);
+}
+
+/*
+ * Process the PLT relocations.
+ */
+int
+reloc_plt(Obj_Entry *obj)
+{
+       const Elf_Rela *relalim;
+       const Elf_Rela *rela;
+
+       relalim = (const Elf_Rela *)((char *)obj->pltrela + obj->pltrelasize);
+       for (rela = obj->pltrela; rela < relalim; rela++) {
+               Elf_Addr *where;
+
+               assert(ELF_R_TYPE(rela->r_info) == R_RISCV_JUMP_SLOT);
+
+               where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
+               *where += (Elf_Addr)obj->relocbase;
+       }
+
+       return (0);
+}
+
+/*
+ * LD_BIND_NOW was set - force relocation for all jump slots
+ */
+int
+reloc_jmpslots(Obj_Entry *obj, int flags, RtldLockState *lockstate)
+{
+       const Obj_Entry *defobj;
+       const Elf_Rela *relalim;
+       const Elf_Rela *rela;
+       const Elf_Sym *def;
+
+       relalim = (const Elf_Rela *)((char *)obj->pltrela + obj->pltrelasize);
+       for (rela = obj->pltrela; rela < relalim; rela++) {
+               Elf_Addr *where;
+
+               where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
+               switch(ELF_R_TYPE(rela->r_info)) {
+               case R_RISCV_JUMP_SLOT:
+                       def = find_symdef(ELF_R_SYM(rela->r_info), obj,
+                           &defobj, SYMLOOK_IN_PLT | flags, NULL, lockstate);
+                       if (def == NULL) {
+                               dbg("reloc_jmpslots: sym not found");
+                               return (-1);
+                       }
+
+                       *where = (Elf_Addr)(defobj->relocbase + def->st_value);
+                       break;
+               default:
+                       _rtld_error("Unknown relocation type %x in jmpslot",
+                           (unsigned int)ELF_R_TYPE(rela->r_info));
+                       return (-1);
+               }
+       }
+
+       return (0);
+}
+
+int
+reloc_iresolve(Obj_Entry *obj, struct Struct_RtldLockState *lockstate)
+{
+
+       /* XXX not implemented */
+       return (0);
+}
+
+int
+reloc_gnu_ifunc(Obj_Entry *obj, int flags,
+   struct Struct_RtldLockState *lockstate)
+{
+
+       /* XXX not implemented */
+       return (0);
+}
+
+Elf_Addr
+reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const Obj_Entry *defobj,
+    const Obj_Entry *obj, const Elf_Rel *rel)
+{
+
+       assert(ELF_R_TYPE(rel->r_info) == R_RISCV_JUMP_SLOT);
+
+       if (*where != target)
+               *where = target;
+
+       return target;
+}
+
+/*
+ * Process non-PLT relocations
+ */
+int
+reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, int flags,
+    RtldLockState *lockstate)
+{
+       const Obj_Entry *defobj;
+       const Elf_Rela *relalim;
+       const Elf_Rela *rela;
+       const Elf_Sym *def;
+       SymCache *cache;
+       Elf_Addr *where;
+       unsigned long symnum;
+
+       if ((flags & SYMLOOK_IFUNC) != 0)
+               /* XXX not implemented */
+               return (0);
+
+       /*
+        * The dynamic loader may be called from a thread, we have
+        * limited amounts of stack available so we cannot use alloca().
+        */
+       if (obj == obj_rtld)
+               cache = NULL;
+       else
+               cache = calloc(obj->dynsymcount, sizeof(SymCache));
+               /* No need to check for NULL here */
+
+       relalim = (const Elf_Rela *)((caddr_t)obj->rela + obj->relasize);
+       for (rela = obj->rela; rela < relalim; rela++) {
+               where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
+               symnum = ELF_R_SYM(rela->r_info);
+
+               switch (ELF_R_TYPE(rela->r_info)) {
+               case R_RISCV_JUMP_SLOT:
+                       /* This will be handled by the plt/jmpslot routines */
+                       break;
+               case R_RISCV_NONE:
+                       break;
+               case R_RISCV_64:
+                       def = find_symdef(symnum, obj, &defobj, flags, cache,
+                           lockstate);
+                       if (def == NULL)
+                               return (-1);
+
+                       *where = (Elf_Addr)(defobj->relocbase + def->st_value +
+                           rela->r_addend);
+                       break;
+               case R_RISCV_TLS_DTPMOD64:
+                       def = find_symdef(symnum, obj, &defobj, flags, cache,
+                           lockstate);
+                       if (def == NULL)
+                               return -1;
+
+                       *where += (Elf_Addr)defobj->tlsindex;
+                       break;
+               case R_RISCV_COPY:
+                       /*
+                        * These are deferred until all other relocations have
+                        * been done. All we do here is make sure that the
+                        * COPY relocation is not in a shared library. They
+                        * are allowed only in executable files.
+                        */
+                       if (!obj->mainprog) {
+                               _rtld_error("%s: Unexpected R_RISCV_COPY "
+                                   "relocation in shared library", obj->path);
+                               return (-1);
+                       }
+                       break;
+               case R_RISCV_TLS_DTPREL64:
+                       def = find_symdef(symnum, obj, &defobj, flags, cache,
+                           lockstate);
+                       if (def == NULL)
+                               return (-1);
+                       /*
+                        * We lazily allocate offsets for static TLS as we
+                        * see the first relocation that references the
+                        * TLS block. This allows us to support (small
+                        * amounts of) static TLS in dynamically loaded
+                        * modules. If we run out of space, we generate an
+                        * error.
+                        */
+                       if (!defobj->tls_done) {
+                               if (!allocate_tls_offset((Obj_Entry*) defobj)) {
+                                       _rtld_error(
+                                           "%s: No space available for static "
+                                           "Thread Local Storage", obj->path);
+                                       return (-1);
+                               }
+                       }
+
+                       *where += (Elf_Addr)(def->st_value + rela->r_addend
+                           - TLS_DTV_OFFSET);
+                       break;
+               case R_RISCV_TLS_TPREL64:
+                       def = find_symdef(symnum, obj, &defobj, flags, cache,
+                           lockstate);
+                       if (def == NULL)
+                               return (-1);
+
+                       /*
+                        * We lazily allocate offsets for static TLS as we
+                        * see the first relocation that references the
+                        * TLS block. This allows us to support (small
+                        * amounts of) static TLS in dynamically loaded
+                        * modules. If we run out of space, we generate an
+                        * error.
+                        */
+                       if (!defobj->tls_done) {
+                               if (!allocate_tls_offset((Obj_Entry*) defobj)) {
+                                       _rtld_error(
+                                           "%s: No space available for static "
+                                           "Thread Local Storage", obj->path);
+                                       return (-1);
+                               }
+                       }
+
+                       *where = (def->st_value + rela->r_addend +
+                           defobj->tlsoffset - TLS_TP_OFFSET);
+                       break;
+               case R_RISCV_RELATIVE:
+                       *where = (Elf_Addr)(obj->relocbase + rela->r_addend);
+                       break;
+               default:
+                       rtld_printf("%s: Unhandled relocation %lu\n",
+                           obj->path, ELF_R_TYPE(rela->r_info));
+                       return (-1);
+               }
+       }
+
+       return (0);
+}
+
+void
+allocate_initial_tls(Obj_Entry *objs)
+{
+       Elf_Addr **tp;
+
+       /*
+        * Fix the size of the static TLS block by using the maximum
+        * offset allocated so far and adding a bit for dynamic modules to
+        * use.
+        */
+       tls_static_space = tls_last_offset + tls_last_size +
+           RTLD_STATIC_TLS_EXTRA;
+
+       tp = (Elf_Addr **) ((char *)allocate_tls(objs, NULL, TLS_TCB_SIZE, 16)
+           + TLS_TP_OFFSET + TLS_TCB_SIZE);
+
+       __asm __volatile("mv  tp, %0" :: "r"(tp));
+}
+
+void *
+__tls_get_addr(tls_index* ti)
+{
+       char *_tp;
+       void *p;
+
+       __asm __volatile("mv %0, tp" : "=r" (_tp));
+
+       p = tls_get_addr_common((Elf_Addr**)((Elf_Addr)_tp - TLS_TP_OFFSET
+           - TLS_TCB_SIZE), ti->ti_module, ti->ti_offset);
+
+       return (p + TLS_DTV_OFFSET);
+}

Added: head/libexec/rtld-elf/riscv/rtld_machdep.h
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/libexec/rtld-elf/riscv/rtld_machdep.h  Thu Dec 24 15:47:51 2015        
(r292691)
@@ -0,0 +1,111 @@
+/*-
+ * Copyright (c) 1999, 2000 John D. Polstra.
+ * Copyright (c) 2015 Ruslan Bukin <b...@bsdpad.com>
+ * All rights reserved.
+ *
+ * Portions of this software were developed by SRI International and the
+ * University of Cambridge Computer Laboratory under DARPA/AFRL contract
+ * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Portions of this software were developed by the University of Cambridge
+ * Computer Laboratory as part of the CTSRD Project, with support from the
+ * UK Higher Education Innovation Fund (HEIF).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef RTLD_MACHDEP_H
+#define RTLD_MACHDEP_H 1
+
+#include <sys/types.h>
+#include <machine/atomic.h>
+
+struct Struct_Obj_Entry;
+
+uint64_t set_gp(struct Struct_Obj_Entry *obj);
+
+/* Return the address of the .dynamic section in the dynamic linker. */
+#define rtld_dynamic(obj)                                               \
+({                                                                      \
+       Elf_Addr _dynamic_addr;                                         \
+       __asm __volatile("lla       %0, _DYNAMIC" : "=r"(_dynamic_addr));   \
+       (const Elf_Dyn *)_dynamic_addr;                                 \
+})
+#define RTLD_IS_DYNAMIC() (1)
+
+Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target,
+                      const struct Struct_Obj_Entry *defobj,
+                      const struct Struct_Obj_Entry *obj,
+                      const Elf_Rel *rel);
+
+#define make_function_pointer(def, defobj) \
+       ((defobj)->relocbase + (def)->st_value)
+
+#define call_initfini_pointer(obj, target)                             \
+({                                                                     \
+       uint64_t old0;                                                  \
+       old0 = set_gp(obj);                                             \
+       (((InitFunc)(target))());                                       \
+       __asm __volatile("mv    gp, %0" :: "r"(old0));                  \
+})
+
+#define call_init_pointer(obj, target)                                 \
+({                                                                     \
+       uint64_t old1;                                                  \
+       old1 = set_gp(obj);                                             \
+       (((InitArrFunc)(target))(main_argc, main_argv, environ));       \
+       __asm __volatile("mv    gp, %0" :: "r"(old1));                  \
+})
+
+/*
+ * Lazy binding entry point, called via PLT.
+ */
+void _rtld_bind_start(void);
+
+/*
+ * TLS
+ */
+#define        TLS_TP_OFFSET   0x0
+#define        TLS_DTV_OFFSET  0x800
+#define        TLS_TCB_SIZE    16
+
+#define round(size, align) \
+    (((size) + (align) - 1) & ~((align) - 1))
+#define calculate_first_tls_offset(size, align) \
+    round(16, align)
+#define calculate_tls_offset(prev_offset, prev_size, size, align) \
+    round(prev_offset + prev_size, align)
+#define calculate_tls_end(off, size)    ((off) + (size))
+
+typedef struct {
+       unsigned long ti_module;
+       unsigned long ti_offset;
+} tls_index;
+
+extern void *__tls_get_addr(tls_index* ti);
+
+#define        RTLD_DEFAULT_STACK_PF_EXEC      PF_X
+#define        RTLD_DEFAULT_STACK_EXEC         PROT_EXEC
+
+#endif

Added: head/libexec/rtld-elf/riscv/rtld_start.S
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/libexec/rtld-elf/riscv/rtld_start.S    Thu Dec 24 15:47:51 2015        
(r292691)
@@ -0,0 +1,129 @@
+/*-
+ * Copyright (c) 2015 Ruslan Bukin <b...@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * This software was developed by the University of Cambridge Computer
+ * Laboratory as part of the CTSRD Project, with support from the UK Higher
+ * Education Innovation Fund (HEIF).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * func_ptr_type
+ * _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp)
+ */
+
+ENTRY(.rtld_start)
+       mv      s0, a0          /* Put ps_strings in a callee-saved register */
+       mv      s1, sp          /* And the stack pointer */
+
+       addi    sp, sp, -16     /* Make room for obj_main & exit proc */
+
+       mv      a1, sp          /* exit_proc */
+       addi    a2, a1, 8       /* obj_main */
+       jal     _rtld           /* Call the loader */
+       mv      t0, a0          /* Backup the entry point */
+
+       ld      a2, 0(sp)       /* Load cleanup */
+       ld      a1, 8(sp)       /* Load obj_main */
+       mv      a0, s0          /* Restore ps_strings */
+       mv      sp, s1          /* Restore the stack pointer */
+       jr      t0              /* Jump to the entry point */
+END(.rtld_start)
+
+/*
+ * t0 = obj pointer
+ * t1 = reloc offset
+ */
+ENTRY(_rtld_bind_start)
+       /* Save the arguments and ra */
+       addi    sp, sp, -(8 * 25)
+       sd      a0, (8 * 0)(sp)
+       sd      a1, (8 * 1)(sp)
+       sd      a2, (8 * 2)(sp)
+       sd      a3, (8 * 3)(sp)
+       sd      a4, (8 * 4)(sp)
+       sd      a5, (8 * 5)(sp)
+       sd      a6, (8 * 6)(sp)
+       sd      a7, (8 * 7)(sp)
+       sd      ra, (8 * 8)(sp)
+#if 0
+       /* RISCVTODO VFP */
+       /* Save any floating-point arguments */
+       fsq     fa0, (8 * 9)(sp)
+       fsq     fa1, (8 * 11)(sp)
+       fsq     fa2, (8 * 13)(sp)
+       fsq     fa3, (8 * 15)(sp)
+       fsq     fa4, (8 * 17)(sp)
+       fsq     fa5, (8 * 19)(sp)
+       fsq     fa6, (8 * 21)(sp)
+       fsq     fa7, (8 * 23)(sp)
+#endif
+
+       /* Reloc offset is 3x of the .got.plt offset */
+       slli    a1, t1, 1       /* Mult items by 2 */
+       add     a1, a1, t1      /* Plus item */
+
+       /* Load obj */
+       mv      a0, t0
+
+       /* Call into rtld */
+       jal     _rtld_bind
+
+       /* Backup the address to branch to */
+       mv      t0, a0
+
+       /* Restore the arguments and ra */
+       ld      a0, (8 * 0)(sp)
+       ld      a1, (8 * 1)(sp)
+       ld      a2, (8 * 2)(sp)
+       ld      a3, (8 * 3)(sp)
+       ld      a4, (8 * 4)(sp)
+       ld      a5, (8 * 5)(sp)
+       ld      a6, (8 * 6)(sp)
+       ld      a7, (8 * 7)(sp)
+       ld      ra, (8 * 8)(sp)
+#if 0
+       /* RISCVTODO VFP */
+       /* Restore floating-point arguments */
+       flq     fa0, (8 * 9)(sp)
+       flq     fa1, (8 * 11)(sp)
+       flq     fa2, (8 * 13)(sp)
+       flq     fa3, (8 * 15)(sp)
+       flq     fa4, (8 * 17)(sp)
+       flq     fa5, (8 * 19)(sp)
+       flq     fa6, (8 * 21)(sp)
+       flq     fa7, (8 * 23)(sp)
+#endif
+       addi    sp, sp, (8 * 25)
+
+       /* Call into the correct function */
+       jr      t0
+END(_rtld_bind_start)

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c        Thu Dec 24 14:53:29 2015        
(r292690)
+++ head/libexec/rtld-elf/rtld.c        Thu Dec 24 15:47:51 2015        
(r292691)
@@ -4396,7 +4396,7 @@ tls_get_addr_common(Elf_Addr **dtvp, int
 }
 
 #if defined(__aarch64__) || defined(__arm__) || defined(__mips__) || \
-    defined(__powerpc__)
+    defined(__powerpc__) || defined(__riscv__)
 
 /*
  * Allocate Static TLS using the Variant I method.
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to