diff options
| author | Megan Wachs <megan@sifive.com> | 2017-05-14 19:41:07 -0700 |
|---|---|---|
| committer | Megan Wachs <megan@sifive.com> | 2017-05-14 19:41:07 -0700 |
| commit | 201fc773aef7f93107cbe098b9531ba6e18cd913 (patch) | |
| tree | e6f37296b91a20095d062b6e1a61d932044f4594 | |
| parent | a56ccdc256e75defdc14e4263bfbff4e2bbebfa6 (diff) | |
| parent | af832bf8fd7ed43631e1d1ceb66b10027419a4e6 (diff) | |
| download | riscv-tests-201fc773aef7f93107cbe098b9531ba6e18cd913.zip riscv-tests-201fc773aef7f93107cbe098b9531ba6e18cd913.tar.gz riscv-tests-201fc773aef7f93107cbe098b9531ba6e18cd913.tar.bz2 | |
Merge remote-tracking branch 'origin/priv-1.10' into HEAD
| -rw-r--r-- | benchmarks/common/syscalls.c | 6 | ||||
| -rw-r--r-- | benchmarks/common/test.ld | 1 | ||||
| m--------- | env | 10 |
3 files changed, 12 insertions, 5 deletions
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 -Subproject 3f1d04a2e8f849c306bdca7c7115462c3a60a6e +Subproject 70f5e06eef154a1eaeb65d3f034c1857771100f |