Skip to content

Commit eb97739

Browse files
authored
[compiler-rt][RISC-V] Save/Restore for E goes with ABI (#95390)
When compiling for the ILP32E/LP64E ABIs, even on a RISC-V machine with `i`, we should be using the ILP32E/LP64E save/restore routines, so use the right preprocessor macro.
1 parent eeed589 commit eb97739

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

compiler-rt/lib/builtins/riscv/restore.S

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#if __riscv_xlen == 32
2424

25-
#ifndef __riscv_32e
25+
#ifndef __riscv_abi_rve
2626

2727
.globl __riscv_restore_12
2828
.type __riscv_restore_12,@function
@@ -109,7 +109,7 @@ __riscv_restore_0:
109109

110110
#elif __riscv_xlen == 64
111111

112-
#ifndef __riscv_64e
112+
#ifndef __riscv_abi_rve
113113

114114
.globl __riscv_restore_12
115115
.type __riscv_restore_12,@function

compiler-rt/lib/builtins/riscv/save.S

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#if __riscv_xlen == 32
2020

21-
#ifndef __riscv_32e
21+
#ifndef __riscv_abi_rve
2222

2323
.globl __riscv_save_12
2424
.type __riscv_save_12,@function
@@ -115,7 +115,7 @@ __riscv_save_0:
115115

116116
#elif __riscv_xlen == 64
117117

118-
#ifndef __riscv_64e
118+
#ifndef __riscv_abi_rve
119119

120120
.globl __riscv_save_12
121121
.type __riscv_save_12,@function

0 commit comments

Comments
 (0)