commit e0b94748541459293634b374b9b878b6c437d0e3
author Elliott Hughes <enh@google.com> Sat Oct 08 03:02:56 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 08 03:02:56 2022 +0000
tree a75a02301d5dabd254ba312ce47ec12df576d322
parent 002b57c00e0b63616bf9dc8d8c2d65dd2a9ee659
parent fc009dd8a7afb99c020c863ad3bc198e70117eb3

Merge "riscv64 __get_tls()."

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index d985c81..e59fac2 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1921,6 +1921,9 @@
         arm64: {
             export_system_include_dirs: ["kernel/uapi/asm-arm64"],
         },
+        riscv64: {
+            export_system_include_dirs: ["kernel/uapi/asm-riscv"],
+        },
         x86: {
             export_system_include_dirs: ["kernel/uapi/asm-x86"],
         },

libc/platform/bionic/macros.h

diff --git a/libc/platform/bionic/macros.h b/libc/platform/bionic/macros.h
index 076cff1..9e13e0d 100644
--- a/libc/platform/bionic/macros.h
+++ b/libc/platform/bionic/macros.h
@@ -55,6 +55,8 @@
 #define BIONIC_STOP_UNWIND asm volatile(".cfi_undefined x30")
 #elif defined(__i386__)
 #define BIONIC_STOP_UNWIND asm volatile(".cfi_undefined \%eip")
+#elif defined(__riscv)
+#define BIONIC_STOP_UNWIND asm volatile(".cfi_undefined ra")
 #elif defined(__x86_64__)
 #define BIONIC_STOP_UNWIND asm volatile(".cfi_undefined \%rip")
 #endif