From: Megan Wachs <megan@sifive.com>
Date: Mon, 15 May 2017 02:41:07 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/priv-1.10' into HEAD
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=201fc773aef7f93107cbe098b9531ba6e18cd913;hp=a56ccdc256e75defdc14e4263bfbff4e2bbebfa6;p=riscv-tests.git

Merge remote-tracking branch 'origin/priv-1.10' into HEAD
---

diff --git a/benchmarks/common/syscalls.c b/benchmarks/common/syscalls.c
index 4940aa2..0a7d6b7 100644
--- a/benchmarks/common/syscalls.c
+++ b/benchmarks/common/syscalls.c
@@ -5,6 +5,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <limits.h>
+#include <sys/signal.h>
 #include "util.h"
 
 #define SYS_write 64
@@ -68,6 +69,11 @@ void exit(int code)
   tohost_exit(code);
 }
 
+void abort()
+{
+  exit(128 + SIGABRT);
+}
+
 void printstr(const char* s)
 {
   syscall(SYS_write, 1, (uintptr_t)s, strlen(s));
diff --git a/benchmarks/common/test.ld b/benchmarks/common/test.ld
index a08d71d..ada0862 100644
--- a/benchmarks/common/test.ld
+++ b/benchmarks/common/test.ld
@@ -12,6 +12,7 @@
    specifically one of the entires in bfd/cpu-mips.c */
 
 OUTPUT_ARCH( "riscv" )
+ENTRY(_start)
 
 /*----------------------------------------------------------------------*/
 /* Sections                                                             */
diff --git a/env b/env
index 3f1d04a..70f5e06 160000
--- a/env
+++ b/env
@@ -1 +1 @@
-Subproject commit 3f1d04a2e8f849c306bdca7c7115462c3a60a6e0
+Subproject commit 70f5e06eef154a1eaeb65d3f034c1857771100ff