From 787834ad4ab97c9b196cc2ab84fe897bb38618cb Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Mon, 17 Apr 2023 11:20:43 -0700 Subject: [PATCH] RISC-V: Set the ABI for the RVV tests The RVV test harness currently sets the ISA according to the target tuple, but doesn't also set the ABI. This just sets the ABI to match the ISA, though we should really also be respecting the user's specific ISA to test. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/rvv.exp (gcc_mabi): New variable. (cherry picked from commit e6b050da8a4513ab37fd3699c7a963421fbe4d81) --- gcc/testsuite/gcc.target/riscv/rvv/rvv.exp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp b/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp index 7a9a2b6ac486..4b5509db3856 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp +++ b/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp @@ -31,15 +31,17 @@ if ![info exists DEFAULT_CFLAGS] then { } set gcc_march "rv64gcv_zfh" +set gcc_mabi "lp64d" if [istarget riscv32-*-*] then { set gcc_march "rv32gcv_zfh" + set gcc_mabi "ilp32d" } # Initialize `dg'. dg-init # Main loop. -set CFLAGS "$DEFAULT_CFLAGS -march=$gcc_march -O3" +set CFLAGS "$DEFAULT_CFLAGS -march=$gcc_march -mabi=$gcc_mabi -O3" dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/base/*.\[cS\]]] \ "" $CFLAGS gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/vsetvl/*.\[cS\]]] \ -- 2.47.3