about summary refs log tree commit diff
path: root/library/panic_unwind/src
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2020-09-16 14:31:42 -0700
committerAlistair Francis <alistair.francis@wdc.com>2020-09-16 14:31:42 -0700
commitfd762681666d7fe229acf82a1b7b23476fd96148 (patch)
treee450788ded474b2ab939ef9bad1aa5c8a7d5d27c /library/panic_unwind/src
parent3e942958536aad794cec08a2d2b8d6f125e36bb4 (diff)
downloadrust-fd762681666d7fe229acf82a1b7b23476fd96148.tar.gz
rust-fd762681666d7fe229acf82a1b7b23476fd96148.zip
library/panic_unwind: Consolidate RV32 and RV64
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Diffstat (limited to 'library/panic_unwind/src')
-rw-r--r--library/panic_unwind/src/gcc.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/library/panic_unwind/src/gcc.rs b/library/panic_unwind/src/gcc.rs
index 81b7b556eb4..1cfd527b584 100644
--- a/library/panic_unwind/src/gcc.rs
+++ b/library/panic_unwind/src/gcc.rs
@@ -120,10 +120,7 @@ const UNWIND_DATA_REG: (i32, i32) = (24, 25); // I0, I1
 #[cfg(target_arch = "hexagon")]
 const UNWIND_DATA_REG: (i32, i32) = (0, 1); // R0, R1
 
-#[cfg(target_arch = "riscv64")]
-const UNWIND_DATA_REG: (i32, i32) = (10, 11); // x10, x11
-
-#[cfg(target_arch = "riscv32")]
+#[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))]
 const UNWIND_DATA_REG: (i32, i32) = (10, 11); // x10, x11
 
 // The following code is based on GCC's C and C++ personality routines.  For reference, see: