diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-03-24 09:57:09 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-03-24 09:57:09 -0400 |
| commit | 93c7fa105f9cc4dbb36192469ecff47102d955d6 (patch) | |
| tree | 73b1484fbc82d170ec456053d954e241c5280a46 /lib/libunwind/src/libunwind.cpp | |
| parent | 5acc8afb5f9674b9b7b290635e9c2837872b8a93 (diff) | |
| parent | 94f7c560015f7cb7ed8046339e2d0724dc86fcd6 (diff) | |
| download | zig-93c7fa105f9cc4dbb36192469ecff47102d955d6.tar.gz zig-93c7fa105f9cc4dbb36192469ecff47102d955d6.zip | |
Merge remote-tracking branch 'origin/llvm10'
LLVM 10 was released today
Diffstat (limited to 'lib/libunwind/src/libunwind.cpp')
| -rw-r--r-- | lib/libunwind/src/libunwind.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libunwind/src/libunwind.cpp b/lib/libunwind/src/libunwind.cpp index c90032bd66..1ee58ad197 100644 --- a/lib/libunwind/src/libunwind.cpp +++ b/lib/libunwind/src/libunwind.cpp @@ -58,6 +58,8 @@ _LIBUNWIND_HIDDEN int __unw_init_local(unw_cursor_t *cursor, # warning The MIPS architecture is not supported with this ABI and environment! #elif defined(__sparc__) # define REGISTER_KIND Registers_sparc +#elif defined(__riscv) && __riscv_xlen == 64 +# define REGISTER_KIND Registers_riscv #else # error Architecture not supported #endif @@ -171,8 +173,7 @@ _LIBUNWIND_HIDDEN int __unw_get_proc_info(unw_cursor_t *cursor, co->getInfo(info); if (info->end_ip == 0) return UNW_ENOINFO; - else - return UNW_ESUCCESS; + return UNW_ESUCCESS; } _LIBUNWIND_WEAK_ALIAS(__unw_get_proc_info, unw_get_proc_info) @@ -194,8 +195,7 @@ _LIBUNWIND_HIDDEN int __unw_get_proc_name(unw_cursor_t *cursor, char *buf, AbstractUnwindCursor *co = (AbstractUnwindCursor *)cursor; if (co->getFunctionName(buf, bufLen, offset)) return UNW_ESUCCESS; - else - return UNW_EUNSPEC; + return UNW_EUNSPEC; } _LIBUNWIND_WEAK_ALIAS(__unw_get_proc_name, unw_get_proc_name) |