diff options
| author | Ralf Jung <post@ralfj.de> | 2020-09-19 11:47:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-19 11:47:56 +0200 |
| commit | b4c3f409af031a4bcc2cf1bb693789201a33ec1c (patch) | |
| tree | 61a7b35eee5c8317484af248dfadb2f6615ab9e4 /library/panic_unwind/src | |
| parent | 404cce068597b109a97b492ac268c7994a1a1606 (diff) | |
| parent | 3d1b6d6cc29587ace6895814fa32ec38a49d8a68 (diff) | |
| download | rust-b4c3f409af031a4bcc2cf1bb693789201a33ec1c.tar.gz rust-b4c3f409af031a4bcc2cf1bb693789201a33ec1c.zip | |
Rollup merge of #76798 - alistair23:alistair/rv32-linux, r=jyn514
Build fixes for RISC-V 32-bit Linux support This fixes build issues with the 32-bit RISC-V port.
Diffstat (limited to 'library/panic_unwind/src')
| -rw-r--r-- | library/panic_unwind/src/gcc.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/panic_unwind/src/gcc.rs b/library/panic_unwind/src/gcc.rs index 85a2a18947d..1cfd527b584 100644 --- a/library/panic_unwind/src/gcc.rs +++ b/library/panic_unwind/src/gcc.rs @@ -120,7 +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")] +#[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: |