commit c6bddf45162347ea6668441b4e77eefb499a09f8
author Elliott Hughes <enh@google.com> Sat Oct 08 03:03:13 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 08 03:03:13 2022 +0000
tree d4c4ce404ab2b4861858fd588a8946d6d6da3cb9
parent e0b94748541459293634b374b9b878b6c437d0e3
parent 4c6d66c47293a94792dcb226d5bbc86c034f2847

Merge "riscv64 <fenv.h>."

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

libc/platform/bionic/tls.h

diff --git a/libc/platform/bionic/tls.h b/libc/platform/bionic/tls.h
index bf9e65b..e01eccd 100644
--- a/libc/platform/bionic/tls.h
+++ b/libc/platform/bionic/tls.h
@@ -34,6 +34,8 @@
 # define __get_tls() ({ void** __val; __asm__("mrc p15, 0, %0, c13, c0, 3" : "=r"(__val)); __val; })
 #elif defined(__i386__)
 # define __get_tls() ({ void** __val; __asm__("movl %%gs:0, %0" : "=r"(__val)); __val; })
+#elif defined(__riscv)
+# define __get_tls() ({ void** __val; __asm__("mv %0, tp" : "=r"(__val)); __val; })
 #elif defined(__x86_64__)
 # define __get_tls() ({ void** __val; __asm__("mov %%fs:0, %0" : "=r"(__val)); __val; })
 #else