Module Name:    src
Committed By:   matt
Date:           Fri Sep 19 17:43:33 UTC 2014

Modified Files:
        src/libexec/ld.elf_so: Makefile rtld.h

Log Message:
RISC-V support.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.123 -r1.124 src/libexec/ld.elf_so/rtld.h

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/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.128 src/libexec/ld.elf_so/Makefile:1.129
--- src/libexec/ld.elf_so/Makefile:1.128	Wed Sep  3 19:31:32 2014
+++ src/libexec/ld.elf_so/Makefile	Fri Sep 19 17:43:33 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.128 2014/09/03 19:31:32 matt Exp $
+#	$NetBSD: Makefile,v 1.129 2014/09/19 17:43:33 matt Exp $
 #
 # NOTE: when changing ld.so, ensure that ldd still compiles.
 #
@@ -36,6 +36,7 @@ M=		${.CURDIR}/arch/${ARCHSUBDIR}
      (${MACHINE_CPU} == "mips") ||					\
      (${MACHINE_CPU} == "or1k") ||					\
      (${MACHINE_CPU} == "powerpc") ||					\
+     (${MACHINE_CPU} == "riscv") ||					\
      (${MACHINE_CPU} == "sh3") ||					\
      (${LDELFSO_MACHINE_ARCH} == "sparc") ||				\
      (${LDELFSO_MACHINE_ARCH} == "sparc64") ||				\

Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.123 src/libexec/ld.elf_so/rtld.h:1.124
--- src/libexec/ld.elf_so/rtld.h:1.123	Wed Aug 27 04:07:04 2014
+++ src/libexec/ld.elf_so/rtld.h	Fri Sep 19 17:43:33 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtld.h,v 1.123 2014/08/27 04:07:04 christos Exp $	 */
+/*	$NetBSD: rtld.h,v 1.124 2014/09/19 17:43:33 matt Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -179,7 +179,7 @@ typedef struct Struct_Obj_Entry {
 	const Elf_Sym  *symtab;		/* Symbol table */
 	const char     *strtab;		/* String table */
 	unsigned long   strsize;	/* Size in bytes of string table */
-#ifdef __mips__
+#if defined(__mips__) || defined(__riscv__)
 	Elf_Word        local_gotno;	/* Number of local GOT entries */
 	Elf_Word        symtabno;	/* Number of dynamic symbols */
 	Elf_Word        gotsym;		/* First dynamic symbol in GOT */

Reply via email to