Skip to content

Commit cb1a58c

Browse files
BernardXiongRbb666
authored andcommitted
[vdso] fix the arch/abi flag issue.
1 parent a5359b7 commit cb1a58c

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

components/lwp/vdso/user/arch/risc-v/SConstruct

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ def get_riscv64_default_arch_abi(gcc_bin):
1818
arch = None
1919
abi = None
2020
for line in result.splitlines():
21-
if '-march=' in line and '[default]' in line:
22-
arch = line.strip().split()[0]
23-
if '-mabi=' in line and '[default]' in line:
24-
abi = line.strip().split()[0]
21+
if '-march=' in line:
22+
arch = line.strip().split()[1]
23+
arch = arch.split('_')[0] # Get the base architecture, e.g., rv64imafdc
24+
if '-mabi=' in line and 'option' not in line:
25+
abi = line.strip().split()[1]
2526
return arch, abi
2627
except Exception as e:
2728
print("Error getting arch/abi:", e)
@@ -31,7 +32,7 @@ def get_riscv64_default_arch_abi(gcc_bin):
3132
CC_BIN = PREFIX + 'gcc'
3233
arch, abi = get_riscv64_default_arch_abi(CC_BIN)
3334
if arch and abi:
34-
DEVICE = f' {arch} {abi} '
35+
DEVICE = f' -march={arch} -mabi={abi} '
3536
else:
3637
DEVICE = ' -march=rv64imafdc -mabi=lp64' # fallback
3738

0 commit comments

Comments
 (0)