diff mbox series

[3/3] testsuite: RISC-V: Explicitly specify ABI when passing -march

Message ID b305cb0c1fad975113ab161804d9144621002b0f.1733758825.git.dimitar@dinux.eu
State New
Headers show
Series testsuite: RISC-V: Improve support for RV32E | expand

Commit Message

Dimitar Dimitrov Dec. 9, 2024, 4:13 p.m. UTC
When GCC is configured for RV32E with:
  --target=riscv32-none-elf \
  --with-multilib-generator=rv32ec-ilp32e-- \
  --with-abi=ilp32e \
  --with-arch=rv32ec

Then many test cases fail because they explicitly set -march without
specifying an ABI.  Thus they end-up with invalid combination of
explicitly specified -march and a default ILP32E ABI:

  spawn ... -march=rv32gc_zbb ...
  cc1: error: ILP32E ABI does not support the 'D' extension

Fix by explicitly specifying a suitable ABI for each test case.  In
general this seems to be the recommendation from RISC-V people [1].

Downside of this fix is that test coverage is slightly decreased,
assuming there are several CI pipelines executing test runs for
different default ABIs.

The changes were semi-automatically prepared with the following crude
one-liners, but then all the code changes were manually inspected:

  # Specify ilp32d ABI in all RV32 test options.
  $ find gcc/testsuite -name "*.c" | \
    xargs sed -i 's/\(dg-[a-z-]*options.*-march=rv\)32\([ig][_a-zA-Z0-9]*\)\>/\132\2 -mabi=ilp32d/g'

  # Specify lp64d ABI in all RV64 test options.
  $ find gcc/testsuite -name "*.c" | \
    xargs sed -i 's/\(dg-[a-z-]*options.*-march=rv\)64\([ig][_a-zA-Z0-9]*\)\>/\164\2 -mabi=lp64d/g'

  # Revert changes to any case which had specified ABI.
  $ git checkout HEAD -- `git grep -l 'mabi=.\+mabi=' -- gcc/testsuite/`

[1] https://github.com/riscv-non-isa/riscv-toolchain-conventions/issues/13#issuecomment-856941534

gcc/testsuite/ChangeLog:

	* gcc.dg/pr90838.c: Specify ilp32d ABI for RV32, and lp64d for
	RV64.
	* gcc.target/riscv/adddibeq.c: Ditto.
	* gcc.target/riscv/adddibfeq.c: Ditto.
	* gcc.target/riscv/adddibfge.c: Ditto.
	* gcc.target/riscv/adddibfgt.c: Ditto.
	* gcc.target/riscv/adddibfle.c: Ditto.
	* gcc.target/riscv/adddibflt.c: Ditto.
	* gcc.target/riscv/adddibfne.c: Ditto.
	* gcc.target/riscv/adddibge.c: Ditto.
	* gcc.target/riscv/adddibgeu.c: Ditto.
	* gcc.target/riscv/adddibgt.c: Ditto.
	* gcc.target/riscv/adddibgtu.c: Ditto.
	* gcc.target/riscv/adddible.c: Ditto.
	* gcc.target/riscv/adddibleu.c: Ditto.
	* gcc.target/riscv/adddiblt.c: Ditto.
	* gcc.target/riscv/adddibltu.c: Ditto.
	* gcc.target/riscv/adddibne.c: Ditto.
	* gcc.target/riscv/adddieq.c: Ditto.
	* gcc.target/riscv/adddifeq.c: Ditto.
	* gcc.target/riscv/adddifge.c: Ditto.
	* gcc.target/riscv/adddifgt.c: Ditto.
	* gcc.target/riscv/adddifle.c: Ditto.
	* gcc.target/riscv/adddiflt.c: Ditto.
	* gcc.target/riscv/adddifne.c: Ditto.
	* gcc.target/riscv/adddige.c: Ditto.
	* gcc.target/riscv/adddigeu.c: Ditto.
	* gcc.target/riscv/adddigt.c: Ditto.
	* gcc.target/riscv/adddigtu.c: Ditto.
	* gcc.target/riscv/adddile.c: Ditto.
	* gcc.target/riscv/adddileu.c: Ditto.
	* gcc.target/riscv/adddilt.c: Ditto.
	* gcc.target/riscv/adddiltu.c: Ditto.
	* gcc.target/riscv/adddine.c: Ditto.
	* gcc.target/riscv/addsibeq.c: Ditto.
	* gcc.target/riscv/addsibfeq.c: Ditto.
	* gcc.target/riscv/addsibfge.c: Ditto.
	* gcc.target/riscv/addsibfgt.c: Ditto.
	* gcc.target/riscv/addsibfle.c: Ditto.
	* gcc.target/riscv/addsibflt.c: Ditto.
	* gcc.target/riscv/addsibfne.c: Ditto.
	* gcc.target/riscv/addsibge.c: Ditto.
	* gcc.target/riscv/addsibgeu.c: Ditto.
	* gcc.target/riscv/addsibgt.c: Ditto.
	* gcc.target/riscv/addsibgtu.c: Ditto.
	* gcc.target/riscv/addsible.c: Ditto.
	* gcc.target/riscv/addsibleu.c: Ditto.
	* gcc.target/riscv/addsiblt.c: Ditto.
	* gcc.target/riscv/addsibltu.c: Ditto.
	* gcc.target/riscv/addsibne.c: Ditto.
	* gcc.target/riscv/addsieq.c: Ditto.
	* gcc.target/riscv/addsifeq.c: Ditto.
	* gcc.target/riscv/addsifge.c: Ditto.
	* gcc.target/riscv/addsifgt.c: Ditto.
	* gcc.target/riscv/addsifle.c: Ditto.
	* gcc.target/riscv/addsiflt.c: Ditto.
	* gcc.target/riscv/addsifne.c: Ditto.
	* gcc.target/riscv/addsige.c: Ditto.
	* gcc.target/riscv/addsigeu.c: Ditto.
	* gcc.target/riscv/addsigt.c: Ditto.
	* gcc.target/riscv/addsigtu.c: Ditto.
	* gcc.target/riscv/addsile.c: Ditto.
	* gcc.target/riscv/addsileu.c: Ditto.
	* gcc.target/riscv/addsilt.c: Ditto.
	* gcc.target/riscv/addsiltu.c: Ditto.
	* gcc.target/riscv/addsine.c: Ditto.
	* gcc.target/riscv/cmo-zicboz-zic64-1.c: Ditto.
	* gcc.target/riscv/cmpmemsi-2.c: Ditto.
	* gcc.target/riscv/cmpmemsi-3.c: Ditto.
	* gcc.target/riscv/cmpmemsi.c: Ditto.
	* gcc.target/riscv/cpymemsi-2.c: Ditto.
	* gcc.target/riscv/cpymemsi-3.c: Ditto.
	* gcc.target/riscv/cpymemsi.c: Ditto.
	* gcc.target/riscv/crc-builtin-zbc32.c: Ditto.
	* gcc.target/riscv/crc-builtin-zbc64.c: Ditto.
	* gcc.target/riscv/cset-sext-rtl.c: Ditto.
	* gcc.target/riscv/cset-sext-rtl32.c: Ditto.
	* gcc.target/riscv/cset-sext-sfb-rtl.c: Ditto.
	* gcc.target/riscv/cset-sext-sfb-rtl32.c: Ditto.
	* gcc.target/riscv/cset-sext-sfb.c: Ditto.
	* gcc.target/riscv/cset-sext-thead-rtl.c: Ditto.
	* gcc.target/riscv/cset-sext-thead.c: Ditto.
	* gcc.target/riscv/cset-sext-ventana-rtl.c: Ditto.
	* gcc.target/riscv/cset-sext-ventana.c: Ditto.
	* gcc.target/riscv/cset-sext-zicond-rtl.c: Ditto.
	* gcc.target/riscv/cset-sext-zicond-rtl32.c: Ditto.
	* gcc.target/riscv/cset-sext-zicond.c: Ditto.
	* gcc.target/riscv/cset-sext.c: Ditto.
	* gcc.target/riscv/matrix_add_const.c: Ditto.
	* gcc.target/riscv/movdibeq-thead.c: Ditto.
	* gcc.target/riscv/movdibeq-ventana.c: Ditto.
	* gcc.target/riscv/movdibeq-zicond.c: Ditto.
	* gcc.target/riscv/movdibeq.c: Ditto.
	* gcc.target/riscv/movdibfeq-ventana.c: Ditto.
	* gcc.target/riscv/movdibfeq-zicond.c: Ditto.
	* gcc.target/riscv/movdibfeq.c: Ditto.
	* gcc.target/riscv/movdibfge-ventana.c: Ditto.
	* gcc.target/riscv/movdibfge-zicond.c: Ditto.
	* gcc.target/riscv/movdibfge.c: Ditto.
	* gcc.target/riscv/movdibfgt-ventana.c: Ditto.
	* gcc.target/riscv/movdibfgt-zicond.c: Ditto.
	* gcc.target/riscv/movdibfgt.c: Ditto.
	* gcc.target/riscv/movdibfle-ventana.c: Ditto.
	* gcc.target/riscv/movdibfle-zicond.c: Ditto.
	* gcc.target/riscv/movdibfle.c: Ditto.
	* gcc.target/riscv/movdibflt-ventana.c: Ditto.
	* gcc.target/riscv/movdibflt-zicond.c: Ditto.
	* gcc.target/riscv/movdibflt.c: Ditto.
	* gcc.target/riscv/movdibfne-ventana.c: Ditto.
	* gcc.target/riscv/movdibfne-zicond.c: Ditto.
	* gcc.target/riscv/movdibfne.c: Ditto.
	* gcc.target/riscv/movdibge-thead.c: Ditto.
	* gcc.target/riscv/movdibge-ventana.c: Ditto.
	* gcc.target/riscv/movdibge-zicond.c: Ditto.
	* gcc.target/riscv/movdibge.c: Ditto.
	* gcc.target/riscv/movdibgeu-thead.c: Ditto.
	* gcc.target/riscv/movdibgeu-ventana.c: Ditto.
	* gcc.target/riscv/movdibgeu-zicond.c: Ditto.
	* gcc.target/riscv/movdibgeu.c: Ditto.
	* gcc.target/riscv/movdibgt-thead.c: Ditto.
	* gcc.target/riscv/movdibgt-ventana.c: Ditto.
	* gcc.target/riscv/movdibgt-zicond.c: Ditto.
	* gcc.target/riscv/movdibgt.c: Ditto.
	* gcc.target/riscv/movdibgtu-thead.c: Ditto.
	* gcc.target/riscv/movdibgtu-ventana.c: Ditto.
	* gcc.target/riscv/movdibgtu-zicond.c: Ditto.
	* gcc.target/riscv/movdibgtu.c: Ditto.
	* gcc.target/riscv/movdible-thead.c: Ditto.
	* gcc.target/riscv/movdible-ventana.c: Ditto.
	* gcc.target/riscv/movdible-zicond.c: Ditto.
	* gcc.target/riscv/movdible.c: Ditto.
	* gcc.target/riscv/movdibleu-thead.c: Ditto.
	* gcc.target/riscv/movdibleu-ventana.c: Ditto.
	* gcc.target/riscv/movdibleu-zicond.c: Ditto.
	* gcc.target/riscv/movdibleu.c: Ditto.
	* gcc.target/riscv/movdiblt-thead.c: Ditto.
	* gcc.target/riscv/movdiblt-ventana.c: Ditto.
	* gcc.target/riscv/movdiblt-zicond.c: Ditto.
	* gcc.target/riscv/movdiblt.c: Ditto.
	* gcc.target/riscv/movdibltu-thead.c: Ditto.
	* gcc.target/riscv/movdibltu-ventana.c: Ditto.
	* gcc.target/riscv/movdibltu-zicond.c: Ditto.
	* gcc.target/riscv/movdibltu.c: Ditto.
	* gcc.target/riscv/movdibne-thead.c: Ditto.
	* gcc.target/riscv/movdibne-ventana.c: Ditto.
	* gcc.target/riscv/movdibne-zicond.c: Ditto.
	* gcc.target/riscv/movdibne.c: Ditto.
	* gcc.target/riscv/movdieq-sfb.c: Ditto.
	* gcc.target/riscv/movdieq-thead.c: Ditto.
	* gcc.target/riscv/movdieq-ventana.c: Ditto.
	* gcc.target/riscv/movdieq-zicond.c: Ditto.
	* gcc.target/riscv/movdieq.c: Ditto.
	* gcc.target/riscv/movdifeq-sfb.c: Ditto.
	* gcc.target/riscv/movdifeq-thead.c: Ditto.
	* gcc.target/riscv/movdifeq-ventana.c: Ditto.
	* gcc.target/riscv/movdifeq-zicond.c: Ditto.
	* gcc.target/riscv/movdifeq.c: Ditto.
	* gcc.target/riscv/movdifge-sfb.c: Ditto.
	* gcc.target/riscv/movdifge-thead.c: Ditto.
	* gcc.target/riscv/movdifge-ventana.c: Ditto.
	* gcc.target/riscv/movdifge-zicond.c: Ditto.
	* gcc.target/riscv/movdifge.c: Ditto.
	* gcc.target/riscv/movdifgt-sfb.c: Ditto.
	* gcc.target/riscv/movdifgt-thead.c: Ditto.
	* gcc.target/riscv/movdifgt-ventana.c: Ditto.
	* gcc.target/riscv/movdifgt-zicond.c: Ditto.
	* gcc.target/riscv/movdifgt.c: Ditto.
	* gcc.target/riscv/movdifle-sfb.c: Ditto.
	* gcc.target/riscv/movdifle-thead.c: Ditto.
	* gcc.target/riscv/movdifle-ventana.c: Ditto.
	* gcc.target/riscv/movdifle-zicond.c: Ditto.
	* gcc.target/riscv/movdifle.c: Ditto.
	* gcc.target/riscv/movdiflt-sfb.c: Ditto.
	* gcc.target/riscv/movdiflt-thead.c: Ditto.
	* gcc.target/riscv/movdiflt-ventana.c: Ditto.
	* gcc.target/riscv/movdiflt-zicond.c: Ditto.
	* gcc.target/riscv/movdiflt.c: Ditto.
	* gcc.target/riscv/movdifne-sfb.c: Ditto.
	* gcc.target/riscv/movdifne-thead.c: Ditto.
	* gcc.target/riscv/movdifne-ventana.c: Ditto.
	* gcc.target/riscv/movdifne-zicond.c: Ditto.
	* gcc.target/riscv/movdifne.c: Ditto.
	* gcc.target/riscv/movdige-sfb.c: Ditto.
	* gcc.target/riscv/movdige-thead.c: Ditto.
	* gcc.target/riscv/movdige-ventana.c: Ditto.
	* gcc.target/riscv/movdige-zicond.c: Ditto.
	* gcc.target/riscv/movdige.c: Ditto.
	* gcc.target/riscv/movdigeu-sfb.c: Ditto.
	* gcc.target/riscv/movdigeu-thead.c: Ditto.
	* gcc.target/riscv/movdigeu-ventana.c: Ditto.
	* gcc.target/riscv/movdigeu-zicond.c: Ditto.
	* gcc.target/riscv/movdigeu.c: Ditto.
	* gcc.target/riscv/movdigt-sfb.c: Ditto.
	* gcc.target/riscv/movdigt-thead.c: Ditto.
	* gcc.target/riscv/movdigt-ventana.c: Ditto.
	* gcc.target/riscv/movdigt-zicond.c: Ditto.
	* gcc.target/riscv/movdigt.c: Ditto.
	* gcc.target/riscv/movdigtu-sfb.c: Ditto.
	* gcc.target/riscv/movdigtu-thead.c: Ditto.
	* gcc.target/riscv/movdigtu-ventana.c: Ditto.
	* gcc.target/riscv/movdigtu-zicond.c: Ditto.
	* gcc.target/riscv/movdigtu.c: Ditto.
	* gcc.target/riscv/movdile-sfb.c: Ditto.
	* gcc.target/riscv/movdile-thead.c: Ditto.
	* gcc.target/riscv/movdile-ventana.c: Ditto.
	* gcc.target/riscv/movdile-zicond.c: Ditto.
	* gcc.target/riscv/movdile.c: Ditto.
	* gcc.target/riscv/movdileu-sfb.c: Ditto.
	* gcc.target/riscv/movdileu-thead.c: Ditto.
	* gcc.target/riscv/movdileu-ventana.c: Ditto.
	* gcc.target/riscv/movdileu-zicond.c: Ditto.
	* gcc.target/riscv/movdileu.c: Ditto.
	* gcc.target/riscv/movdilt-sfb.c: Ditto.
	* gcc.target/riscv/movdilt-thead.c: Ditto.
	* gcc.target/riscv/movdilt-ventana.c: Ditto.
	* gcc.target/riscv/movdilt-zicond.c: Ditto.
	* gcc.target/riscv/movdilt.c: Ditto.
	* gcc.target/riscv/movdiltu-sfb.c: Ditto.
	* gcc.target/riscv/movdiltu-thead.c: Ditto.
	* gcc.target/riscv/movdiltu-ventana.c: Ditto.
	* gcc.target/riscv/movdiltu-zicond.c: Ditto.
	* gcc.target/riscv/movdiltu.c: Ditto.
	* gcc.target/riscv/movdine-sfb.c: Ditto.
	* gcc.target/riscv/movdine-thead.c: Ditto.
	* gcc.target/riscv/movdine-ventana.c: Ditto.
	* gcc.target/riscv/movdine-zicond.c: Ditto.
	* gcc.target/riscv/movdine.c: Ditto.
	* gcc.target/riscv/movsibeq-thead.c: Ditto.
	* gcc.target/riscv/movsibeq-ventana.c: Ditto.
	* gcc.target/riscv/movsibeq-zicond.c: Ditto.
	* gcc.target/riscv/movsibeq.c: Ditto.
	* gcc.target/riscv/movsibfeq-ventana.c: Ditto.
	* gcc.target/riscv/movsibfeq-zicond.c: Ditto.
	* gcc.target/riscv/movsibfeq.c: Ditto.
	* gcc.target/riscv/movsibfge-ventana.c: Ditto.
	* gcc.target/riscv/movsibfge-zicond.c: Ditto.
	* gcc.target/riscv/movsibfge.c: Ditto.
	* gcc.target/riscv/movsibfgt-ventana.c: Ditto.
	* gcc.target/riscv/movsibfgt-zicond.c: Ditto.
	* gcc.target/riscv/movsibfgt.c: Ditto.
	* gcc.target/riscv/movsibfle-ventana.c: Ditto.
	* gcc.target/riscv/movsibfle-zicond.c: Ditto.
	* gcc.target/riscv/movsibfle.c: Ditto.
	* gcc.target/riscv/movsibflt-ventana.c: Ditto.
	* gcc.target/riscv/movsibflt-zicond.c: Ditto.
	* gcc.target/riscv/movsibflt.c: Ditto.
	* gcc.target/riscv/movsibfne-ventana.c: Ditto.
	* gcc.target/riscv/movsibfne-zicond.c: Ditto.
	* gcc.target/riscv/movsibfne.c: Ditto.
	* gcc.target/riscv/movsibge-thead.c: Ditto.
	* gcc.target/riscv/movsibge-ventana.c: Ditto.
	* gcc.target/riscv/movsibge-zicond.c: Ditto.
	* gcc.target/riscv/movsibge.c: Ditto.
	* gcc.target/riscv/movsibgeu-thead.c: Ditto.
	* gcc.target/riscv/movsibgeu-ventana.c: Ditto.
	* gcc.target/riscv/movsibgeu-zicond.c: Ditto.
	* gcc.target/riscv/movsibgeu.c: Ditto.
	* gcc.target/riscv/movsibgt-thead.c: Ditto.
	* gcc.target/riscv/movsibgt-ventana.c: Ditto.
	* gcc.target/riscv/movsibgt-zicond.c: Ditto.
	* gcc.target/riscv/movsibgt.c: Ditto.
	* gcc.target/riscv/movsibgtu-thead.c: Ditto.
	* gcc.target/riscv/movsibgtu-ventana.c: Ditto.
	* gcc.target/riscv/movsibgtu-zicond.c: Ditto.
	* gcc.target/riscv/movsibgtu.c: Ditto.
	* gcc.target/riscv/movsible-thead.c: Ditto.
	* gcc.target/riscv/movsible-ventana.c: Ditto.
	* gcc.target/riscv/movsible-zicond.c: Ditto.
	* gcc.target/riscv/movsible.c: Ditto.
	* gcc.target/riscv/movsibleu-thead.c: Ditto.
	* gcc.target/riscv/movsibleu-ventana.c: Ditto.
	* gcc.target/riscv/movsibleu-zicond.c: Ditto.
	* gcc.target/riscv/movsibleu.c: Ditto.
	* gcc.target/riscv/movsiblt-thead.c: Ditto.
	* gcc.target/riscv/movsiblt-ventana.c: Ditto.
	* gcc.target/riscv/movsiblt-zicond.c: Ditto.
	* gcc.target/riscv/movsiblt.c: Ditto.
	* gcc.target/riscv/movsibltu-thead.c: Ditto.
	* gcc.target/riscv/movsibltu-ventana.c: Ditto.
	* gcc.target/riscv/movsibltu-zicond.c: Ditto.
	* gcc.target/riscv/movsibltu.c: Ditto.
	* gcc.target/riscv/movsibne-thead.c: Ditto.
	* gcc.target/riscv/movsibne-ventana.c: Ditto.
	* gcc.target/riscv/movsibne-zicond.c: Ditto.
	* gcc.target/riscv/movsibne.c: Ditto.
	* gcc.target/riscv/movsieq-sfb.c: Ditto.
	* gcc.target/riscv/movsieq-thead.c: Ditto.
	* gcc.target/riscv/movsieq-ventana.c: Ditto.
	* gcc.target/riscv/movsieq-zicond.c: Ditto.
	* gcc.target/riscv/movsieq.c: Ditto.
	* gcc.target/riscv/movsifeq-sfb.c: Ditto.
	* gcc.target/riscv/movsifeq-thead.c: Ditto.
	* gcc.target/riscv/movsifeq-ventana.c: Ditto.
	* gcc.target/riscv/movsifeq-zicond.c: Ditto.
	* gcc.target/riscv/movsifeq.c: Ditto.
	* gcc.target/riscv/movsifge-sfb.c: Ditto.
	* gcc.target/riscv/movsifge-thead.c: Ditto.
	* gcc.target/riscv/movsifge-ventana.c: Ditto.
	* gcc.target/riscv/movsifge-zicond.c: Ditto.
	* gcc.target/riscv/movsifge.c: Ditto.
	* gcc.target/riscv/movsifgt-sfb.c: Ditto.
	* gcc.target/riscv/movsifgt-thead.c: Ditto.
	* gcc.target/riscv/movsifgt-ventana.c: Ditto.
	* gcc.target/riscv/movsifgt-zicond.c: Ditto.
	* gcc.target/riscv/movsifgt.c: Ditto.
	* gcc.target/riscv/movsifle-sfb.c: Ditto.
	* gcc.target/riscv/movsifle-thead.c: Ditto.
	* gcc.target/riscv/movsifle-ventana.c: Ditto.
	* gcc.target/riscv/movsifle-zicond.c: Ditto.
	* gcc.target/riscv/movsifle.c: Ditto.
	* gcc.target/riscv/movsiflt-sfb.c: Ditto.
	* gcc.target/riscv/movsiflt-thead.c: Ditto.
	* gcc.target/riscv/movsiflt-ventana.c: Ditto.
	* gcc.target/riscv/movsiflt-zicond.c: Ditto.
	* gcc.target/riscv/movsiflt.c: Ditto.
	* gcc.target/riscv/movsifne-sfb.c: Ditto.
	* gcc.target/riscv/movsifne-thead.c: Ditto.
	* gcc.target/riscv/movsifne-ventana.c: Ditto.
	* gcc.target/riscv/movsifne-zicond.c: Ditto.
	* gcc.target/riscv/movsifne.c: Ditto.
	* gcc.target/riscv/movsige-sfb.c: Ditto.
	* gcc.target/riscv/movsige-thead.c: Ditto.
	* gcc.target/riscv/movsige-ventana.c: Ditto.
	* gcc.target/riscv/movsige-zicond.c: Ditto.
	* gcc.target/riscv/movsige.c: Ditto.
	* gcc.target/riscv/movsigeu-sfb.c: Ditto.
	* gcc.target/riscv/movsigeu-thead.c: Ditto.
	* gcc.target/riscv/movsigeu-ventana.c: Ditto.
	* gcc.target/riscv/movsigeu-zicond.c: Ditto.
	* gcc.target/riscv/movsigeu.c: Ditto.
	* gcc.target/riscv/movsigt-sfb.c: Ditto.
	* gcc.target/riscv/movsigt-thead.c: Ditto.
	* gcc.target/riscv/movsigt-ventana.c: Ditto.
	* gcc.target/riscv/movsigt-zicond.c: Ditto.
	* gcc.target/riscv/movsigt.c: Ditto.
	* gcc.target/riscv/movsigtu-sfb.c: Ditto.
	* gcc.target/riscv/movsigtu-thead.c: Ditto.
	* gcc.target/riscv/movsigtu-ventana.c: Ditto.
	* gcc.target/riscv/movsigtu-zicond.c: Ditto.
	* gcc.target/riscv/movsigtu.c: Ditto.
	* gcc.target/riscv/movsile-sfb.c: Ditto.
	* gcc.target/riscv/movsile-thead.c: Ditto.
	* gcc.target/riscv/movsile-ventana.c: Ditto.
	* gcc.target/riscv/movsile-zicond.c: Ditto.
	* gcc.target/riscv/movsile.c: Ditto.
	* gcc.target/riscv/movsileu-sfb.c: Ditto.
	* gcc.target/riscv/movsileu-thead.c: Ditto.
	* gcc.target/riscv/movsileu-ventana.c: Ditto.
	* gcc.target/riscv/movsileu-zicond.c: Ditto.
	* gcc.target/riscv/movsileu.c: Ditto.
	* gcc.target/riscv/movsilt-sfb.c: Ditto.
	* gcc.target/riscv/movsilt-thead.c: Ditto.
	* gcc.target/riscv/movsilt-ventana.c: Ditto.
	* gcc.target/riscv/movsilt-zicond.c: Ditto.
	* gcc.target/riscv/movsilt.c: Ditto.
	* gcc.target/riscv/movsiltu-sfb.c: Ditto.
	* gcc.target/riscv/movsiltu-thead.c: Ditto.
	* gcc.target/riscv/movsiltu-ventana.c: Ditto.
	* gcc.target/riscv/movsiltu-zicond.c: Ditto.
	* gcc.target/riscv/movsiltu.c: Ditto.
	* gcc.target/riscv/movsine-sfb.c: Ditto.
	* gcc.target/riscv/movsine-thead.c: Ditto.
	* gcc.target/riscv/movsine-ventana.c: Ditto.
	* gcc.target/riscv/movsine-zicond.c: Ditto.
	* gcc.target/riscv/movsine.c: Ditto.
	* gcc.target/riscv/pr111501.c: Ditto.
	* gcc.target/riscv/pr115921.c: Ditto.
	* gcc.target/riscv/pr116033.c: Ditto.
	* gcc.target/riscv/pr116035-1.c: Ditto.
	* gcc.target/riscv/pr116035-2.c: Ditto.
	* gcc.target/riscv/pr116131.c: Ditto.
	* gcc.target/riscv/reg_subreg_costs.c: Ditto.
	* gcc.target/riscv/rvv/xtheadvector.c: Ditto.
	* gcc.target/riscv/rvv/xtheadvector/pr114194.c: Ditto.
	* gcc.target/riscv/sign-extend-rshift-32.c: Ditto.
	* gcc.target/riscv/sign-extend-rshift-64.c: Ditto.
	* gcc.target/riscv/sign-extend-rshift.c: Ditto.
	* gcc.target/riscv/synthesis-1.c: Ditto.
	* gcc.target/riscv/synthesis-10.c: Ditto.
	* gcc.target/riscv/synthesis-11.c: Ditto.
	* gcc.target/riscv/synthesis-12.c: Ditto.
	* gcc.target/riscv/synthesis-13.c: Ditto.
	* gcc.target/riscv/synthesis-14.c: Ditto.
	* gcc.target/riscv/synthesis-15.c: Ditto.
	* gcc.target/riscv/synthesis-16.c: Ditto.
	* gcc.target/riscv/synthesis-2.c: Ditto.
	* gcc.target/riscv/synthesis-3.c: Ditto.
	* gcc.target/riscv/synthesis-4.c: Ditto.
	* gcc.target/riscv/synthesis-5.c: Ditto.
	* gcc.target/riscv/synthesis-6.c: Ditto.
	* gcc.target/riscv/synthesis-7.c: Ditto.
	* gcc.target/riscv/synthesis-8.c: Ditto.
	* gcc.target/riscv/synthesis-9.c: Ditto.
	* gcc.target/riscv/target-attr-16.c: Ditto.
	* gcc.target/riscv/target-attr-norelax.c: Ditto.
	* gcc.target/riscv/xtheadba-addsl.c: Ditto.
	* gcc.target/riscv/xtheadba.c: Ditto.
	* gcc.target/riscv/xtheadbb-ext-1.c: Ditto.
	* gcc.target/riscv/xtheadbb-ext-2.c: Ditto.
	* gcc.target/riscv/xtheadbb-ext-3.c: Ditto.
	* gcc.target/riscv/xtheadbb-ext.c: Ditto.
	* gcc.target/riscv/xtheadbb-extu-1.c: Ditto.
	* gcc.target/riscv/xtheadbb-extu-2.c: Ditto.
	* gcc.target/riscv/xtheadbb-extu-4.c: Ditto.
	* gcc.target/riscv/xtheadbb-extu.c: Ditto.
	* gcc.target/riscv/xtheadbb-ff1.c: Ditto.
	* gcc.target/riscv/xtheadbb-rev.c: Ditto.
	* gcc.target/riscv/xtheadbb-srri.c: Ditto.
	* gcc.target/riscv/xtheadbb-strcmp.c: Ditto.
	* gcc.target/riscv/xtheadbb-strlen-unaligned.c: Ditto.
	* gcc.target/riscv/xtheadbb-strlen.c: Ditto.
	* gcc.target/riscv/xtheadbb.c: Ditto.
	* gcc.target/riscv/xtheadbs-tst.c: Ditto.
	* gcc.target/riscv/xtheadbs.c: Ditto.
	* gcc.target/riscv/xtheadcmo.c: Ditto.
	* gcc.target/riscv/xtheadcondmov-indirect.c: Ditto.
	* gcc.target/riscv/xtheadcondmov-mveqz-imm-eqz.c: Ditto.
	* gcc.target/riscv/xtheadcondmov-mveqz-imm-not.c: Ditto.
	* gcc.target/riscv/xtheadcondmov-mveqz-reg-eqz.c: Ditto.
	* gcc.target/riscv/xtheadcondmov-mveqz-reg-not.c: Ditto.
	* gcc.target/riscv/xtheadcondmov-mvnez-imm-cond.c: Ditto.
	* gcc.target/riscv/xtheadcondmov-mvnez-imm-nez.c: Ditto.
	* gcc.target/riscv/xtheadcondmov-mvnez-reg-cond.c: Ditto.
	* gcc.target/riscv/xtheadcondmov-mvnez-reg-nez.c: Ditto.
	* gcc.target/riscv/xtheadcondmov.c: Ditto.
	* gcc.target/riscv/xtheadfmemidx-without-xtheadmemidx.c: Ditto.
	* gcc.target/riscv/xtheadfmemidx.c: Ditto.
	* gcc.target/riscv/xtheadfmv.c: Ditto.
	* gcc.target/riscv/xtheadint.c: Ditto.
	* gcc.target/riscv/xtheadmac-mula-muls.c: Ditto.
	* gcc.target/riscv/xtheadmac.c: Ditto.
	* gcc.target/riscv/xtheadmemidx-index-update.c: Ditto.
	* gcc.target/riscv/xtheadmemidx-index-xtheadbb-update.c: Ditto.
	* gcc.target/riscv/xtheadmemidx-index-xtheadbb.c: Ditto.
	* gcc.target/riscv/xtheadmemidx-index.c: Ditto.
	* gcc.target/riscv/xtheadmemidx-modify-xtheadbb.c: Ditto.
	* gcc.target/riscv/xtheadmemidx-modify.c: Ditto.
	* gcc.target/riscv/xtheadmemidx-uindex-update.c: Ditto.
	* gcc.target/riscv/xtheadmemidx-uindex-xtheadbb-update.c: Ditto.
	* gcc.target/riscv/xtheadmemidx-uindex-xtheadbb.c: Ditto.
	* gcc.target/riscv/xtheadmemidx-uindex.c: Ditto.
	* gcc.target/riscv/xtheadmemidx.c: Ditto.
	* gcc.target/riscv/xtheadmempair-1.c: Ditto.
	* gcc.target/riscv/xtheadmempair-2.c: Ditto.
	* gcc.target/riscv/xtheadmempair-3.c: Ditto.
	* gcc.target/riscv/xtheadmempair-4.c: Ditto.
	* gcc.target/riscv/xtheadmempair-interrupt-fcsr.c: Ditto.
	* gcc.target/riscv/xtheadmempair.c: Ditto.
	* gcc.target/riscv/xtheadsync.c: Ditto.
	* gcc.target/riscv/za-ext.c: Ditto.
	* gcc.target/riscv/zawrs.c: Ditto.
	* gcc.target/riscv/zbb-strcmp-disabled-2.c: Ditto.
	* gcc.target/riscv/zbb-strcmp-disabled.c: Ditto.
	* gcc.target/riscv/zbb-strcmp-limit.c: Ditto.
	* gcc.target/riscv/zbb-strcmp-unaligned.c: Ditto.
	* gcc.target/riscv/zbb-strcmp.c: Ditto.
	* gcc.target/riscv/zbb-strlen-disabled-2.c: Ditto.
	* gcc.target/riscv/zbb-strlen-disabled.c: Ditto.
	* gcc.target/riscv/zbb-strlen-unaligned.c: Ditto.
	* gcc.target/riscv/zbb-strlen.c: Ditto.
	* gcc.target/riscv/zero-extend-rshift-32.c: Ditto.
	* gcc.target/riscv/zero-extend-rshift-64.c: Ditto.
	* gcc.target/riscv/zero-extend-rshift.c: Ditto.
	* gcc.target/riscv/zi-ext.c: Ditto.
	* gcc.target/riscv/zvbb.c: Ditto.
	* gcc.target/riscv/zvbc.c: Ditto.
	* gcc.target/riscv/zvkb.c: Ditto.
	* gcc.target/riscv/zvkg.c: Ditto.
	* gcc.target/riscv/zvkn-1.c: Ditto.
	* gcc.target/riscv/zvkn.c: Ditto.
	* gcc.target/riscv/zvknc-1.c: Ditto.
	* gcc.target/riscv/zvknc-2.c: Ditto.
	* gcc.target/riscv/zvknc.c: Ditto.
	* gcc.target/riscv/zvkned.c: Ditto.
	* gcc.target/riscv/zvkng-1.c: Ditto.
	* gcc.target/riscv/zvkng-2.c: Ditto.
	* gcc.target/riscv/zvkng.c: Ditto.
	* gcc.target/riscv/zvknha.c: Ditto.
	* gcc.target/riscv/zvknhb.c: Ditto.
	* gcc.target/riscv/zvks-1.c: Ditto.
	* gcc.target/riscv/zvks.c: Ditto.
	* gcc.target/riscv/zvksc-1.c: Ditto.
	* gcc.target/riscv/zvksc-2.c: Ditto.
	* gcc.target/riscv/zvksc.c: Ditto.
	* gcc.target/riscv/zvksed.c: Ditto.
	* gcc.target/riscv/zvksg-1.c: Ditto.
	* gcc.target/riscv/zvksg-2.c: Ditto.
	* gcc.target/riscv/zvksg.c: Ditto.
	* gcc.target/riscv/zvksh.c: Ditto.
	* gcc.target/riscv/zvkt.c: Ditto.

Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>
---
 gcc/testsuite/gcc.dg/pr90838.c                                | 4 ++--
 gcc/testsuite/gcc.target/riscv/adddibeq.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibfeq.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibfge.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibfgt.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibfle.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibflt.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibfne.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibge.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibgeu.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibgt.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibgtu.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/adddible.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibleu.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/adddiblt.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibltu.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/adddibne.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddieq.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/adddifeq.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddifge.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddifgt.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddifle.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddiflt.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddifne.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddige.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/adddigeu.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddigt.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/adddigtu.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddile.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/adddileu.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddilt.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/adddiltu.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/adddine.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/addsibeq.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibfeq.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibfge.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibfgt.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibfle.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibflt.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibfne.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibge.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibgeu.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibgt.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibgtu.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsible.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibleu.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsiblt.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibltu.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsibne.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsieq.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsifeq.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsifge.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsifgt.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsifle.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsiflt.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsifne.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsige.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsigeu.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsigt.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsigtu.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsile.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsileu.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsilt.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsiltu.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/addsine.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/cmo-zicboz-zic64-1.c           | 4 ++--
 gcc/testsuite/gcc.target/riscv/cmpmemsi-2.c                   | 4 ++--
 gcc/testsuite/gcc.target/riscv/cmpmemsi-3.c                   | 4 ++--
 gcc/testsuite/gcc.target/riscv/cmpmemsi.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/cpymemsi-2.c                   | 4 ++--
 gcc/testsuite/gcc.target/riscv/cpymemsi-3.c                   | 4 ++--
 gcc/testsuite/gcc.target/riscv/cpymemsi.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/crc-builtin-zbc32.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/crc-builtin-zbc64.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-rtl.c                | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-rtl32.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl32.c          | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-sfb.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/cset-sext-thead-rtl.c          | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-thead.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-ventana-rtl.c        | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl.c         | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl32.c       | 2 +-
 gcc/testsuite/gcc.target/riscv/cset-sext-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/cset-sext.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/matrix_add_const.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibeq-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibeq-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibeq-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibeq.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfeq-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfeq-zicond.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfeq.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfge-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfge-zicond.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfge.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfgt-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfgt-zicond.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfgt.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfle-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfle-zicond.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfle.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibflt-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibflt-zicond.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibflt.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfne-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfne-zicond.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibfne.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibge-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibge-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibge-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibge.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgeu-thead.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgeu-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgeu-zicond.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgeu.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgt-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgt-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgt-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgt.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgtu-thead.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgtu-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgtu-zicond.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibgtu.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/movdible-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdible-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdible-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdible.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibleu-thead.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibleu-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibleu-zicond.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibleu.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiblt-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiblt-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiblt-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiblt.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibltu-thead.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibltu-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibltu-zicond.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibltu.c                    | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibne-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibne-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibne-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdibne.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdieq-sfb.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/movdieq-thead.c                | 2 +-
 gcc/testsuite/gcc.target/riscv/movdieq-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdieq-zicond.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdieq.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifeq-sfb.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifeq-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifeq-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifeq-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifeq.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifge-sfb.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifge-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifge-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifge-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifge.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifgt-sfb.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifgt-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifgt-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifgt-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifgt.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifle-sfb.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifle-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifle-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifle-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifle.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiflt-sfb.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiflt-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiflt-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiflt-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiflt.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifne-sfb.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifne-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifne-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifne-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdifne.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdige-sfb.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/movdige-thead.c                | 2 +-
 gcc/testsuite/gcc.target/riscv/movdige-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdige-zicond.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdige.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigeu-sfb.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigeu-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigeu-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigeu-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigeu.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigt-sfb.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigt-thead.c                | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigt-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigt-zicond.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigt.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigtu-sfb.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigtu-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigtu-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigtu-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdigtu.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdile-sfb.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/movdile-thead.c                | 2 +-
 gcc/testsuite/gcc.target/riscv/movdile-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdile-zicond.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdile.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/movdileu-sfb.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/movdileu-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdileu-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdileu-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdileu.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdilt-sfb.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/movdilt-thead.c                | 2 +-
 gcc/testsuite/gcc.target/riscv/movdilt-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdilt-zicond.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdilt.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiltu-sfb.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiltu-thead.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiltu-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiltu-zicond.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdiltu.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/movdine-sfb.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/movdine-thead.c                | 2 +-
 gcc/testsuite/gcc.target/riscv/movdine-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movdine-zicond.c               | 2 +-
 gcc/testsuite/gcc.target/riscv/movdine.c                      | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibeq-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibeq-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibeq-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibeq.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibfeq-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibfeq-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibfeq.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibfge-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibfge-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibfge.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibfgt-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibfgt-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibfgt.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibfle-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibfle-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibfle.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibflt-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibflt-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibflt.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibfne-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibfne-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibfne.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibge-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibge-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibge-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibge.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibgeu-thead.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibgeu-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibgeu-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibgeu.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibgt-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibgt-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibgt-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibgt.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibgtu-thead.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibgtu-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibgtu-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibgtu.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsible-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsible-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsible-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsible.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibleu-thead.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibleu-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibleu-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibleu.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiblt-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiblt-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsiblt-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiblt.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibltu-thead.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibltu-ventana.c            | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibltu-zicond.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibltu.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibne-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibne-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsibne-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsibne.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsieq-sfb.c                  | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsieq-thead.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsieq-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movsieq-zicond.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsieq.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifeq-sfb.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifeq-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifeq-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsifeq-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifeq.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifge-sfb.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifge-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifge-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsifge-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifge.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifgt-sfb.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifgt-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifgt-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsifgt-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifgt.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifle-sfb.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifle-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifle-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsifle-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifle.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiflt-sfb.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiflt-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiflt-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsiflt-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiflt.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifne-sfb.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifne-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifne-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsifne-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsifne.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsige-sfb.c                  | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsige-thead.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsige-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movsige-zicond.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsige.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigeu-sfb.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigeu-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigeu-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsigeu-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigeu.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigt-sfb.c                  | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigt-thead.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigt-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movsigt-zicond.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigt.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigtu-sfb.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigtu-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigtu-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsigtu-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsigtu.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsile-sfb.c                  | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsile-thead.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsile-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movsile-zicond.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsile.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsileu-sfb.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsileu-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsileu-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsileu-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsileu.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsilt-sfb.c                  | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsilt-thead.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsilt-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movsilt-zicond.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsilt.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiltu-sfb.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiltu-thead.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiltu-ventana.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/movsiltu-zicond.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsiltu.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsine-sfb.c                  | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsine-thead.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsine-ventana.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/movsine-zicond.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/movsine.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/pr111501.c                     | 2 +-
 gcc/testsuite/gcc.target/riscv/pr115921.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/pr116033.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/pr116035-1.c                   | 4 ++--
 gcc/testsuite/gcc.target/riscv/pr116035-2.c                   | 4 ++--
 gcc/testsuite/gcc.target/riscv/pr116131.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/reg_subreg_costs.c             | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/xtheadvector.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194.c    | 4 ++--
 gcc/testsuite/gcc.target/riscv/sign-extend-rshift-32.c        | 2 +-
 gcc/testsuite/gcc.target/riscv/sign-extend-rshift-64.c        | 2 +-
 gcc/testsuite/gcc.target/riscv/sign-extend-rshift.c           | 4 ++--
 gcc/testsuite/gcc.target/riscv/synthesis-1.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-10.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-11.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-12.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-13.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-14.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-15.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-16.c                 | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-2.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-3.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-4.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-5.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-6.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-7.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-8.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/synthesis-9.c                  | 2 +-
 gcc/testsuite/gcc.target/riscv/target-attr-16.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/target-attr-norelax.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadba-addsl.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadba.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-ext-1.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c               | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-ext.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-extu-1.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-extu-2.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-extu-4.c              | 2 +-
 gcc/testsuite/gcc.target/riscv/xtheadbb-extu.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-ff1.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-rev.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-srri.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-strcmp.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-strlen-unaligned.c    | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb-strlen.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbb.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbs-tst.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadbs.c                     | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcmo.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcondmov-indirect.c       | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-eqz.c  | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-not.c  | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-eqz.c  | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-not.c  | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-cond.c | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-nez.c  | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-cond.c | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-nez.c  | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadcondmov.c                | 4 ++--
 .../gcc.target/riscv/xtheadfmemidx-without-xtheadmemidx.c     | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadfmv.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadint.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmac-mula-muls.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmac.c                    | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-update.c    | 4 ++--
 .../gcc.target/riscv/xtheadmemidx-index-xtheadbb-update.c     | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-xtheadbb.c  | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmemidx-index.c           | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify-xtheadbb.c | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-update.c   | 4 ++--
 .../gcc.target/riscv/xtheadmemidx-uindex-xtheadbb-update.c    | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-xtheadbb.c | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmemidx.c                 | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmempair-1.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmempair-2.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmempair-3.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c              | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmempair-interrupt-fcsr.c | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadmempair.c                | 4 ++--
 gcc/testsuite/gcc.target/riscv/xtheadsync.c                   | 4 ++--
 gcc/testsuite/gcc.target/riscv/za-ext.c                       | 4 ++--
 gcc/testsuite/gcc.target/riscv/zawrs.c                        | 4 ++--
 gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled-2.c        | 4 ++--
 gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/zbb-strcmp-limit.c             | 4 ++--
 gcc/testsuite/gcc.target/riscv/zbb-strcmp-unaligned.c         | 4 ++--
 gcc/testsuite/gcc.target/riscv/zbb-strcmp.c                   | 4 ++--
 gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled-2.c        | 4 ++--
 gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/zbb-strlen-unaligned.c         | 4 ++--
 gcc/testsuite/gcc.target/riscv/zbb-strlen.c                   | 4 ++--
 gcc/testsuite/gcc.target/riscv/zero-extend-rshift-32.c        | 2 +-
 gcc/testsuite/gcc.target/riscv/zero-extend-rshift-64.c        | 2 +-
 gcc/testsuite/gcc.target/riscv/zero-extend-rshift.c           | 4 ++--
 gcc/testsuite/gcc.target/riscv/zi-ext.c                       | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvbb.c                         | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvbc.c                         | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvkb.c                         | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvkg.c                         | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvkn-1.c                       | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvkn.c                         | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvknc-1.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvknc-2.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvknc.c                        | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvkned.c                       | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvkng-1.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvkng-2.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvkng.c                        | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvknha.c                       | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvknhb.c                       | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvks-1.c                       | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvks.c                         | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvksc-1.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvksc-2.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvksc.c                        | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvksed.c                       | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvksg-1.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvksg-2.c                      | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvksg.c                        | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvksh.c                        | 4 ++--
 gcc/testsuite/gcc.target/riscv/zvkt.c                         | 4 ++--
 489 files changed, 740 insertions(+), 740 deletions(-)

Comments

Kito Cheng Dec. 9, 2024, 4:29 p.m. UTC | #1
LGTM

Dimitar Dimitrov <dimitar@dinux.eu> 於 2024年12月10日 週二 00:22 寫道:

> When GCC is configured for RV32E with:
>   --target=riscv32-none-elf \
>   --with-multilib-generator=rv32ec-ilp32e-- \
>   --with-abi=ilp32e \
>   --with-arch=rv32ec
>
> Then many test cases fail because they explicitly set -march without
> specifying an ABI.  Thus they end-up with invalid combination of
> explicitly specified -march and a default ILP32E ABI:
>
>   spawn ... -march=rv32gc_zbb ...
>   cc1: error: ILP32E ABI does not support the 'D' extension
>
> Fix by explicitly specifying a suitable ABI for each test case.  In
> general this seems to be the recommendation from RISC-V people [1].
>
> Downside of this fix is that test coverage is slightly decreased,
> assuming there are several CI pipelines executing test runs for
> different default ABIs.
>
> The changes were semi-automatically prepared with the following crude
> one-liners, but then all the code changes were manually inspected:
>
>   # Specify ilp32d ABI in all RV32 test options.
>   $ find gcc/testsuite -name "*.c" | \
>     xargs sed -i
> 's/\(dg-[a-z-]*options.*-march=rv\)32\([ig][_a-zA-Z0-9]*\)\>/\132\2
> -mabi=ilp32d/g'
>
>   # Specify lp64d ABI in all RV64 test options.
>   $ find gcc/testsuite -name "*.c" | \
>     xargs sed -i
> 's/\(dg-[a-z-]*options.*-march=rv\)64\([ig][_a-zA-Z0-9]*\)\>/\164\2
> -mabi=lp64d/g'
>
>   # Revert changes to any case which had specified ABI.
>   $ git checkout HEAD -- `git grep -l 'mabi=.\+mabi=' -- gcc/testsuite/`
>
> [1]
> https://github.com/riscv-non-isa/riscv-toolchain-conventions/issues/13#issuecomment-856941534
>
> gcc/testsuite/ChangeLog:
>
>         * gcc.dg/pr90838.c: Specify ilp32d ABI for RV32, and lp64d for
>         RV64.
>         * gcc.target/riscv/adddibeq.c: Ditto.
>         * gcc.target/riscv/adddibfeq.c: Ditto.
>         * gcc.target/riscv/adddibfge.c: Ditto.
>         * gcc.target/riscv/adddibfgt.c: Ditto.
>         * gcc.target/riscv/adddibfle.c: Ditto.
>         * gcc.target/riscv/adddibflt.c: Ditto.
>         * gcc.target/riscv/adddibfne.c: Ditto.
>         * gcc.target/riscv/adddibge.c: Ditto.
>         * gcc.target/riscv/adddibgeu.c: Ditto.
>         * gcc.target/riscv/adddibgt.c: Ditto.
>         * gcc.target/riscv/adddibgtu.c: Ditto.
>         * gcc.target/riscv/adddible.c: Ditto.
>         * gcc.target/riscv/adddibleu.c: Ditto.
>         * gcc.target/riscv/adddiblt.c: Ditto.
>         * gcc.target/riscv/adddibltu.c: Ditto.
>         * gcc.target/riscv/adddibne.c: Ditto.
>         * gcc.target/riscv/adddieq.c: Ditto.
>         * gcc.target/riscv/adddifeq.c: Ditto.
>         * gcc.target/riscv/adddifge.c: Ditto.
>         * gcc.target/riscv/adddifgt.c: Ditto.
>         * gcc.target/riscv/adddifle.c: Ditto.
>         * gcc.target/riscv/adddiflt.c: Ditto.
>         * gcc.target/riscv/adddifne.c: Ditto.
>         * gcc.target/riscv/adddige.c: Ditto.
>         * gcc.target/riscv/adddigeu.c: Ditto.
>         * gcc.target/riscv/adddigt.c: Ditto.
>         * gcc.target/riscv/adddigtu.c: Ditto.
>         * gcc.target/riscv/adddile.c: Ditto.
>         * gcc.target/riscv/adddileu.c: Ditto.
>         * gcc.target/riscv/adddilt.c: Ditto.
>         * gcc.target/riscv/adddiltu.c: Ditto.
>         * gcc.target/riscv/adddine.c: Ditto.
>         * gcc.target/riscv/addsibeq.c: Ditto.
>         * gcc.target/riscv/addsibfeq.c: Ditto.
>         * gcc.target/riscv/addsibfge.c: Ditto.
>         * gcc.target/riscv/addsibfgt.c: Ditto.
>         * gcc.target/riscv/addsibfle.c: Ditto.
>         * gcc.target/riscv/addsibflt.c: Ditto.
>         * gcc.target/riscv/addsibfne.c: Ditto.
>         * gcc.target/riscv/addsibge.c: Ditto.
>         * gcc.target/riscv/addsibgeu.c: Ditto.
>         * gcc.target/riscv/addsibgt.c: Ditto.
>         * gcc.target/riscv/addsibgtu.c: Ditto.
>         * gcc.target/riscv/addsible.c: Ditto.
>         * gcc.target/riscv/addsibleu.c: Ditto.
>         * gcc.target/riscv/addsiblt.c: Ditto.
>         * gcc.target/riscv/addsibltu.c: Ditto.
>         * gcc.target/riscv/addsibne.c: Ditto.
>         * gcc.target/riscv/addsieq.c: Ditto.
>         * gcc.target/riscv/addsifeq.c: Ditto.
>         * gcc.target/riscv/addsifge.c: Ditto.
>         * gcc.target/riscv/addsifgt.c: Ditto.
>         * gcc.target/riscv/addsifle.c: Ditto.
>         * gcc.target/riscv/addsiflt.c: Ditto.
>         * gcc.target/riscv/addsifne.c: Ditto.
>         * gcc.target/riscv/addsige.c: Ditto.
>         * gcc.target/riscv/addsigeu.c: Ditto.
>         * gcc.target/riscv/addsigt.c: Ditto.
>         * gcc.target/riscv/addsigtu.c: Ditto.
>         * gcc.target/riscv/addsile.c: Ditto.
>         * gcc.target/riscv/addsileu.c: Ditto.
>         * gcc.target/riscv/addsilt.c: Ditto.
>         * gcc.target/riscv/addsiltu.c: Ditto.
>         * gcc.target/riscv/addsine.c: Ditto.
>         * gcc.target/riscv/cmo-zicboz-zic64-1.c: Ditto.
>         * gcc.target/riscv/cmpmemsi-2.c: Ditto.
>         * gcc.target/riscv/cmpmemsi-3.c: Ditto.
>         * gcc.target/riscv/cmpmemsi.c: Ditto.
>         * gcc.target/riscv/cpymemsi-2.c: Ditto.
>         * gcc.target/riscv/cpymemsi-3.c: Ditto.
>         * gcc.target/riscv/cpymemsi.c: Ditto.
>         * gcc.target/riscv/crc-builtin-zbc32.c: Ditto.
>         * gcc.target/riscv/crc-builtin-zbc64.c: Ditto.
>         * gcc.target/riscv/cset-sext-rtl.c: Ditto.
>         * gcc.target/riscv/cset-sext-rtl32.c: Ditto.
>         * gcc.target/riscv/cset-sext-sfb-rtl.c: Ditto.
>         * gcc.target/riscv/cset-sext-sfb-rtl32.c: Ditto.
>         * gcc.target/riscv/cset-sext-sfb.c: Ditto.
>         * gcc.target/riscv/cset-sext-thead-rtl.c: Ditto.
>         * gcc.target/riscv/cset-sext-thead.c: Ditto.
>         * gcc.target/riscv/cset-sext-ventana-rtl.c: Ditto.
>         * gcc.target/riscv/cset-sext-ventana.c: Ditto.
>         * gcc.target/riscv/cset-sext-zicond-rtl.c: Ditto.
>         * gcc.target/riscv/cset-sext-zicond-rtl32.c: Ditto.
>         * gcc.target/riscv/cset-sext-zicond.c: Ditto.
>         * gcc.target/riscv/cset-sext.c: Ditto.
>         * gcc.target/riscv/matrix_add_const.c: Ditto.
>         * gcc.target/riscv/movdibeq-thead.c: Ditto.
>         * gcc.target/riscv/movdibeq-ventana.c: Ditto.
>         * gcc.target/riscv/movdibeq-zicond.c: Ditto.
>         * gcc.target/riscv/movdibeq.c: Ditto.
>         * gcc.target/riscv/movdibfeq-ventana.c: Ditto.
>         * gcc.target/riscv/movdibfeq-zicond.c: Ditto.
>         * gcc.target/riscv/movdibfeq.c: Ditto.
>         * gcc.target/riscv/movdibfge-ventana.c: Ditto.
>         * gcc.target/riscv/movdibfge-zicond.c: Ditto.
>         * gcc.target/riscv/movdibfge.c: Ditto.
>         * gcc.target/riscv/movdibfgt-ventana.c: Ditto.
>         * gcc.target/riscv/movdibfgt-zicond.c: Ditto.
>         * gcc.target/riscv/movdibfgt.c: Ditto.
>         * gcc.target/riscv/movdibfle-ventana.c: Ditto.
>         * gcc.target/riscv/movdibfle-zicond.c: Ditto.
>         * gcc.target/riscv/movdibfle.c: Ditto.
>         * gcc.target/riscv/movdibflt-ventana.c: Ditto.
>         * gcc.target/riscv/movdibflt-zicond.c: Ditto.
>         * gcc.target/riscv/movdibflt.c: Ditto.
>         * gcc.target/riscv/movdibfne-ventana.c: Ditto.
>         * gcc.target/riscv/movdibfne-zicond.c: Ditto.
>         * gcc.target/riscv/movdibfne.c: Ditto.
>         * gcc.target/riscv/movdibge-thead.c: Ditto.
>         * gcc.target/riscv/movdibge-ventana.c: Ditto.
>         * gcc.target/riscv/movdibge-zicond.c: Ditto.
>         * gcc.target/riscv/movdibge.c: Ditto.
>         * gcc.target/riscv/movdibgeu-thead.c: Ditto.
>         * gcc.target/riscv/movdibgeu-ventana.c: Ditto.
>         * gcc.target/riscv/movdibgeu-zicond.c: Ditto.
>         * gcc.target/riscv/movdibgeu.c: Ditto.
>         * gcc.target/riscv/movdibgt-thead.c: Ditto.
>         * gcc.target/riscv/movdibgt-ventana.c: Ditto.
>         * gcc.target/riscv/movdibgt-zicond.c: Ditto.
>         * gcc.target/riscv/movdibgt.c: Ditto.
>         * gcc.target/riscv/movdibgtu-thead.c: Ditto.
>         * gcc.target/riscv/movdibgtu-ventana.c: Ditto.
>         * gcc.target/riscv/movdibgtu-zicond.c: Ditto.
>         * gcc.target/riscv/movdibgtu.c: Ditto.
>         * gcc.target/riscv/movdible-thead.c: Ditto.
>         * gcc.target/riscv/movdible-ventana.c: Ditto.
>         * gcc.target/riscv/movdible-zicond.c: Ditto.
>         * gcc.target/riscv/movdible.c: Ditto.
>         * gcc.target/riscv/movdibleu-thead.c: Ditto.
>         * gcc.target/riscv/movdibleu-ventana.c: Ditto.
>         * gcc.target/riscv/movdibleu-zicond.c: Ditto.
>         * gcc.target/riscv/movdibleu.c: Ditto.
>         * gcc.target/riscv/movdiblt-thead.c: Ditto.
>         * gcc.target/riscv/movdiblt-ventana.c: Ditto.
>         * gcc.target/riscv/movdiblt-zicond.c: Ditto.
>         * gcc.target/riscv/movdiblt.c: Ditto.
>         * gcc.target/riscv/movdibltu-thead.c: Ditto.
>         * gcc.target/riscv/movdibltu-ventana.c: Ditto.
>         * gcc.target/riscv/movdibltu-zicond.c: Ditto.
>         * gcc.target/riscv/movdibltu.c: Ditto.
>         * gcc.target/riscv/movdibne-thead.c: Ditto.
>         * gcc.target/riscv/movdibne-ventana.c: Ditto.
>         * gcc.target/riscv/movdibne-zicond.c: Ditto.
>         * gcc.target/riscv/movdibne.c: Ditto.
>         * gcc.target/riscv/movdieq-sfb.c: Ditto.
>         * gcc.target/riscv/movdieq-thead.c: Ditto.
>         * gcc.target/riscv/movdieq-ventana.c: Ditto.
>         * gcc.target/riscv/movdieq-zicond.c: Ditto.
>         * gcc.target/riscv/movdieq.c: Ditto.
>         * gcc.target/riscv/movdifeq-sfb.c: Ditto.
>         * gcc.target/riscv/movdifeq-thead.c: Ditto.
>         * gcc.target/riscv/movdifeq-ventana.c: Ditto.
>         * gcc.target/riscv/movdifeq-zicond.c: Ditto.
>         * gcc.target/riscv/movdifeq.c: Ditto.
>         * gcc.target/riscv/movdifge-sfb.c: Ditto.
>         * gcc.target/riscv/movdifge-thead.c: Ditto.
>         * gcc.target/riscv/movdifge-ventana.c: Ditto.
>         * gcc.target/riscv/movdifge-zicond.c: Ditto.
>         * gcc.target/riscv/movdifge.c: Ditto.
>         * gcc.target/riscv/movdifgt-sfb.c: Ditto.
>         * gcc.target/riscv/movdifgt-thead.c: Ditto.
>         * gcc.target/riscv/movdifgt-ventana.c: Ditto.
>         * gcc.target/riscv/movdifgt-zicond.c: Ditto.
>         * gcc.target/riscv/movdifgt.c: Ditto.
>         * gcc.target/riscv/movdifle-sfb.c: Ditto.
>         * gcc.target/riscv/movdifle-thead.c: Ditto.
>         * gcc.target/riscv/movdifle-ventana.c: Ditto.
>         * gcc.target/riscv/movdifle-zicond.c: Ditto.
>         * gcc.target/riscv/movdifle.c: Ditto.
>         * gcc.target/riscv/movdiflt-sfb.c: Ditto.
>         * gcc.target/riscv/movdiflt-thead.c: Ditto.
>         * gcc.target/riscv/movdiflt-ventana.c: Ditto.
>         * gcc.target/riscv/movdiflt-zicond.c: Ditto.
>         * gcc.target/riscv/movdiflt.c: Ditto.
>         * gcc.target/riscv/movdifne-sfb.c: Ditto.
>         * gcc.target/riscv/movdifne-thead.c: Ditto.
>         * gcc.target/riscv/movdifne-ventana.c: Ditto.
>         * gcc.target/riscv/movdifne-zicond.c: Ditto.
>         * gcc.target/riscv/movdifne.c: Ditto.
>         * gcc.target/riscv/movdige-sfb.c: Ditto.
>         * gcc.target/riscv/movdige-thead.c: Ditto.
>         * gcc.target/riscv/movdige-ventana.c: Ditto.
>         * gcc.target/riscv/movdige-zicond.c: Ditto.
>         * gcc.target/riscv/movdige.c: Ditto.
>         * gcc.target/riscv/movdigeu-sfb.c: Ditto.
>         * gcc.target/riscv/movdigeu-thead.c: Ditto.
>         * gcc.target/riscv/movdigeu-ventana.c: Ditto.
>         * gcc.target/riscv/movdigeu-zicond.c: Ditto.
>         * gcc.target/riscv/movdigeu.c: Ditto.
>         * gcc.target/riscv/movdigt-sfb.c: Ditto.
>         * gcc.target/riscv/movdigt-thead.c: Ditto.
>         * gcc.target/riscv/movdigt-ventana.c: Ditto.
>         * gcc.target/riscv/movdigt-zicond.c: Ditto.
>         * gcc.target/riscv/movdigt.c: Ditto.
>         * gcc.target/riscv/movdigtu-sfb.c: Ditto.
>         * gcc.target/riscv/movdigtu-thead.c: Ditto.
>         * gcc.target/riscv/movdigtu-ventana.c: Ditto.
>         * gcc.target/riscv/movdigtu-zicond.c: Ditto.
>         * gcc.target/riscv/movdigtu.c: Ditto.
>         * gcc.target/riscv/movdile-sfb.c: Ditto.
>         * gcc.target/riscv/movdile-thead.c: Ditto.
>         * gcc.target/riscv/movdile-ventana.c: Ditto.
>         * gcc.target/riscv/movdile-zicond.c: Ditto.
>         * gcc.target/riscv/movdile.c: Ditto.
>         * gcc.target/riscv/movdileu-sfb.c: Ditto.
>         * gcc.target/riscv/movdileu-thead.c: Ditto.
>         * gcc.target/riscv/movdileu-ventana.c: Ditto.
>         * gcc.target/riscv/movdileu-zicond.c: Ditto.
>         * gcc.target/riscv/movdileu.c: Ditto.
>         * gcc.target/riscv/movdilt-sfb.c: Ditto.
>         * gcc.target/riscv/movdilt-thead.c: Ditto.
>         * gcc.target/riscv/movdilt-ventana.c: Ditto.
>         * gcc.target/riscv/movdilt-zicond.c: Ditto.
>         * gcc.target/riscv/movdilt.c: Ditto.
>         * gcc.target/riscv/movdiltu-sfb.c: Ditto.
>         * gcc.target/riscv/movdiltu-thead.c: Ditto.
>         * gcc.target/riscv/movdiltu-ventana.c: Ditto.
>         * gcc.target/riscv/movdiltu-zicond.c: Ditto.
>         * gcc.target/riscv/movdiltu.c: Ditto.
>         * gcc.target/riscv/movdine-sfb.c: Ditto.
>         * gcc.target/riscv/movdine-thead.c: Ditto.
>         * gcc.target/riscv/movdine-ventana.c: Ditto.
>         * gcc.target/riscv/movdine-zicond.c: Ditto.
>         * gcc.target/riscv/movdine.c: Ditto.
>         * gcc.target/riscv/movsibeq-thead.c: Ditto.
>         * gcc.target/riscv/movsibeq-ventana.c: Ditto.
>         * gcc.target/riscv/movsibeq-zicond.c: Ditto.
>         * gcc.target/riscv/movsibeq.c: Ditto.
>         * gcc.target/riscv/movsibfeq-ventana.c: Ditto.
>         * gcc.target/riscv/movsibfeq-zicond.c: Ditto.
>         * gcc.target/riscv/movsibfeq.c: Ditto.
>         * gcc.target/riscv/movsibfge-ventana.c: Ditto.
>         * gcc.target/riscv/movsibfge-zicond.c: Ditto.
>         * gcc.target/riscv/movsibfge.c: Ditto.
>         * gcc.target/riscv/movsibfgt-ventana.c: Ditto.
>         * gcc.target/riscv/movsibfgt-zicond.c: Ditto.
>         * gcc.target/riscv/movsibfgt.c: Ditto.
>         * gcc.target/riscv/movsibfle-ventana.c: Ditto.
>         * gcc.target/riscv/movsibfle-zicond.c: Ditto.
>         * gcc.target/riscv/movsibfle.c: Ditto.
>         * gcc.target/riscv/movsibflt-ventana.c: Ditto.
>         * gcc.target/riscv/movsibflt-zicond.c: Ditto.
>         * gcc.target/riscv/movsibflt.c: Ditto.
>         * gcc.target/riscv/movsibfne-ventana.c: Ditto.
>         * gcc.target/riscv/movsibfne-zicond.c: Ditto.
>         * gcc.target/riscv/movsibfne.c: Ditto.
>         * gcc.target/riscv/movsibge-thead.c: Ditto.
>         * gcc.target/riscv/movsibge-ventana.c: Ditto.
>         * gcc.target/riscv/movsibge-zicond.c: Ditto.
>         * gcc.target/riscv/movsibge.c: Ditto.
>         * gcc.target/riscv/movsibgeu-thead.c: Ditto.
>         * gcc.target/riscv/movsibgeu-ventana.c: Ditto.
>         * gcc.target/riscv/movsibgeu-zicond.c: Ditto.
>         * gcc.target/riscv/movsibgeu.c: Ditto.
>         * gcc.target/riscv/movsibgt-thead.c: Ditto.
>         * gcc.target/riscv/movsibgt-ventana.c: Ditto.
>         * gcc.target/riscv/movsibgt-zicond.c: Ditto.
>         * gcc.target/riscv/movsibgt.c: Ditto.
>         * gcc.target/riscv/movsibgtu-thead.c: Ditto.
>         * gcc.target/riscv/movsibgtu-ventana.c: Ditto.
>         * gcc.target/riscv/movsibgtu-zicond.c: Ditto.
>         * gcc.target/riscv/movsibgtu.c: Ditto.
>         * gcc.target/riscv/movsible-thead.c: Ditto.
>         * gcc.target/riscv/movsible-ventana.c: Ditto.
>         * gcc.target/riscv/movsible-zicond.c: Ditto.
>         * gcc.target/riscv/movsible.c: Ditto.
>         * gcc.target/riscv/movsibleu-thead.c: Ditto.
>         * gcc.target/riscv/movsibleu-ventana.c: Ditto.
>         * gcc.target/riscv/movsibleu-zicond.c: Ditto.
>         * gcc.target/riscv/movsibleu.c: Ditto.
>         * gcc.target/riscv/movsiblt-thead.c: Ditto.
>         * gcc.target/riscv/movsiblt-ventana.c: Ditto.
>         * gcc.target/riscv/movsiblt-zicond.c: Ditto.
>         * gcc.target/riscv/movsiblt.c: Ditto.
>         * gcc.target/riscv/movsibltu-thead.c: Ditto.
>         * gcc.target/riscv/movsibltu-ventana.c: Ditto.
>         * gcc.target/riscv/movsibltu-zicond.c: Ditto.
>         * gcc.target/riscv/movsibltu.c: Ditto.
>         * gcc.target/riscv/movsibne-thead.c: Ditto.
>         * gcc.target/riscv/movsibne-ventana.c: Ditto.
>         * gcc.target/riscv/movsibne-zicond.c: Ditto.
>         * gcc.target/riscv/movsibne.c: Ditto.
>         * gcc.target/riscv/movsieq-sfb.c: Ditto.
>         * gcc.target/riscv/movsieq-thead.c: Ditto.
>         * gcc.target/riscv/movsieq-ventana.c: Ditto.
>         * gcc.target/riscv/movsieq-zicond.c: Ditto.
>         * gcc.target/riscv/movsieq.c: Ditto.
>         * gcc.target/riscv/movsifeq-sfb.c: Ditto.
>         * gcc.target/riscv/movsifeq-thead.c: Ditto.
>         * gcc.target/riscv/movsifeq-ventana.c: Ditto.
>         * gcc.target/riscv/movsifeq-zicond.c: Ditto.
>         * gcc.target/riscv/movsifeq.c: Ditto.
>         * gcc.target/riscv/movsifge-sfb.c: Ditto.
>         * gcc.target/riscv/movsifge-thead.c: Ditto.
>         * gcc.target/riscv/movsifge-ventana.c: Ditto.
>         * gcc.target/riscv/movsifge-zicond.c: Ditto.
>         * gcc.target/riscv/movsifge.c: Ditto.
>         * gcc.target/riscv/movsifgt-sfb.c: Ditto.
>         * gcc.target/riscv/movsifgt-thead.c: Ditto.
>         * gcc.target/riscv/movsifgt-ventana.c: Ditto.
>         * gcc.target/riscv/movsifgt-zicond.c: Ditto.
>         * gcc.target/riscv/movsifgt.c: Ditto.
>         * gcc.target/riscv/movsifle-sfb.c: Ditto.
>         * gcc.target/riscv/movsifle-thead.c: Ditto.
>         * gcc.target/riscv/movsifle-ventana.c: Ditto.
>         * gcc.target/riscv/movsifle-zicond.c: Ditto.
>         * gcc.target/riscv/movsifle.c: Ditto.
>         * gcc.target/riscv/movsiflt-sfb.c: Ditto.
>         * gcc.target/riscv/movsiflt-thead.c: Ditto.
>         * gcc.target/riscv/movsiflt-ventana.c: Ditto.
>         * gcc.target/riscv/movsiflt-zicond.c: Ditto.
>         * gcc.target/riscv/movsiflt.c: Ditto.
>         * gcc.target/riscv/movsifne-sfb.c: Ditto.
>         * gcc.target/riscv/movsifne-thead.c: Ditto.
>         * gcc.target/riscv/movsifne-ventana.c: Ditto.
>         * gcc.target/riscv/movsifne-zicond.c: Ditto.
>         * gcc.target/riscv/movsifne.c: Ditto.
>         * gcc.target/riscv/movsige-sfb.c: Ditto.
>         * gcc.target/riscv/movsige-thead.c: Ditto.
>         * gcc.target/riscv/movsige-ventana.c: Ditto.
>         * gcc.target/riscv/movsige-zicond.c: Ditto.
>         * gcc.target/riscv/movsige.c: Ditto.
>         * gcc.target/riscv/movsigeu-sfb.c: Ditto.
>         * gcc.target/riscv/movsigeu-thead.c: Ditto.
>         * gcc.target/riscv/movsigeu-ventana.c: Ditto.
>         * gcc.target/riscv/movsigeu-zicond.c: Ditto.
>         * gcc.target/riscv/movsigeu.c: Ditto.
>         * gcc.target/riscv/movsigt-sfb.c: Ditto.
>         * gcc.target/riscv/movsigt-thead.c: Ditto.
>         * gcc.target/riscv/movsigt-ventana.c: Ditto.
>         * gcc.target/riscv/movsigt-zicond.c: Ditto.
>         * gcc.target/riscv/movsigt.c: Ditto.
>         * gcc.target/riscv/movsigtu-sfb.c: Ditto.
>         * gcc.target/riscv/movsigtu-thead.c: Ditto.
>         * gcc.target/riscv/movsigtu-ventana.c: Ditto.
>         * gcc.target/riscv/movsigtu-zicond.c: Ditto.
>         * gcc.target/riscv/movsigtu.c: Ditto.
>         * gcc.target/riscv/movsile-sfb.c: Ditto.
>         * gcc.target/riscv/movsile-thead.c: Ditto.
>         * gcc.target/riscv/movsile-ventana.c: Ditto.
>         * gcc.target/riscv/movsile-zicond.c: Ditto.
>         * gcc.target/riscv/movsile.c: Ditto.
>         * gcc.target/riscv/movsileu-sfb.c: Ditto.
>         * gcc.target/riscv/movsileu-thead.c: Ditto.
>         * gcc.target/riscv/movsileu-ventana.c: Ditto.
>         * gcc.target/riscv/movsileu-zicond.c: Ditto.
>         * gcc.target/riscv/movsileu.c: Ditto.
>         * gcc.target/riscv/movsilt-sfb.c: Ditto.
>         * gcc.target/riscv/movsilt-thead.c: Ditto.
>         * gcc.target/riscv/movsilt-ventana.c: Ditto.
>         * gcc.target/riscv/movsilt-zicond.c: Ditto.
>         * gcc.target/riscv/movsilt.c: Ditto.
>         * gcc.target/riscv/movsiltu-sfb.c: Ditto.
>         * gcc.target/riscv/movsiltu-thead.c: Ditto.
>         * gcc.target/riscv/movsiltu-ventana.c: Ditto.
>         * gcc.target/riscv/movsiltu-zicond.c: Ditto.
>         * gcc.target/riscv/movsiltu.c: Ditto.
>         * gcc.target/riscv/movsine-sfb.c: Ditto.
>         * gcc.target/riscv/movsine-thead.c: Ditto.
>         * gcc.target/riscv/movsine-ventana.c: Ditto.
>         * gcc.target/riscv/movsine-zicond.c: Ditto.
>         * gcc.target/riscv/movsine.c: Ditto.
>         * gcc.target/riscv/pr111501.c: Ditto.
>         * gcc.target/riscv/pr115921.c: Ditto.
>         * gcc.target/riscv/pr116033.c: Ditto.
>         * gcc.target/riscv/pr116035-1.c: Ditto.
>         * gcc.target/riscv/pr116035-2.c: Ditto.
>         * gcc.target/riscv/pr116131.c: Ditto.
>         * gcc.target/riscv/reg_subreg_costs.c: Ditto.
>         * gcc.target/riscv/rvv/xtheadvector.c: Ditto.
>         * gcc.target/riscv/rvv/xtheadvector/pr114194.c: Ditto.
>         * gcc.target/riscv/sign-extend-rshift-32.c: Ditto.
>         * gcc.target/riscv/sign-extend-rshift-64.c: Ditto.
>         * gcc.target/riscv/sign-extend-rshift.c: Ditto.
>         * gcc.target/riscv/synthesis-1.c: Ditto.
>         * gcc.target/riscv/synthesis-10.c: Ditto.
>         * gcc.target/riscv/synthesis-11.c: Ditto.
>         * gcc.target/riscv/synthesis-12.c: Ditto.
>         * gcc.target/riscv/synthesis-13.c: Ditto.
>         * gcc.target/riscv/synthesis-14.c: Ditto.
>         * gcc.target/riscv/synthesis-15.c: Ditto.
>         * gcc.target/riscv/synthesis-16.c: Ditto.
>         * gcc.target/riscv/synthesis-2.c: Ditto.
>         * gcc.target/riscv/synthesis-3.c: Ditto.
>         * gcc.target/riscv/synthesis-4.c: Ditto.
>         * gcc.target/riscv/synthesis-5.c: Ditto.
>         * gcc.target/riscv/synthesis-6.c: Ditto.
>         * gcc.target/riscv/synthesis-7.c: Ditto.
>         * gcc.target/riscv/synthesis-8.c: Ditto.
>         * gcc.target/riscv/synthesis-9.c: Ditto.
>         * gcc.target/riscv/target-attr-16.c: Ditto.
>         * gcc.target/riscv/target-attr-norelax.c: Ditto.
>         * gcc.target/riscv/xtheadba-addsl.c: Ditto.
>         * gcc.target/riscv/xtheadba.c: Ditto.
>         * gcc.target/riscv/xtheadbb-ext-1.c: Ditto.
>         * gcc.target/riscv/xtheadbb-ext-2.c: Ditto.
>         * gcc.target/riscv/xtheadbb-ext-3.c: Ditto.
>         * gcc.target/riscv/xtheadbb-ext.c: Ditto.
>         * gcc.target/riscv/xtheadbb-extu-1.c: Ditto.
>         * gcc.target/riscv/xtheadbb-extu-2.c: Ditto.
>         * gcc.target/riscv/xtheadbb-extu-4.c: Ditto.
>         * gcc.target/riscv/xtheadbb-extu.c: Ditto.
>         * gcc.target/riscv/xtheadbb-ff1.c: Ditto.
>         * gcc.target/riscv/xtheadbb-rev.c: Ditto.
>         * gcc.target/riscv/xtheadbb-srri.c: Ditto.
>         * gcc.target/riscv/xtheadbb-strcmp.c: Ditto.
>         * gcc.target/riscv/xtheadbb-strlen-unaligned.c: Ditto.
>         * gcc.target/riscv/xtheadbb-strlen.c: Ditto.
>         * gcc.target/riscv/xtheadbb.c: Ditto.
>         * gcc.target/riscv/xtheadbs-tst.c: Ditto.
>         * gcc.target/riscv/xtheadbs.c: Ditto.
>         * gcc.target/riscv/xtheadcmo.c: Ditto.
>         * gcc.target/riscv/xtheadcondmov-indirect.c: Ditto.
>         * gcc.target/riscv/xtheadcondmov-mveqz-imm-eqz.c: Ditto.
>         * gcc.target/riscv/xtheadcondmov-mveqz-imm-not.c: Ditto.
>         * gcc.target/riscv/xtheadcondmov-mveqz-reg-eqz.c: Ditto.
>         * gcc.target/riscv/xtheadcondmov-mveqz-reg-not.c: Ditto.
>         * gcc.target/riscv/xtheadcondmov-mvnez-imm-cond.c: Ditto.
>         * gcc.target/riscv/xtheadcondmov-mvnez-imm-nez.c: Ditto.
>         * gcc.target/riscv/xtheadcondmov-mvnez-reg-cond.c: Ditto.
>         * gcc.target/riscv/xtheadcondmov-mvnez-reg-nez.c: Ditto.
>         * gcc.target/riscv/xtheadcondmov.c: Ditto.
>         * gcc.target/riscv/xtheadfmemidx-without-xtheadmemidx.c: Ditto.
>         * gcc.target/riscv/xtheadfmemidx.c: Ditto.
>         * gcc.target/riscv/xtheadfmv.c: Ditto.
>         * gcc.target/riscv/xtheadint.c: Ditto.
>         * gcc.target/riscv/xtheadmac-mula-muls.c: Ditto.
>         * gcc.target/riscv/xtheadmac.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx-index-update.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx-index-xtheadbb-update.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx-index-xtheadbb.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx-index.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx-modify-xtheadbb.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx-modify.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx-uindex-update.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx-uindex-xtheadbb-update.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx-uindex-xtheadbb.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx-uindex.c: Ditto.
>         * gcc.target/riscv/xtheadmemidx.c: Ditto.
>         * gcc.target/riscv/xtheadmempair-1.c: Ditto.
>         * gcc.target/riscv/xtheadmempair-2.c: Ditto.
>         * gcc.target/riscv/xtheadmempair-3.c: Ditto.
>         * gcc.target/riscv/xtheadmempair-4.c: Ditto.
>         * gcc.target/riscv/xtheadmempair-interrupt-fcsr.c: Ditto.
>         * gcc.target/riscv/xtheadmempair.c: Ditto.
>         * gcc.target/riscv/xtheadsync.c: Ditto.
>         * gcc.target/riscv/za-ext.c: Ditto.
>         * gcc.target/riscv/zawrs.c: Ditto.
>         * gcc.target/riscv/zbb-strcmp-disabled-2.c: Ditto.
>         * gcc.target/riscv/zbb-strcmp-disabled.c: Ditto.
>         * gcc.target/riscv/zbb-strcmp-limit.c: Ditto.
>         * gcc.target/riscv/zbb-strcmp-unaligned.c: Ditto.
>         * gcc.target/riscv/zbb-strcmp.c: Ditto.
>         * gcc.target/riscv/zbb-strlen-disabled-2.c: Ditto.
>         * gcc.target/riscv/zbb-strlen-disabled.c: Ditto.
>         * gcc.target/riscv/zbb-strlen-unaligned.c: Ditto.
>         * gcc.target/riscv/zbb-strlen.c: Ditto.
>         * gcc.target/riscv/zero-extend-rshift-32.c: Ditto.
>         * gcc.target/riscv/zero-extend-rshift-64.c: Ditto.
>         * gcc.target/riscv/zero-extend-rshift.c: Ditto.
>         * gcc.target/riscv/zi-ext.c: Ditto.
>         * gcc.target/riscv/zvbb.c: Ditto.
>         * gcc.target/riscv/zvbc.c: Ditto.
>         * gcc.target/riscv/zvkb.c: Ditto.
>         * gcc.target/riscv/zvkg.c: Ditto.
>         * gcc.target/riscv/zvkn-1.c: Ditto.
>         * gcc.target/riscv/zvkn.c: Ditto.
>         * gcc.target/riscv/zvknc-1.c: Ditto.
>         * gcc.target/riscv/zvknc-2.c: Ditto.
>         * gcc.target/riscv/zvknc.c: Ditto.
>         * gcc.target/riscv/zvkned.c: Ditto.
>         * gcc.target/riscv/zvkng-1.c: Ditto.
>         * gcc.target/riscv/zvkng-2.c: Ditto.
>         * gcc.target/riscv/zvkng.c: Ditto.
>         * gcc.target/riscv/zvknha.c: Ditto.
>         * gcc.target/riscv/zvknhb.c: Ditto.
>         * gcc.target/riscv/zvks-1.c: Ditto.
>         * gcc.target/riscv/zvks.c: Ditto.
>         * gcc.target/riscv/zvksc-1.c: Ditto.
>         * gcc.target/riscv/zvksc-2.c: Ditto.
>         * gcc.target/riscv/zvksc.c: Ditto.
>         * gcc.target/riscv/zvksed.c: Ditto.
>         * gcc.target/riscv/zvksg-1.c: Ditto.
>         * gcc.target/riscv/zvksg-2.c: Ditto.
>         * gcc.target/riscv/zvksg.c: Ditto.
>         * gcc.target/riscv/zvksh.c: Ditto.
>         * gcc.target/riscv/zvkt.c: Ditto.
>
> Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>
> ---
>  gcc/testsuite/gcc.dg/pr90838.c                                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/adddibeq.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibfeq.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibfge.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibfgt.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibfle.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibflt.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibfne.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibge.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibgeu.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibgt.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibgtu.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddible.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibleu.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddiblt.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibltu.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddibne.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddieq.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddifeq.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddifge.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddifgt.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddifle.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddiflt.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddifne.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddige.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddigeu.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddigt.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddigtu.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddile.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddileu.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddilt.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddiltu.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/adddine.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/addsibeq.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibfeq.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibfge.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibfgt.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibfle.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibflt.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibfne.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibge.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibgeu.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibgt.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibgtu.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsible.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibleu.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsiblt.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibltu.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsibne.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsieq.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsifeq.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsifge.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsifgt.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsifle.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsiflt.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsifne.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsige.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsigeu.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsigt.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsigtu.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsile.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsileu.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsilt.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsiltu.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/addsine.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/cmo-zicboz-zic64-1.c           | 4 ++--
>  gcc/testsuite/gcc.target/riscv/cmpmemsi-2.c                   | 4 ++--
>  gcc/testsuite/gcc.target/riscv/cmpmemsi-3.c                   | 4 ++--
>  gcc/testsuite/gcc.target/riscv/cmpmemsi.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/cpymemsi-2.c                   | 4 ++--
>  gcc/testsuite/gcc.target/riscv/cpymemsi-3.c                   | 4 ++--
>  gcc/testsuite/gcc.target/riscv/cpymemsi.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/crc-builtin-zbc32.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/crc-builtin-zbc64.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-rtl.c                | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-rtl32.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl32.c          | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-sfb.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/cset-sext-thead-rtl.c          | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-thead.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-ventana-rtl.c        | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl.c         | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl32.c       | 2 +-
>  gcc/testsuite/gcc.target/riscv/cset-sext-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/cset-sext.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/matrix_add_const.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibeq-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibeq-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibeq-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibeq.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfeq-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfeq-zicond.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfeq.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfge-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfge-zicond.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfge.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfgt-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfgt-zicond.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfgt.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfle-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfle-zicond.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfle.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibflt-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibflt-zicond.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibflt.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfne-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfne-zicond.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibfne.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibge-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibge-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibge-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibge.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgeu-thead.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgeu-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgeu-zicond.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgeu.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgt-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgt-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgt-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgt.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgtu-thead.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgtu-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgtu-zicond.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibgtu.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdible-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdible-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdible-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdible.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibleu-thead.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibleu-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibleu-zicond.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibleu.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiblt-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiblt-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiblt-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiblt.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibltu-thead.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibltu-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibltu-zicond.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibltu.c                    | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibne-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibne-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibne-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdibne.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdieq-sfb.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdieq-thead.c                | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdieq-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdieq-zicond.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdieq.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifeq-sfb.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifeq-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifeq-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifeq-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifeq.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifge-sfb.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifge-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifge-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifge-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifge.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifgt-sfb.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifgt-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifgt-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifgt-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifgt.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifle-sfb.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifle-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifle-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifle-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifle.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiflt-sfb.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiflt-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiflt-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiflt-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiflt.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifne-sfb.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifne-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifne-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifne-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdifne.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdige-sfb.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdige-thead.c                | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdige-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdige-zicond.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdige.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigeu-sfb.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigeu-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigeu-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigeu-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigeu.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigt-sfb.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigt-thead.c                | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigt-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigt-zicond.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigt.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigtu-sfb.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigtu-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigtu-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigtu-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdigtu.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdile-sfb.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdile-thead.c                | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdile-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdile-zicond.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdile.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdileu-sfb.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdileu-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdileu-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdileu-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdileu.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdilt-sfb.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdilt-thead.c                | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdilt-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdilt-zicond.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdilt.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiltu-sfb.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiltu-thead.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiltu-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiltu-zicond.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdiltu.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdine-sfb.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdine-thead.c                | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdine-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdine-zicond.c               | 2 +-
>  gcc/testsuite/gcc.target/riscv/movdine.c                      | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibeq-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibeq-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibeq-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibeq.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibfeq-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibfeq-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibfeq.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibfge-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibfge-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibfge.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibfgt-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibfgt-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibfgt.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibfle-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibfle-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibfle.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibflt-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibflt-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibflt.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibfne-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibfne-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibfne.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibge-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibge-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibge-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibge.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibgeu-thead.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibgeu-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibgeu-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibgeu.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibgt-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibgt-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibgt-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibgt.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibgtu-thead.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibgtu-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibgtu-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibgtu.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsible-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsible-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsible-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsible.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibleu-thead.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibleu-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibleu-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibleu.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiblt-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiblt-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsiblt-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiblt.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibltu-thead.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibltu-ventana.c            | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibltu-zicond.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibltu.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibne-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibne-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsibne-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsibne.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsieq-sfb.c                  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsieq-thead.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsieq-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsieq-zicond.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsieq.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifeq-sfb.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifeq-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifeq-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsifeq-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifeq.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifge-sfb.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifge-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifge-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsifge-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifge.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifgt-sfb.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifgt-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifgt-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsifgt-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifgt.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifle-sfb.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifle-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifle-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsifle-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifle.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiflt-sfb.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiflt-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiflt-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsiflt-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiflt.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifne-sfb.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifne-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifne-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsifne-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsifne.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsige-sfb.c                  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsige-thead.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsige-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsige-zicond.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsige.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigeu-sfb.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigeu-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigeu-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsigeu-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigeu.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigt-sfb.c                  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigt-thead.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigt-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsigt-zicond.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigt.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigtu-sfb.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigtu-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigtu-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsigtu-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsigtu.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsile-sfb.c                  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsile-thead.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsile-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsile-zicond.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsile.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsileu-sfb.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsileu-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsileu-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsileu-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsileu.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsilt-sfb.c                  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsilt-thead.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsilt-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsilt-zicond.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsilt.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiltu-sfb.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiltu-thead.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiltu-ventana.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsiltu-zicond.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsiltu.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsine-sfb.c                  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsine-thead.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsine-ventana.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/movsine-zicond.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/movsine.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/pr111501.c                     | 2 +-
>  gcc/testsuite/gcc.target/riscv/pr115921.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/pr116033.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/pr116035-1.c                   | 4 ++--
>  gcc/testsuite/gcc.target/riscv/pr116035-2.c                   | 4 ++--
>  gcc/testsuite/gcc.target/riscv/pr116131.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/reg_subreg_costs.c             | 2 +-
>  gcc/testsuite/gcc.target/riscv/rvv/xtheadvector.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194.c    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/sign-extend-rshift-32.c        | 2 +-
>  gcc/testsuite/gcc.target/riscv/sign-extend-rshift-64.c        | 2 +-
>  gcc/testsuite/gcc.target/riscv/sign-extend-rshift.c           | 4 ++--
>  gcc/testsuite/gcc.target/riscv/synthesis-1.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-10.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-11.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-12.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-13.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-14.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-15.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-16.c                 | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-2.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-3.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-4.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-5.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-6.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-7.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-8.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/synthesis-9.c                  | 2 +-
>  gcc/testsuite/gcc.target/riscv/target-attr-16.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/target-attr-norelax.c          | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadba-addsl.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadba.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-ext-1.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c               | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-ext.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-extu-1.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-extu-2.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-extu-4.c              | 2 +-
>  gcc/testsuite/gcc.target/riscv/xtheadbb-extu.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-ff1.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-rev.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-srri.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-strcmp.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-strlen-unaligned.c    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb-strlen.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbb.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbs-tst.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadbs.c                     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcmo.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcondmov-indirect.c       | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-eqz.c  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-not.c  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-eqz.c  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-not.c  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-cond.c | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-nez.c  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-cond.c | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-nez.c  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadcondmov.c                | 4 ++--
>  .../gcc.target/riscv/xtheadfmemidx-without-xtheadmemidx.c     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadfmv.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadint.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmac-mula-muls.c          | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmac.c                    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-update.c    | 4 ++--
>  .../gcc.target/riscv/xtheadmemidx-index-xtheadbb-update.c     | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-xtheadbb.c  | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmemidx-index.c           | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify-xtheadbb.c | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify.c          | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-update.c   | 4 ++--
>  .../gcc.target/riscv/xtheadmemidx-uindex-xtheadbb-update.c    | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-xtheadbb.c | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex.c          | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmemidx.c                 | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmempair-1.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmempair-2.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmempair-3.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c              | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmempair-interrupt-fcsr.c | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadmempair.c                | 4 ++--
>  gcc/testsuite/gcc.target/riscv/xtheadsync.c                   | 4 ++--
>  gcc/testsuite/gcc.target/riscv/za-ext.c                       | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zawrs.c                        | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled-2.c        | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled.c          | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zbb-strcmp-limit.c             | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zbb-strcmp-unaligned.c         | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zbb-strcmp.c                   | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled-2.c        | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled.c          | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zbb-strlen-unaligned.c         | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zbb-strlen.c                   | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zero-extend-rshift-32.c        | 2 +-
>  gcc/testsuite/gcc.target/riscv/zero-extend-rshift-64.c        | 2 +-
>  gcc/testsuite/gcc.target/riscv/zero-extend-rshift.c           | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zi-ext.c                       | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvbb.c                         | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvbc.c                         | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvkb.c                         | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvkg.c                         | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvkn-1.c                       | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvkn.c                         | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvknc-1.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvknc-2.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvknc.c                        | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvkned.c                       | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvkng-1.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvkng-2.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvkng.c                        | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvknha.c                       | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvknhb.c                       | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvks-1.c                       | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvks.c                         | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvksc-1.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvksc-2.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvksc.c                        | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvksed.c                       | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvksg-1.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvksg-2.c                      | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvksg.c                        | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvksh.c                        | 4 ++--
>  gcc/testsuite/gcc.target/riscv/zvkt.c                         | 4 ++--
>  489 files changed, 740 insertions(+), 740 deletions(-)
>
> diff --git a/gcc/testsuite/gcc.dg/pr90838.c
> b/gcc/testsuite/gcc.dg/pr90838.c
> index db7bcec3ea9..644bbce8a18 100644
> --- a/gcc/testsuite/gcc.dg/pr90838.c
> +++ b/gcc/testsuite/gcc.dg/pr90838.c
> @@ -3,4 +3,4 @@
>  /* { dg-additional-options "-mbmi" { target { { i?86-*-* x86_64-*-* } &&
> { ! { ia32 } } } } } */
> -/* { dg-additional-options "-march=rv64gc_zbb" { target { rv64 } } } */
> -/* { dg-additional-options "-march=rv32gc_zbb" { target { rv32 } } } */
> +/* { dg-additional-options "-march=rv64gc_zbb -mabi=lp64d" { target {
> rv64 } } } */
> +/* { dg-additional-options "-march=rv32gc_zbb -mabi=ilp32d" { target {
> rv32 } } } */
>  /* { dg-require-effective-target int32plus } */
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibeq.c
> b/gcc/testsuite/gcc.target/riscv/adddibeq.c
> index 624c56ef6ef..2aaaecc6abe 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibeq.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibeq.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibfeq.c
> b/gcc/testsuite/gcc.target/riscv/adddibfeq.c
> index 403200fd425..a60879440f4 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibfeq.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibfeq.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibfge.c
> b/gcc/testsuite/gcc.target/riscv/adddibfge.c
> index 82fce9c58b6..40467f20c00 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibfge.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibfge.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibfgt.c
> b/gcc/testsuite/gcc.target/riscv/adddibfgt.c
> index 0263154212d..bb6edd2b4d5 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibfgt.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibfgt.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibfle.c
> b/gcc/testsuite/gcc.target/riscv/adddibfle.c
> index 6fd65f1b470..6c1f5546f56 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibfle.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibfle.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibflt.c
> b/gcc/testsuite/gcc.target/riscv/adddibflt.c
> index bfee522a5cf..00f17013fdd 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibflt.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibflt.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibfne.c
> b/gcc/testsuite/gcc.target/riscv/adddibfne.c
> index 73ade4dcdfe..a7b83b745e1 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibfne.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibfne.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibge.c
> b/gcc/testsuite/gcc.target/riscv/adddibge.c
> index 017b69f7eaa..9a97c5a22fa 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibge.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibge.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibgeu.c
> b/gcc/testsuite/gcc.target/riscv/adddibgeu.c
> index ed17898ed26..5ebdc016758 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibgeu.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibgeu.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibgt.c
> b/gcc/testsuite/gcc.target/riscv/adddibgt.c
> index 201852fc62b..1fb089a2dba 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibgt.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibgt.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibgtu.c
> b/gcc/testsuite/gcc.target/riscv/adddibgtu.c
> index 60850c4e1a7..b247526994e 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibgtu.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibgtu.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddible.c
> b/gcc/testsuite/gcc.target/riscv/adddible.c
> index 5bed30cd015..5f2108ab540 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddible.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddible.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibleu.c
> b/gcc/testsuite/gcc.target/riscv/adddibleu.c
> index 3d16d09b340..28172b2275d 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibleu.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibleu.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddiblt.c
> b/gcc/testsuite/gcc.target/riscv/adddiblt.c
> index 8ab979ddfc5..c0246f13526 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddiblt.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddiblt.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibltu.c
> b/gcc/testsuite/gcc.target/riscv/adddibltu.c
> index 858e70f18c6..c57c3d54fe3 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibltu.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibltu.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddibne.c
> b/gcc/testsuite/gcc.target/riscv/adddibne.c
> index e5dfee58e00..b1da625516f 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddibne.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddibne.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddieq.c
> b/gcc/testsuite/gcc.target/riscv/adddieq.c
> index 6195bf5584b..6149c05a0d4 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddieq.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddieq.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddifeq.c
> b/gcc/testsuite/gcc.target/riscv/adddifeq.c
> index 07c3f66cb0a..36eff65cec6 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddifeq.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddifeq.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddifge.c
> b/gcc/testsuite/gcc.target/riscv/adddifge.c
> index 7c4307cbf42..ef34648f92f 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddifge.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddifge.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddifgt.c
> b/gcc/testsuite/gcc.target/riscv/adddifgt.c
> index f4774c4caad..cd91243fef0 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddifgt.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddifgt.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddifle.c
> b/gcc/testsuite/gcc.target/riscv/adddifle.c
> index 20a27363979..c30062664fa 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddifle.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddifle.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddiflt.c
> b/gcc/testsuite/gcc.target/riscv/adddiflt.c
> index 18221f695ed..e618177f188 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddiflt.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddiflt.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddifne.c
> b/gcc/testsuite/gcc.target/riscv/adddifne.c
> index 58fcb401ef7..53382c0c737 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddifne.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddifne.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddige.c
> b/gcc/testsuite/gcc.target/riscv/adddige.c
> index 85e42244f3d..116ed5ff860 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddige.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddige.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddigeu.c
> b/gcc/testsuite/gcc.target/riscv/adddigeu.c
> index f96714b9fb6..cd1f985be88 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddigeu.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddigeu.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddigt.c
> b/gcc/testsuite/gcc.target/riscv/adddigt.c
> index 047cbd4483c..aa71c235fb3 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddigt.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddigt.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddigtu.c
> b/gcc/testsuite/gcc.target/riscv/adddigtu.c
> index 10126369aab..e04e4a681bb 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddigtu.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddigtu.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddile.c
> b/gcc/testsuite/gcc.target/riscv/adddile.c
> index e69b1957ace..cea4bc503f3 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddile.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddile.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddileu.c
> b/gcc/testsuite/gcc.target/riscv/adddileu.c
> index 1e3bbd80080..a1b247ad420 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddileu.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddileu.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddilt.c
> b/gcc/testsuite/gcc.target/riscv/adddilt.c
> index 647263ad5b8..e7c79b06714 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddilt.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddilt.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddiltu.c
> b/gcc/testsuite/gcc.target/riscv/adddiltu.c
> index 4a511b4290e..a423a5a1f52 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddiltu.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddiltu.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/adddine.c
> b/gcc/testsuite/gcc.target/riscv/adddine.c
> index 00ff8757a55..e7cd7eaa12a 100644
> --- a/gcc/testsuite/gcc.target/riscv/adddine.c
> +++ b/gcc/testsuite/gcc.target/riscv/adddine.c
> @@ -3,3 +3,3 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibeq.c
> b/gcc/testsuite/gcc.target/riscv/addsibeq.c
> index c1e810d8fab..4b249dd775e 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibeq.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibeq.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4
> -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
> +/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibfeq.c
> b/gcc/testsuite/gcc.target/riscv/addsibfeq.c
> index 27d13a0b4d9..6f03e6d2430 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibfeq.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibfeq.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
> +/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibfge.c
> b/gcc/testsuite/gcc.target/riscv/addsibfge.c
> index 501f7562e66..3ac3e88c12b 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibfge.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibfge.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
> +/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32
> } } } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64
> } } } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibfgt.c
> b/gcc/testsuite/gcc.target/riscv/addsibfgt.c
> index fff809b2b1f..b3e6d7a93d1 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibfgt.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibfgt.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
> +/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32
> } } } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64
> } } } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibfle.c
> b/gcc/testsuite/gcc.target/riscv/addsibfle.c
> index abcad61c9c4..d81ca80b0f2 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibfle.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibfle.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
> +/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32
> } } } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64
> } } } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibflt.c
> b/gcc/testsuite/gcc.target/riscv/addsibflt.c
> index 2a82c289e64..38235d6031d 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibflt.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibflt.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
> +/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32
> } } } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64
> } } } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibfne.c
> b/gcc/testsuite/gcc.target/riscv/addsibfne.c
> index 94da0710a26..1e69e3e10f1 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibfne.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibfne.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2
> -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
> +/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibge.c
> b/gcc/testsuite/gcc.target/riscv/addsibge.c
> index 3f67d161f77..fc7660a0447 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibge.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibge.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
> +/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibgeu.c
> b/gcc/testsuite/gcc.target/riscv/addsibgeu.c
> index b6df5312671..0109a5f1cac 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibgeu.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibgeu.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
> +/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibgt.c
> b/gcc/testsuite/gcc.target/riscv/addsibgt.c
> index 86fcd6d1402..d2797c8cd08 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibgt.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibgt.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> -/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
> +/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
> +/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series
> -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
>
> diff --git a/gcc/testsuite/gcc.target/riscv/addsibgtu.c
> b/gcc/testsuite/gcc.target/riscv/addsibgtu.c
> index 63ebe65aaa9..91db10270e2 100644
> --- a/gcc/testsuite/gcc.target/riscv/addsibgtu.c
> +++ b/gcc/testsuite/gcc.target/riscv/addsibgtu.c
> @@ -2,4 +2,4 @@
>  /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
> -/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3
> -mmovcc -fdump-rt
diff mbox series

Patch

diff --git a/gcc/testsuite/gcc.dg/pr90838.c b/gcc/testsuite/gcc.dg/pr90838.c
index db7bcec3ea9..644bbce8a18 100644
--- a/gcc/testsuite/gcc.dg/pr90838.c
+++ b/gcc/testsuite/gcc.dg/pr90838.c
@@ -3,4 +3,4 @@ 
 /* { dg-additional-options "-mbmi" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } */
-/* { dg-additional-options "-march=rv64gc_zbb" { target { rv64 } } } */
-/* { dg-additional-options "-march=rv32gc_zbb" { target { rv32 } } } */
+/* { dg-additional-options "-march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
+/* { dg-additional-options "-march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
 /* { dg-require-effective-target int32plus } */
diff --git a/gcc/testsuite/gcc.target/riscv/adddibeq.c b/gcc/testsuite/gcc.target/riscv/adddibeq.c
index 624c56ef6ef..2aaaecc6abe 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibeq.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibeq.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibfeq.c b/gcc/testsuite/gcc.target/riscv/adddibfeq.c
index 403200fd425..a60879440f4 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibfeq.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibfeq.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibfge.c b/gcc/testsuite/gcc.target/riscv/adddibfge.c
index 82fce9c58b6..40467f20c00 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibfge.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibfge.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibfgt.c b/gcc/testsuite/gcc.target/riscv/adddibfgt.c
index 0263154212d..bb6edd2b4d5 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibfgt.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibfgt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibfle.c b/gcc/testsuite/gcc.target/riscv/adddibfle.c
index 6fd65f1b470..6c1f5546f56 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibfle.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibfle.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibflt.c b/gcc/testsuite/gcc.target/riscv/adddibflt.c
index bfee522a5cf..00f17013fdd 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibflt.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibflt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibfne.c b/gcc/testsuite/gcc.target/riscv/adddibfne.c
index 73ade4dcdfe..a7b83b745e1 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibfne.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibfne.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibge.c b/gcc/testsuite/gcc.target/riscv/adddibge.c
index 017b69f7eaa..9a97c5a22fa 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibge.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibge.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibgeu.c b/gcc/testsuite/gcc.target/riscv/adddibgeu.c
index ed17898ed26..5ebdc016758 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibgeu.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibgeu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibgt.c b/gcc/testsuite/gcc.target/riscv/adddibgt.c
index 201852fc62b..1fb089a2dba 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibgt.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibgt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibgtu.c b/gcc/testsuite/gcc.target/riscv/adddibgtu.c
index 60850c4e1a7..b247526994e 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibgtu.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibgtu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddible.c b/gcc/testsuite/gcc.target/riscv/adddible.c
index 5bed30cd015..5f2108ab540 100644
--- a/gcc/testsuite/gcc.target/riscv/adddible.c
+++ b/gcc/testsuite/gcc.target/riscv/adddible.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibleu.c b/gcc/testsuite/gcc.target/riscv/adddibleu.c
index 3d16d09b340..28172b2275d 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibleu.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibleu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddiblt.c b/gcc/testsuite/gcc.target/riscv/adddiblt.c
index 8ab979ddfc5..c0246f13526 100644
--- a/gcc/testsuite/gcc.target/riscv/adddiblt.c
+++ b/gcc/testsuite/gcc.target/riscv/adddiblt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibltu.c b/gcc/testsuite/gcc.target/riscv/adddibltu.c
index 858e70f18c6..c57c3d54fe3 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibltu.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibltu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddibne.c b/gcc/testsuite/gcc.target/riscv/adddibne.c
index e5dfee58e00..b1da625516f 100644
--- a/gcc/testsuite/gcc.target/riscv/adddibne.c
+++ b/gcc/testsuite/gcc.target/riscv/adddibne.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddieq.c b/gcc/testsuite/gcc.target/riscv/adddieq.c
index 6195bf5584b..6149c05a0d4 100644
--- a/gcc/testsuite/gcc.target/riscv/adddieq.c
+++ b/gcc/testsuite/gcc.target/riscv/adddieq.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddifeq.c b/gcc/testsuite/gcc.target/riscv/adddifeq.c
index 07c3f66cb0a..36eff65cec6 100644
--- a/gcc/testsuite/gcc.target/riscv/adddifeq.c
+++ b/gcc/testsuite/gcc.target/riscv/adddifeq.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddifge.c b/gcc/testsuite/gcc.target/riscv/adddifge.c
index 7c4307cbf42..ef34648f92f 100644
--- a/gcc/testsuite/gcc.target/riscv/adddifge.c
+++ b/gcc/testsuite/gcc.target/riscv/adddifge.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddifgt.c b/gcc/testsuite/gcc.target/riscv/adddifgt.c
index f4774c4caad..cd91243fef0 100644
--- a/gcc/testsuite/gcc.target/riscv/adddifgt.c
+++ b/gcc/testsuite/gcc.target/riscv/adddifgt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddifle.c b/gcc/testsuite/gcc.target/riscv/adddifle.c
index 20a27363979..c30062664fa 100644
--- a/gcc/testsuite/gcc.target/riscv/adddifle.c
+++ b/gcc/testsuite/gcc.target/riscv/adddifle.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddiflt.c b/gcc/testsuite/gcc.target/riscv/adddiflt.c
index 18221f695ed..e618177f188 100644
--- a/gcc/testsuite/gcc.target/riscv/adddiflt.c
+++ b/gcc/testsuite/gcc.target/riscv/adddiflt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddifne.c b/gcc/testsuite/gcc.target/riscv/adddifne.c
index 58fcb401ef7..53382c0c737 100644
--- a/gcc/testsuite/gcc.target/riscv/adddifne.c
+++ b/gcc/testsuite/gcc.target/riscv/adddifne.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddige.c b/gcc/testsuite/gcc.target/riscv/adddige.c
index 85e42244f3d..116ed5ff860 100644
--- a/gcc/testsuite/gcc.target/riscv/adddige.c
+++ b/gcc/testsuite/gcc.target/riscv/adddige.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddigeu.c b/gcc/testsuite/gcc.target/riscv/adddigeu.c
index f96714b9fb6..cd1f985be88 100644
--- a/gcc/testsuite/gcc.target/riscv/adddigeu.c
+++ b/gcc/testsuite/gcc.target/riscv/adddigeu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddigt.c b/gcc/testsuite/gcc.target/riscv/adddigt.c
index 047cbd4483c..aa71c235fb3 100644
--- a/gcc/testsuite/gcc.target/riscv/adddigt.c
+++ b/gcc/testsuite/gcc.target/riscv/adddigt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddigtu.c b/gcc/testsuite/gcc.target/riscv/adddigtu.c
index 10126369aab..e04e4a681bb 100644
--- a/gcc/testsuite/gcc.target/riscv/adddigtu.c
+++ b/gcc/testsuite/gcc.target/riscv/adddigtu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddile.c b/gcc/testsuite/gcc.target/riscv/adddile.c
index e69b1957ace..cea4bc503f3 100644
--- a/gcc/testsuite/gcc.target/riscv/adddile.c
+++ b/gcc/testsuite/gcc.target/riscv/adddile.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddileu.c b/gcc/testsuite/gcc.target/riscv/adddileu.c
index 1e3bbd80080..a1b247ad420 100644
--- a/gcc/testsuite/gcc.target/riscv/adddileu.c
+++ b/gcc/testsuite/gcc.target/riscv/adddileu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddilt.c b/gcc/testsuite/gcc.target/riscv/adddilt.c
index 647263ad5b8..e7c79b06714 100644
--- a/gcc/testsuite/gcc.target/riscv/adddilt.c
+++ b/gcc/testsuite/gcc.target/riscv/adddilt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddiltu.c b/gcc/testsuite/gcc.target/riscv/adddiltu.c
index 4a511b4290e..a423a5a1f52 100644
--- a/gcc/testsuite/gcc.target/riscv/adddiltu.c
+++ b/gcc/testsuite/gcc.target/riscv/adddiltu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/adddine.c b/gcc/testsuite/gcc.target/riscv/adddine.c
index 00ff8757a55..e7cd7eaa12a 100644
--- a/gcc/testsuite/gcc.target/riscv/adddine.c
+++ b/gcc/testsuite/gcc.target/riscv/adddine.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibeq.c b/gcc/testsuite/gcc.target/riscv/addsibeq.c
index c1e810d8fab..4b249dd775e 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibeq.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibeq.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibfeq.c b/gcc/testsuite/gcc.target/riscv/addsibfeq.c
index 27d13a0b4d9..6f03e6d2430 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibfeq.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibfeq.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibfge.c b/gcc/testsuite/gcc.target/riscv/addsibfge.c
index 501f7562e66..3ac3e88c12b 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibfge.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibfge.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibfgt.c b/gcc/testsuite/gcc.target/riscv/addsibfgt.c
index fff809b2b1f..b3e6d7a93d1 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibfgt.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibfgt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibfle.c b/gcc/testsuite/gcc.target/riscv/addsibfle.c
index abcad61c9c4..d81ca80b0f2 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibfle.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibfle.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibflt.c b/gcc/testsuite/gcc.target/riscv/addsibflt.c
index 2a82c289e64..38235d6031d 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibflt.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibflt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibfne.c b/gcc/testsuite/gcc.target/riscv/addsibfne.c
index 94da0710a26..1e69e3e10f1 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibfne.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibfne.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibge.c b/gcc/testsuite/gcc.target/riscv/addsibge.c
index 3f67d161f77..fc7660a0447 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibge.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibge.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibgeu.c b/gcc/testsuite/gcc.target/riscv/addsibgeu.c
index b6df5312671..0109a5f1cac 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibgeu.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibgeu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibgt.c b/gcc/testsuite/gcc.target/riscv/addsibgt.c
index 86fcd6d1402..d2797c8cd08 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibgt.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibgt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibgtu.c b/gcc/testsuite/gcc.target/riscv/addsibgtu.c
index 63ebe65aaa9..91db10270e2 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibgtu.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibgtu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsible.c b/gcc/testsuite/gcc.target/riscv/addsible.c
index 164d9c0e63b..1ffced59b0b 100644
--- a/gcc/testsuite/gcc.target/riscv/addsible.c
+++ b/gcc/testsuite/gcc.target/riscv/addsible.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibleu.c b/gcc/testsuite/gcc.target/riscv/addsibleu.c
index b02170b4176..6bc7e50b09f 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibleu.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibleu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsiblt.c b/gcc/testsuite/gcc.target/riscv/addsiblt.c
index a7911fddd25..05fe3ff5181 100644
--- a/gcc/testsuite/gcc.target/riscv/addsiblt.c
+++ b/gcc/testsuite/gcc.target/riscv/addsiblt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibltu.c b/gcc/testsuite/gcc.target/riscv/addsibltu.c
index 69ee2a5e042..47574e16612 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibltu.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibltu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsibne.c b/gcc/testsuite/gcc.target/riscv/addsibne.c
index 929e05765a3..0657a5569e7 100644
--- a/gcc/testsuite/gcc.target/riscv/addsibne.c
+++ b/gcc/testsuite/gcc.target/riscv/addsibne.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsieq.c b/gcc/testsuite/gcc.target/riscv/addsieq.c
index c5797a76a12..7965296eea9 100644
--- a/gcc/testsuite/gcc.target/riscv/addsieq.c
+++ b/gcc/testsuite/gcc.target/riscv/addsieq.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsifeq.c b/gcc/testsuite/gcc.target/riscv/addsifeq.c
index fe93f41b331..6890e9c6df7 100644
--- a/gcc/testsuite/gcc.target/riscv/addsifeq.c
+++ b/gcc/testsuite/gcc.target/riscv/addsifeq.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsifge.c b/gcc/testsuite/gcc.target/riscv/addsifge.c
index a0d31b23213..b1a1421628d 100644
--- a/gcc/testsuite/gcc.target/riscv/addsifge.c
+++ b/gcc/testsuite/gcc.target/riscv/addsifge.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsifgt.c b/gcc/testsuite/gcc.target/riscv/addsifgt.c
index f61efb5514d..2cee64c72e2 100644
--- a/gcc/testsuite/gcc.target/riscv/addsifgt.c
+++ b/gcc/testsuite/gcc.target/riscv/addsifgt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsifle.c b/gcc/testsuite/gcc.target/riscv/addsifle.c
index a9a86bbfb4e..f18d407bfd4 100644
--- a/gcc/testsuite/gcc.target/riscv/addsifle.c
+++ b/gcc/testsuite/gcc.target/riscv/addsifle.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsiflt.c b/gcc/testsuite/gcc.target/riscv/addsiflt.c
index f68bd2d2f72..6a1f05dffd2 100644
--- a/gcc/testsuite/gcc.target/riscv/addsiflt.c
+++ b/gcc/testsuite/gcc.target/riscv/addsiflt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -ffinite-math-only -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsifne.c b/gcc/testsuite/gcc.target/riscv/addsifne.c
index 9875d62b43b..8802a8fbe31 100644
--- a/gcc/testsuite/gcc.target/riscv/addsifne.c
+++ b/gcc/testsuite/gcc.target/riscv/addsifne.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=3 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsige.c b/gcc/testsuite/gcc.target/riscv/addsige.c
index 461f2ade23b..36e7da45e88 100644
--- a/gcc/testsuite/gcc.target/riscv/addsige.c
+++ b/gcc/testsuite/gcc.target/riscv/addsige.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsigeu.c b/gcc/testsuite/gcc.target/riscv/addsigeu.c
index 3afcc3375f3..7d99cc44854 100644
--- a/gcc/testsuite/gcc.target/riscv/addsigeu.c
+++ b/gcc/testsuite/gcc.target/riscv/addsigeu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsigt.c b/gcc/testsuite/gcc.target/riscv/addsigt.c
index 247626af8cf..9e9fdf12084 100644
--- a/gcc/testsuite/gcc.target/riscv/addsigt.c
+++ b/gcc/testsuite/gcc.target/riscv/addsigt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsigtu.c b/gcc/testsuite/gcc.target/riscv/addsigtu.c
index c6948b45dff..25292076370 100644
--- a/gcc/testsuite/gcc.target/riscv/addsigtu.c
+++ b/gcc/testsuite/gcc.target/riscv/addsigtu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsile.c b/gcc/testsuite/gcc.target/riscv/addsile.c
index 50725211644..70d235043d1 100644
--- a/gcc/testsuite/gcc.target/riscv/addsile.c
+++ b/gcc/testsuite/gcc.target/riscv/addsile.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsileu.c b/gcc/testsuite/gcc.target/riscv/addsileu.c
index 2758a9e576b..0cc630b2af4 100644
--- a/gcc/testsuite/gcc.target/riscv/addsileu.c
+++ b/gcc/testsuite/gcc.target/riscv/addsileu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsilt.c b/gcc/testsuite/gcc.target/riscv/addsilt.c
index bad08e78dbd..dae0b511246 100644
--- a/gcc/testsuite/gcc.target/riscv/addsilt.c
+++ b/gcc/testsuite/gcc.target/riscv/addsilt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsiltu.c b/gcc/testsuite/gcc.target/riscv/addsiltu.c
index 0cee92fafaf..bfc727c7831 100644
--- a/gcc/testsuite/gcc.target/riscv/addsiltu.c
+++ b/gcc/testsuite/gcc.target/riscv/addsiltu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/addsine.c b/gcc/testsuite/gcc.target/riscv/addsine.c
index 4d45b83c550..caf1aa7a1c1 100644
--- a/gcc/testsuite/gcc.target/riscv/addsine.c
+++ b/gcc/testsuite/gcc.target/riscv/addsine.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cmo-zicboz-zic64-1.c b/gcc/testsuite/gcc.target/riscv/cmo-zicboz-zic64-1.c
index 9192b391b11..a1df3eadba5 100644
--- a/gcc/testsuite/gcc.target/riscv/cmo-zicboz-zic64-1.c
+++ b/gcc/testsuite/gcc.target/riscv/cmo-zicboz-zic64-1.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_zic64b_zicboz" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_zic64b_zicboz" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zic64b_zicboz -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zic64b_zicboz -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } {"-O0" "-Os" "-Og" "-Oz" "-flto" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/cmpmemsi-2.c b/gcc/testsuite/gcc.target/riscv/cmpmemsi-2.c
index 77aa88b5b9c..c80ee07e327 100644
--- a/gcc/testsuite/gcc.target/riscv/cmpmemsi-2.c
+++ b/gcc/testsuite/gcc.target/riscv/cmpmemsi-2.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/cmpmemsi-3.c b/gcc/testsuite/gcc.target/riscv/cmpmemsi-3.c
index 193cd4a343e..f4bfc5e79f4 100644
--- a/gcc/testsuite/gcc.target/riscv/cmpmemsi-3.c
+++ b/gcc/testsuite/gcc.target/riscv/cmpmemsi-3.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/cmpmemsi.c b/gcc/testsuite/gcc.target/riscv/cmpmemsi.c
index f4ccf269924..0069babd50a 100644
--- a/gcc/testsuite/gcc.target/riscv/cmpmemsi.c
+++ b/gcc/testsuite/gcc.target/riscv/cmpmemsi.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/cpymemsi-2.c b/gcc/testsuite/gcc.target/riscv/cpymemsi-2.c
index 833d1c04487..e7437984b15 100644
--- a/gcc/testsuite/gcc.target/riscv/cpymemsi-2.c
+++ b/gcc/testsuite/gcc.target/riscv/cpymemsi-2.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/cpymemsi-3.c b/gcc/testsuite/gcc.target/riscv/cpymemsi-3.c
index 803765195b2..70bd38863cf 100644
--- a/gcc/testsuite/gcc.target/riscv/cpymemsi-3.c
+++ b/gcc/testsuite/gcc.target/riscv/cpymemsi-3.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/cpymemsi.c b/gcc/testsuite/gcc.target/riscv/cpymemsi.c
index d27a488c8ed..8bfbab496c5 100644
--- a/gcc/testsuite/gcc.target/riscv/cpymemsi.c
+++ b/gcc/testsuite/gcc.target/riscv/cpymemsi.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc32.c b/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc32.c
index ca90feaef26..6c408b2f269 100644
--- a/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc32.c
+++ b/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc32.c
@@ -1,3 +1,3 @@ 
 /* { dg-do compile { target { rv32 } } } */
-/* { dg-options "-march=rv32gc_zbc" } */
+/* { dg-options "-march=rv32gc_zbc -mabi=ilp32d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc64.c b/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc64.c
index f31a8bd949f..1ace4764a45 100644
--- a/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc64.c
+++ b/gcc/testsuite/gcc.target/riscv/crc-builtin-zbc64.c
@@ -1,3 +1,3 @@ 
 /* { dg-do compile { target { rv64 } } } */
-/* { dg-options "-march=rv64gc_zbc" } */
+/* { dg-options "-march=rv64gc_zbc -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-rtl.c b/gcc/testsuite/gcc.target/riscv/cset-sext-rtl.c
index e3611cc3b16..841366398b0 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-rtl.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-rtl.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-rtl32.c b/gcc/testsuite/gcc.target/riscv/cset-sext-rtl32.c
index 640576a7ccc..5b856c9bae0 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-rtl32.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-rtl32.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl.c b/gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl.c
index 93baa38d22f..5a32a54699d 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-flto" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl32.c b/gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl32.c
index 16b702b85cd..5215db03c5a 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl32.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-sfb-rtl32.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-flto" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-sfb.c b/gcc/testsuite/gcc.target/riscv/cset-sext-sfb.c
index 1ee45b33e15..745b860031d 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O1" "-Os" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fno-ssa-phiopt -fdump-rtl-ce1" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fno-ssa-phiopt -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fno-ssa-phiopt -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fno-ssa-phiopt -fdump-rtl-ce1" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-thead-rtl.c b/gcc/testsuite/gcc.target/riscv/cset-sext-thead-rtl.c
index 9671796eec6..6e5f05d5c63 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-thead-rtl.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-thead-rtl.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-flto" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-thead.c b/gcc/testsuite/gcc.target/riscv/cset-sext-thead.c
index 74cae71d7a0..c725f30099c 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-ventana-rtl.c b/gcc/testsuite/gcc.target/riscv/cset-sext-ventana-rtl.c
index 6436725c05b..bf83325e949 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-ventana-rtl.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-ventana-rtl.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-flto" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-ventana.c b/gcc/testsuite/gcc.target/riscv/cset-sext-ventana.c
index 8c3ca98bc2f..b46d26af556 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl.c b/gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl.c
index f6c82d5a5d0..cc5259c9c2d 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-flto" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl32.c b/gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl32.c
index 6896df3d5a9..3ff320cf506 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl32.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-zicond-rtl32.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-flto" } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext-zicond.c b/gcc/testsuite/gcc.target/riscv/cset-sext-zicond.c
index ec715254d4e..b41bf209a1d 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/cset-sext.c b/gcc/testsuite/gcc.target/riscv/cset-sext.c
index e1c3239d146..ca2def614d3 100644
--- a/gcc/testsuite/gcc.target/riscv/cset-sext.c
+++ b/gcc/testsuite/gcc.target/riscv/cset-sext.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=1 -mmovcc" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=1 -mmovcc" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=1 -mmovcc" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=1 -mmovcc" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/matrix_add_const.c b/gcc/testsuite/gcc.target/riscv/matrix_add_const.c
index 7347c3de3b8..a9fc2171a0a 100644
--- a/gcc/testsuite/gcc.target/riscv/matrix_add_const.c
+++ b/gcc/testsuite/gcc.target/riscv/matrix_add_const.c
@@ -3,3 +3,3 @@ 
 /* { dg-options "-O2 -fdump-rtl-ext_dce -march=rv64gc -mabi=lp64d" { target { rv64 } } } */
-/* { dg-options "-O2 -fdump-rtl-ext_dce -march=rv32gc" { target { rv32 } } } */
+/* { dg-options "-O2 -fdump-rtl-ext_dce -march=rv32gc -mabi=ilp32d" { target { rv32 } } } */
 /* { dg-final { scan-rtl-dump {Successfully transformed} "ext_dce" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/movdibeq-thead.c b/gcc/testsuite/gcc.target/riscv/movdibeq-thead.c
index 26737ee9e06..6cbca83caca 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibeq-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibeq-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibeq-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibeq-ventana.c
index c48e57e4fb7..a0ed174e661 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibeq-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibeq-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibeq-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibeq-zicond.c
index 6f6173172bc..92a786c3f9f 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibeq-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibeq-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibeq.c b/gcc/testsuite/gcc.target/riscv/movdibeq.c
index 8359eca76ef..94e4f50e1bc 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibeq.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibeq.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfeq-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibfeq-ventana.c
index e43b642a58c..9f86f54adef 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfeq-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfeq-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfeq-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibfeq-zicond.c
index ea4ff149696..1fb4735fbf6 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfeq-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfeq-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfeq.c b/gcc/testsuite/gcc.target/riscv/movdibfeq.c
index 03c934beff8..997462da0f2 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfeq.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfeq.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfge-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibfge-ventana.c
index b80f5c9bf2d..8ae182a5fb9 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfge-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfge-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfge-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibfge-zicond.c
index ed72259fc60..aa9e52ec7c1 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfge-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfge-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfge.c b/gcc/testsuite/gcc.target/riscv/movdibfge.c
index 68dacb68b08..d456543cf33 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfge.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfge.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfgt-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibfgt-ventana.c
index fd392ecd83c..eba0c9cde24 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfgt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfgt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfgt-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibfgt-zicond.c
index 158ad9e3006..99d9967c898 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfgt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfgt-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfgt.c b/gcc/testsuite/gcc.target/riscv/movdibfgt.c
index dbd60d7f3c4..d3760c949b1 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfgt.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfgt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfle-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibfle-ventana.c
index bc9d719b1e0..77de5875ce5 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfle-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfle-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfle-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibfle-zicond.c
index ac9f159a656..44c4c805717 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfle-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfle-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfle.c b/gcc/testsuite/gcc.target/riscv/movdibfle.c
index 42d540107e9..b91e23de607 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfle.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfle.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibflt-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibflt-ventana.c
index 3a2610745ef..16dce5cc1f0 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibflt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibflt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibflt-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibflt-zicond.c
index a8e362b9bb3..255452f5747 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibflt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibflt-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibflt.c b/gcc/testsuite/gcc.target/riscv/movdibflt.c
index 08935ffc9fc..4182ebe1015 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibflt.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibflt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfne-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibfne-ventana.c
index 634872ad252..ecd4c41af57 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfne-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfne-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfne-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibfne-zicond.c
index 24db9fa80ec..c93b78a4e4c 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfne-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfne-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibfne.c b/gcc/testsuite/gcc.target/riscv/movdibfne.c
index 1b71ad92185..4a8f5255256 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibfne.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibfne.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibge-thead.c b/gcc/testsuite/gcc.target/riscv/movdibge-thead.c
index 4c059374e49..65c209a7677 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibge-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibge-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibge-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibge-ventana.c
index c0190e5c3e3..4426d889402 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibge-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibge-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibge-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibge-zicond.c
index c4bd6503d41..4e042d769b7 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibge-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibge-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibge.c b/gcc/testsuite/gcc.target/riscv/movdibge.c
index e991835c9f8..01a81b788c1 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibge.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibge.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgeu-thead.c b/gcc/testsuite/gcc.target/riscv/movdibgeu-thead.c
index c8461604d8b..775f80d7e7c 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgeu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgeu-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgeu-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibgeu-ventana.c
index 584bf265392..53e9bdaf742 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgeu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgeu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgeu-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibgeu-zicond.c
index e6ea9d14f11..9cbbc525842 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgeu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgeu-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgeu.c b/gcc/testsuite/gcc.target/riscv/movdibgeu.c
index b0e3e3ded3a..6cc95bd0cc9 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgeu.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgeu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgt-thead.c b/gcc/testsuite/gcc.target/riscv/movdibgt-thead.c
index cc22ff64d01..0c5d80ec12c 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgt-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgt-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibgt-ventana.c
index 00b954c2289..02dbde8cc1b 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgt-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibgt-zicond.c
index 1a1445fb3b8..b6520f1599b 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgt-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgt.c b/gcc/testsuite/gcc.target/riscv/movdibgt.c
index 9890c6ac84a..c79bc7aa399 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgt.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgtu-thead.c b/gcc/testsuite/gcc.target/riscv/movdibgtu-thead.c
index e616c15c968..9f857c53f7b 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgtu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgtu-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgtu-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibgtu-ventana.c
index ea4548d81b0..e1499b9b24b 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgtu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgtu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgtu-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibgtu-zicond.c
index 19198f25f34..a7244188e18 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgtu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgtu-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibgtu.c b/gcc/testsuite/gcc.target/riscv/movdibgtu.c
index 7fa25c9c262..3e9bfa8ca34 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibgtu.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibgtu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdible-thead.c b/gcc/testsuite/gcc.target/riscv/movdible-thead.c
index 16415d69540..946ab0e56d7 100644
--- a/gcc/testsuite/gcc.target/riscv/movdible-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdible-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdible-ventana.c b/gcc/testsuite/gcc.target/riscv/movdible-ventana.c
index 2d1a49e4004..4f29144cdec 100644
--- a/gcc/testsuite/gcc.target/riscv/movdible-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdible-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdible-zicond.c b/gcc/testsuite/gcc.target/riscv/movdible-zicond.c
index ec26a364e68..38d42eb06c9 100644
--- a/gcc/testsuite/gcc.target/riscv/movdible-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdible-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdible.c b/gcc/testsuite/gcc.target/riscv/movdible.c
index 23de185b6e0..8ce943e7640 100644
--- a/gcc/testsuite/gcc.target/riscv/movdible.c
+++ b/gcc/testsuite/gcc.target/riscv/movdible.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibleu-thead.c b/gcc/testsuite/gcc.target/riscv/movdibleu-thead.c
index 37781af332d..24b35e5e8c2 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibleu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibleu-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibleu-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibleu-ventana.c
index 3e10d7be4c9..c10b41235cf 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibleu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibleu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibleu-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibleu-zicond.c
index bc1fb685603..9e526cc8d73 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibleu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibleu-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibleu.c b/gcc/testsuite/gcc.target/riscv/movdibleu.c
index 032e93bdf2b..b581c279e11 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibleu.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibleu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiblt-thead.c b/gcc/testsuite/gcc.target/riscv/movdiblt-thead.c
index 43a772e8fa1..88bf696c985 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiblt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiblt-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiblt-ventana.c b/gcc/testsuite/gcc.target/riscv/movdiblt-ventana.c
index 0636f90f270..02c3487f8e7 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiblt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiblt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiblt-zicond.c b/gcc/testsuite/gcc.target/riscv/movdiblt-zicond.c
index 3c82f0b4ce7..d3e96c8a672 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiblt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiblt-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiblt.c b/gcc/testsuite/gcc.target/riscv/movdiblt.c
index 0b7a40cf895..ffcab2e16d0 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiblt.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiblt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibltu-thead.c b/gcc/testsuite/gcc.target/riscv/movdibltu-thead.c
index ec44b1a41df..d893958084b 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibltu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibltu-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibltu-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibltu-ventana.c
index c92a4940477..6e66a5c343c 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibltu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibltu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibltu-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibltu-zicond.c
index 68bdccf160c..b18eee2ce5f 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibltu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibltu-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibltu.c b/gcc/testsuite/gcc.target/riscv/movdibltu.c
index 277d08efbf3..345ec0fed28 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibltu.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibltu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibne-thead.c b/gcc/testsuite/gcc.target/riscv/movdibne-thead.c
index 8edcfd5c6fc..429972c8e0f 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibne-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibne-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibne-ventana.c b/gcc/testsuite/gcc.target/riscv/movdibne-ventana.c
index 5752f14dd4c..ccc711d8ad9 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibne-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibne-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibne-zicond.c b/gcc/testsuite/gcc.target/riscv/movdibne-zicond.c
index 1c97a3c3f92..b7ebfbe2a52 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibne-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibne-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdibne.c b/gcc/testsuite/gcc.target/riscv/movdibne.c
index f3b6715ae60..d9384904113 100644
--- a/gcc/testsuite/gcc.target/riscv/movdibne.c
+++ b/gcc/testsuite/gcc.target/riscv/movdibne.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdieq-sfb.c b/gcc/testsuite/gcc.target/riscv/movdieq-sfb.c
index aed11b0fb60..331f295dd6a 100644
--- a/gcc/testsuite/gcc.target/riscv/movdieq-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdieq-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdieq-thead.c b/gcc/testsuite/gcc.target/riscv/movdieq-thead.c
index 2109a72d510..4009422b481 100644
--- a/gcc/testsuite/gcc.target/riscv/movdieq-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdieq-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdieq-ventana.c b/gcc/testsuite/gcc.target/riscv/movdieq-ventana.c
index bca40ce788f..a81964bdd4b 100644
--- a/gcc/testsuite/gcc.target/riscv/movdieq-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdieq-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdieq-zicond.c b/gcc/testsuite/gcc.target/riscv/movdieq-zicond.c
index 3222c8771b0..56bb1f872c8 100644
--- a/gcc/testsuite/gcc.target/riscv/movdieq-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdieq-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdieq.c b/gcc/testsuite/gcc.target/riscv/movdieq.c
index 98783419400..0fa1776b87f 100644
--- a/gcc/testsuite/gcc.target/riscv/movdieq.c
+++ b/gcc/testsuite/gcc.target/riscv/movdieq.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=7 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=7 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifeq-sfb.c b/gcc/testsuite/gcc.target/riscv/movdifeq-sfb.c
index fe5a79a520a..9396456db67 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifeq-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifeq-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifeq-thead.c b/gcc/testsuite/gcc.target/riscv/movdifeq-thead.c
index 487e3eb7493..09be02a5209 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifeq-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifeq-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifeq-ventana.c b/gcc/testsuite/gcc.target/riscv/movdifeq-ventana.c
index 6d6c8019703..f602637fb56 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifeq-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifeq-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifeq-zicond.c b/gcc/testsuite/gcc.target/riscv/movdifeq-zicond.c
index 15bd6e13d7f..7ce32a865ea 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifeq-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifeq-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifeq.c b/gcc/testsuite/gcc.target/riscv/movdifeq.c
index de6e17e5f80..73b54a70336 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifeq.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifeq.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifge-sfb.c b/gcc/testsuite/gcc.target/riscv/movdifge-sfb.c
index b5eb0f40dff..4c22855bd36 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifge-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifge-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifge-thead.c b/gcc/testsuite/gcc.target/riscv/movdifge-thead.c
index 6fb210ccc8d..bdef2d5a3c1 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifge-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifge-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifge-ventana.c b/gcc/testsuite/gcc.target/riscv/movdifge-ventana.c
index be33171d109..6774875c009 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifge-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifge-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifge-zicond.c b/gcc/testsuite/gcc.target/riscv/movdifge-zicond.c
index 0c6a10fee28..c8acb1c4ce6 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifge-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifge-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifge.c b/gcc/testsuite/gcc.target/riscv/movdifge.c
index 3193aaeb38a..8e29ab943f7 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifge.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifge.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifgt-sfb.c b/gcc/testsuite/gcc.target/riscv/movdifgt-sfb.c
index 0fc5a1caa62..f6e1ba2e9a6 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifgt-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifgt-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifgt-thead.c b/gcc/testsuite/gcc.target/riscv/movdifgt-thead.c
index 1eece07afcd..26100712faa 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifgt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifgt-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifgt-ventana.c b/gcc/testsuite/gcc.target/riscv/movdifgt-ventana.c
index 7df01a64952..02f3923177d 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifgt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifgt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifgt-zicond.c b/gcc/testsuite/gcc.target/riscv/movdifgt-zicond.c
index 6b18e8f4678..f3d599df11a 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifgt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifgt-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifgt.c b/gcc/testsuite/gcc.target/riscv/movdifgt.c
index 466b4ab9a4d..568e2d0cc03 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifgt.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifgt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifle-sfb.c b/gcc/testsuite/gcc.target/riscv/movdifle-sfb.c
index 475c7f2d25a..f928422ec72 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifle-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifle-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifle-thead.c b/gcc/testsuite/gcc.target/riscv/movdifle-thead.c
index 9ee0dbb7da4..43d68e40e49 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifle-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifle-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifle-ventana.c b/gcc/testsuite/gcc.target/riscv/movdifle-ventana.c
index d6f67ae940d..967e5fd2d28 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifle-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifle-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifle-zicond.c b/gcc/testsuite/gcc.target/riscv/movdifle-zicond.c
index c1f13b7f5dc..bfa87ec31fb 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifle-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifle-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifle.c b/gcc/testsuite/gcc.target/riscv/movdifle.c
index 579f14dcb21..9dd0903c7ff 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifle.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifle.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiflt-sfb.c b/gcc/testsuite/gcc.target/riscv/movdiflt-sfb.c
index c116fe315b4..c492dc7c3ff 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiflt-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiflt-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiflt-thead.c b/gcc/testsuite/gcc.target/riscv/movdiflt-thead.c
index f4f210c02a9..3ecc67480ab 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiflt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiflt-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiflt-ventana.c b/gcc/testsuite/gcc.target/riscv/movdiflt-ventana.c
index 049b77c2b8b..d12ef7f3313 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiflt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiflt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiflt-zicond.c b/gcc/testsuite/gcc.target/riscv/movdiflt-zicond.c
index 6a1d7cea19f..0cb10d8b8c1 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiflt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiflt-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiflt.c b/gcc/testsuite/gcc.target/riscv/movdiflt.c
index 280eaa46f3b..752b7cc2a05 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiflt.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiflt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifne-sfb.c b/gcc/testsuite/gcc.target/riscv/movdifne-sfb.c
index 4d0b64c9ab2..4e6f22b7a91 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifne-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifne-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifne-thead.c b/gcc/testsuite/gcc.target/riscv/movdifne-thead.c
index 54f82d7d859..85403de91c2 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifne-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifne-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifne-ventana.c b/gcc/testsuite/gcc.target/riscv/movdifne-ventana.c
index ae95b6bc476..c1579e2ef58 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifne-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifne-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifne-zicond.c b/gcc/testsuite/gcc.target/riscv/movdifne-zicond.c
index b296d940942..b892458f992 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifne-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifne-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdifne.c b/gcc/testsuite/gcc.target/riscv/movdifne.c
index e06bb14ba0b..4c930580df2 100644
--- a/gcc/testsuite/gcc.target/riscv/movdifne.c
+++ b/gcc/testsuite/gcc.target/riscv/movdifne.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdige-sfb.c b/gcc/testsuite/gcc.target/riscv/movdige-sfb.c
index bcbc2635392..c19dd2053e9 100644
--- a/gcc/testsuite/gcc.target/riscv/movdige-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdige-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdige-thead.c b/gcc/testsuite/gcc.target/riscv/movdige-thead.c
index 5ade7114e3a..59ee4330331 100644
--- a/gcc/testsuite/gcc.target/riscv/movdige-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdige-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdige-ventana.c b/gcc/testsuite/gcc.target/riscv/movdige-ventana.c
index ea60c88e31b..24de51a37f7 100644
--- a/gcc/testsuite/gcc.target/riscv/movdige-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdige-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdige-zicond.c b/gcc/testsuite/gcc.target/riscv/movdige-zicond.c
index 958ebe7aa8f..ed6c88db6c9 100644
--- a/gcc/testsuite/gcc.target/riscv/movdige-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdige-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdige.c b/gcc/testsuite/gcc.target/riscv/movdige.c
index f24f4a83c4f..5ea5bfa46e7 100644
--- a/gcc/testsuite/gcc.target/riscv/movdige.c
+++ b/gcc/testsuite/gcc.target/riscv/movdige.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigeu-sfb.c b/gcc/testsuite/gcc.target/riscv/movdigeu-sfb.c
index fd5abf06571..3b15b013a28 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigeu-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigeu-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigeu-thead.c b/gcc/testsuite/gcc.target/riscv/movdigeu-thead.c
index 6fa48f15f3d..4db15faf3cc 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigeu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigeu-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigeu-ventana.c b/gcc/testsuite/gcc.target/riscv/movdigeu-ventana.c
index a89151b75bf..6cb50881dba 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigeu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigeu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigeu-zicond.c b/gcc/testsuite/gcc.target/riscv/movdigeu-zicond.c
index 2dbd6555163..76b6d4f3a59 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigeu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigeu-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigeu.c b/gcc/testsuite/gcc.target/riscv/movdigeu.c
index ae2f95745da..b4dd42e2c61 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigeu.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigeu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigt-sfb.c b/gcc/testsuite/gcc.target/riscv/movdigt-sfb.c
index f3c41869efc..403471973e0 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigt-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigt-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigt-thead.c b/gcc/testsuite/gcc.target/riscv/movdigt-thead.c
index d687dd2277e..50d49c2e123 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigt-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigt-ventana.c b/gcc/testsuite/gcc.target/riscv/movdigt-ventana.c
index 8206f3b52eb..c7e360155f6 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigt-zicond.c b/gcc/testsuite/gcc.target/riscv/movdigt-zicond.c
index 632d00793ff..99cc8b138ff 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigt-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigt.c b/gcc/testsuite/gcc.target/riscv/movdigt.c
index 83e5244065e..dcc8afe930c 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigt.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigtu-sfb.c b/gcc/testsuite/gcc.target/riscv/movdigtu-sfb.c
index a7881070456..5a16ce2f7a0 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigtu-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigtu-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigtu-thead.c b/gcc/testsuite/gcc.target/riscv/movdigtu-thead.c
index 3fb471a0741..b7171daa553 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigtu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigtu-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigtu-ventana.c b/gcc/testsuite/gcc.target/riscv/movdigtu-ventana.c
index d34314d949a..d8977dccc0c 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigtu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigtu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigtu-zicond.c b/gcc/testsuite/gcc.target/riscv/movdigtu-zicond.c
index 61a0c143699..3b1f9b9ee43 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigtu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigtu-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdigtu.c b/gcc/testsuite/gcc.target/riscv/movdigtu.c
index 184b3841fee..b851f08a456 100644
--- a/gcc/testsuite/gcc.target/riscv/movdigtu.c
+++ b/gcc/testsuite/gcc.target/riscv/movdigtu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdile-sfb.c b/gcc/testsuite/gcc.target/riscv/movdile-sfb.c
index 37587641c20..46d1929264a 100644
--- a/gcc/testsuite/gcc.target/riscv/movdile-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdile-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdile-thead.c b/gcc/testsuite/gcc.target/riscv/movdile-thead.c
index 6ba8d8d582c..8cb34a0f55d 100644
--- a/gcc/testsuite/gcc.target/riscv/movdile-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdile-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdile-ventana.c b/gcc/testsuite/gcc.target/riscv/movdile-ventana.c
index dee7bf7c04c..7689a6ed4dc 100644
--- a/gcc/testsuite/gcc.target/riscv/movdile-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdile-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdile-zicond.c b/gcc/testsuite/gcc.target/riscv/movdile-zicond.c
index a3989a38376..fed7473b788 100644
--- a/gcc/testsuite/gcc.target/riscv/movdile-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdile-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdile.c b/gcc/testsuite/gcc.target/riscv/movdile.c
index a1b7a570f98..dfd651995d9 100644
--- a/gcc/testsuite/gcc.target/riscv/movdile.c
+++ b/gcc/testsuite/gcc.target/riscv/movdile.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdileu-sfb.c b/gcc/testsuite/gcc.target/riscv/movdileu-sfb.c
index 312b52cef7f..7ada7f29bf6 100644
--- a/gcc/testsuite/gcc.target/riscv/movdileu-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdileu-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdileu-thead.c b/gcc/testsuite/gcc.target/riscv/movdileu-thead.c
index 3661165003f..fd5d6d933d8 100644
--- a/gcc/testsuite/gcc.target/riscv/movdileu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdileu-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdileu-ventana.c b/gcc/testsuite/gcc.target/riscv/movdileu-ventana.c
index c50cb43de34..d5d6969b251 100644
--- a/gcc/testsuite/gcc.target/riscv/movdileu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdileu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdileu-zicond.c b/gcc/testsuite/gcc.target/riscv/movdileu-zicond.c
index 018babe7ece..b50e726ddb4 100644
--- a/gcc/testsuite/gcc.target/riscv/movdileu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdileu-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdileu.c b/gcc/testsuite/gcc.target/riscv/movdileu.c
index 4eb82675329..403b2feb007 100644
--- a/gcc/testsuite/gcc.target/riscv/movdileu.c
+++ b/gcc/testsuite/gcc.target/riscv/movdileu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdilt-sfb.c b/gcc/testsuite/gcc.target/riscv/movdilt-sfb.c
index f37b35ba8fe..5513982876a 100644
--- a/gcc/testsuite/gcc.target/riscv/movdilt-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdilt-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdilt-thead.c b/gcc/testsuite/gcc.target/riscv/movdilt-thead.c
index 7ae635767de..d413f502678 100644
--- a/gcc/testsuite/gcc.target/riscv/movdilt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdilt-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdilt-ventana.c b/gcc/testsuite/gcc.target/riscv/movdilt-ventana.c
index 9d98d934a0f..f24f9e91bb9 100644
--- a/gcc/testsuite/gcc.target/riscv/movdilt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdilt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdilt-zicond.c b/gcc/testsuite/gcc.target/riscv/movdilt-zicond.c
index 79bfefe9036..30022ff4755 100644
--- a/gcc/testsuite/gcc.target/riscv/movdilt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdilt-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdilt.c b/gcc/testsuite/gcc.target/riscv/movdilt.c
index 0ba8da0d062..f6ee3834ce9 100644
--- a/gcc/testsuite/gcc.target/riscv/movdilt.c
+++ b/gcc/testsuite/gcc.target/riscv/movdilt.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiltu-sfb.c b/gcc/testsuite/gcc.target/riscv/movdiltu-sfb.c
index fa799dfb358..2af13e2ea17 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiltu-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiltu-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiltu-thead.c b/gcc/testsuite/gcc.target/riscv/movdiltu-thead.c
index 345c88beec4..0c8681c3bfc 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiltu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiltu-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiltu-ventana.c b/gcc/testsuite/gcc.target/riscv/movdiltu-ventana.c
index 23f2572b25e..343827342a8 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiltu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiltu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiltu-zicond.c b/gcc/testsuite/gcc.target/riscv/movdiltu-zicond.c
index 641bfb17d9b..999c9b1e78a 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiltu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiltu-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdiltu.c b/gcc/testsuite/gcc.target/riscv/movdiltu.c
index 0bbc006f0fc..80c382bda9c 100644
--- a/gcc/testsuite/gcc.target/riscv/movdiltu.c
+++ b/gcc/testsuite/gcc.target/riscv/movdiltu.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdine-sfb.c b/gcc/testsuite/gcc.target/riscv/movdine-sfb.c
index 40aec9c6366..4f4924abeb2 100644
--- a/gcc/testsuite/gcc.target/riscv/movdine-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movdine-sfb.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdine-thead.c b/gcc/testsuite/gcc.target/riscv/movdine-thead.c
index 2ea83888709..13019107873 100644
--- a/gcc/testsuite/gcc.target/riscv/movdine-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movdine-thead.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdine-ventana.c b/gcc/testsuite/gcc.target/riscv/movdine-ventana.c
index 0713bac83e2..f9abd7c0049 100644
--- a/gcc/testsuite/gcc.target/riscv/movdine-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movdine-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdine-zicond.c b/gcc/testsuite/gcc.target/riscv/movdine-zicond.c
index 825003be636..df6532401a6 100644
--- a/gcc/testsuite/gcc.target/riscv/movdine-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movdine-zicond.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movdine.c b/gcc/testsuite/gcc.target/riscv/movdine.c
index 0180d051b11..409d2db2729 100644
--- a/gcc/testsuite/gcc.target/riscv/movdine.c
+++ b/gcc/testsuite/gcc.target/riscv/movdine.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibeq-thead.c b/gcc/testsuite/gcc.target/riscv/movsibeq-thead.c
index ac8496d5e21..2e27ed1437b 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibeq-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibeq-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibeq-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibeq-ventana.c
index f9f69c587a5..4ad0f75bb16 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibeq-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibeq-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibeq-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibeq-zicond.c
index d2cc9a0e3c4..e108d2cd90c 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibeq-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibeq-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibeq.c b/gcc/testsuite/gcc.target/riscv/movsibeq.c
index 8f499de8795..f89dc8bf86e 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibeq.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibeq.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfeq-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibfeq-ventana.c
index 44ecadc08f4..8ab8f25e35e 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfeq-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfeq-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfeq-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibfeq-zicond.c
index addbb2ed279..3b3b098d2e2 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfeq-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfeq-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfeq.c b/gcc/testsuite/gcc.target/riscv/movsibfeq.c
index 27b101415dd..4c9f442a7c9 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfeq.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfeq.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfge-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibfge-ventana.c
index e285102c373..0bee8259e78 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfge-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfge-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfge-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibfge-zicond.c
index f696b337131..a8e65dd771f 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfge-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfge-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfge.c b/gcc/testsuite/gcc.target/riscv/movsibfge.c
index fdfdf207363..b87888318e1 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfge.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfge.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfgt-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibfgt-ventana.c
index f26577b7c6a..849037ef9bb 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfgt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfgt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfgt-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibfgt-zicond.c
index 4d1de867587..6ea8b8ce4d7 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfgt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfgt-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfgt.c b/gcc/testsuite/gcc.target/riscv/movsibfgt.c
index 20c55fc86e8..eb618366077 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfgt.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfgt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfle-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibfle-ventana.c
index a52721ef5de..5effaa732e5 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfle-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfle-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfle-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibfle-zicond.c
index b22292f4f78..d4ac2849aa1 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfle-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfle-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfle.c b/gcc/testsuite/gcc.target/riscv/movsibfle.c
index 9e428acc5f6..55d49d7c8fd 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfle.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfle.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibflt-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibflt-ventana.c
index 5c40cb66c4a..36f7ccb2184 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibflt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibflt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibflt-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibflt-zicond.c
index 502a8e5f7d6..4db7762c008 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibflt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibflt-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibflt.c b/gcc/testsuite/gcc.target/riscv/movsibflt.c
index 6a5f9fbb2a0..687a44adc8c 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibflt.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibflt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfne-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibfne-ventana.c
index 0f52852d6e1..eed133d2721 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfne-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfne-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfne-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibfne-zicond.c
index 5f8df56acbf..3d40066bcad 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfne-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfne-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibfne.c b/gcc/testsuite/gcc.target/riscv/movsibfne.c
index 88f1469a14b..66d4342d884 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibfne.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibfne.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=4 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibge-thead.c b/gcc/testsuite/gcc.target/riscv/movsibge-thead.c
index 3dd911993f4..1da864d6d5f 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibge-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibge-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibge-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibge-ventana.c
index e40abbe8bdc..87af9ddfea2 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibge-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibge-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibge-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibge-zicond.c
index c7b62b393ed..202cad78878 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibge-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibge-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibge.c b/gcc/testsuite/gcc.target/riscv/movsibge.c
index 6153d7f65d5..88320da8aac 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibge.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibge.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgeu-thead.c b/gcc/testsuite/gcc.target/riscv/movsibgeu-thead.c
index 4d850f2cc05..85e6399d101 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgeu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgeu-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgeu-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibgeu-ventana.c
index be7fa1318aa..e83f68f7592 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgeu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgeu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgeu-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibgeu-zicond.c
index 6f8dacb4f48..d67106c2aff 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgeu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgeu-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgeu.c b/gcc/testsuite/gcc.target/riscv/movsibgeu.c
index 8d5363b38b3..0c52c5be328 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgeu.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgeu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgt-thead.c b/gcc/testsuite/gcc.target/riscv/movsibgt-thead.c
index 7143c0d4654..85d8d329160 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgt-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgt-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibgt-ventana.c
index 6664ff02ff6..ce212701fd2 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgt-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibgt-zicond.c
index 09b82d19baa..5562125549f 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgt-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgt.c b/gcc/testsuite/gcc.target/riscv/movsibgt.c
index 4851c6f7e79..a61322d9be5 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgt.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgtu-thead.c b/gcc/testsuite/gcc.target/riscv/movsibgtu-thead.c
index 21e418efe75..5c7eef4b66f 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgtu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgtu-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgtu-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibgtu-ventana.c
index 0716ba8f860..c0252c7561a 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgtu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgtu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgtu-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibgtu-zicond.c
index a8018cd066d..be0ec538812 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgtu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgtu-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibgtu.c b/gcc/testsuite/gcc.target/riscv/movsibgtu.c
index bd9329db5ad..a1b26d3c708 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibgtu.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibgtu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsible-thead.c b/gcc/testsuite/gcc.target/riscv/movsible-thead.c
index abcdbdfa7b0..738429e437c 100644
--- a/gcc/testsuite/gcc.target/riscv/movsible-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsible-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsible-ventana.c b/gcc/testsuite/gcc.target/riscv/movsible-ventana.c
index c49f12fa47c..aa90d84486a 100644
--- a/gcc/testsuite/gcc.target/riscv/movsible-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsible-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsible-zicond.c b/gcc/testsuite/gcc.target/riscv/movsible-zicond.c
index bb5fe354a87..62f52605393 100644
--- a/gcc/testsuite/gcc.target/riscv/movsible-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsible-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsible.c b/gcc/testsuite/gcc.target/riscv/movsible.c
index de2fca476d4..e0e36fd0673 100644
--- a/gcc/testsuite/gcc.target/riscv/movsible.c
+++ b/gcc/testsuite/gcc.target/riscv/movsible.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibleu-thead.c b/gcc/testsuite/gcc.target/riscv/movsibleu-thead.c
index 1ddb03cf026..bb7c47071ce 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibleu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibleu-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibleu-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibleu-ventana.c
index 80968880798..f5e04d42bb2 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibleu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibleu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibleu-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibleu-zicond.c
index 2ded8259fbf..4df7e776aa5 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibleu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibleu-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibleu.c b/gcc/testsuite/gcc.target/riscv/movsibleu.c
index 1787614dbc1..cc895727d1d 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibleu.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibleu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiblt-thead.c b/gcc/testsuite/gcc.target/riscv/movsiblt-thead.c
index 1459d371668..2426386bc51 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiblt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiblt-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiblt-ventana.c b/gcc/testsuite/gcc.target/riscv/movsiblt-ventana.c
index 47b611dc21f..53ed8ad7977 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiblt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiblt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiblt-zicond.c b/gcc/testsuite/gcc.target/riscv/movsiblt-zicond.c
index 59e6b84f13f..e4f4d14a704 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiblt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiblt-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiblt.c b/gcc/testsuite/gcc.target/riscv/movsiblt.c
index 458c9f9fa69..43ac37f892d 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiblt.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiblt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibltu-thead.c b/gcc/testsuite/gcc.target/riscv/movsibltu-thead.c
index 89a0fabacaf..2d6e965630a 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibltu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibltu-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibltu-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibltu-ventana.c
index 8f45f02c087..040674d88d4 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibltu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibltu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibltu-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibltu-zicond.c
index 0abb111271d..3a90ec77acd 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibltu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibltu-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibltu.c b/gcc/testsuite/gcc.target/riscv/movsibltu.c
index 973beaa08ba..6dd2044dfaf 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibltu.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibltu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibne-thead.c b/gcc/testsuite/gcc.target/riscv/movsibne-thead.c
index a76744c1303..0e28b990349 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibne-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibne-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibne-ventana.c b/gcc/testsuite/gcc.target/riscv/movsibne-ventana.c
index cc1961ae787..cda7dd72639 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibne-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibne-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibne-zicond.c b/gcc/testsuite/gcc.target/riscv/movsibne-zicond.c
index 0bc2e26eb52..bf8f69af66c 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibne-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibne-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsibne.c b/gcc/testsuite/gcc.target/riscv/movsibne.c
index 5b3e6ee4e1a..316fe436ca8 100644
--- a/gcc/testsuite/gcc.target/riscv/movsibne.c
+++ b/gcc/testsuite/gcc.target/riscv/movsibne.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsieq-sfb.c b/gcc/testsuite/gcc.target/riscv/movsieq-sfb.c
index 8525f6a24ff..d5634a8a49c 100644
--- a/gcc/testsuite/gcc.target/riscv/movsieq-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsieq-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsieq-thead.c b/gcc/testsuite/gcc.target/riscv/movsieq-thead.c
index 35a1e91b6b7..0ae9d43d5d6 100644
--- a/gcc/testsuite/gcc.target/riscv/movsieq-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsieq-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsieq-ventana.c b/gcc/testsuite/gcc.target/riscv/movsieq-ventana.c
index 65be52f354b..4c21af2bf1e 100644
--- a/gcc/testsuite/gcc.target/riscv/movsieq-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsieq-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsieq-zicond.c b/gcc/testsuite/gcc.target/riscv/movsieq-zicond.c
index afa14c3bd5b..2ce342ca830 100644
--- a/gcc/testsuite/gcc.target/riscv/movsieq-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsieq-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsieq.c b/gcc/testsuite/gcc.target/riscv/movsieq.c
index 7d7e99d92c8..f6bff9ff276 100644
--- a/gcc/testsuite/gcc.target/riscv/movsieq.c
+++ b/gcc/testsuite/gcc.target/riscv/movsieq.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=7 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=7 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=7 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=7 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifeq-sfb.c b/gcc/testsuite/gcc.target/riscv/movsifeq-sfb.c
index 1f20bb4f45c..195a7a06c34 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifeq-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifeq-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifeq-thead.c b/gcc/testsuite/gcc.target/riscv/movsifeq-thead.c
index e2e69e00845..d49da92ae64 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifeq-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifeq-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifeq-ventana.c b/gcc/testsuite/gcc.target/riscv/movsifeq-ventana.c
index 9fb29aa5bf4..c80ca57f42c 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifeq-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifeq-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifeq-zicond.c b/gcc/testsuite/gcc.target/riscv/movsifeq-zicond.c
index d967d328d83..2a08db107e1 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifeq-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifeq-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifeq.c b/gcc/testsuite/gcc.target/riscv/movsifeq.c
index a4c0c674765..1af6fc16f16 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifeq.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifeq.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifge-sfb.c b/gcc/testsuite/gcc.target/riscv/movsifge-sfb.c
index c9f0e2dfa50..2ab47fc2eee 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifge-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifge-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifge-thead.c b/gcc/testsuite/gcc.target/riscv/movsifge-thead.c
index 893a522ac5f..0e2fbebb755 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifge-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifge-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifge-ventana.c b/gcc/testsuite/gcc.target/riscv/movsifge-ventana.c
index 26e55b6d867..4b9b8b80478 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifge-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifge-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifge-zicond.c b/gcc/testsuite/gcc.target/riscv/movsifge-zicond.c
index e38aa80bf0d..d5fd7af9c2f 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifge-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifge-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifge.c b/gcc/testsuite/gcc.target/riscv/movsifge.c
index c3f170e5f13..f358c76da6f 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifge.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifge.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifgt-sfb.c b/gcc/testsuite/gcc.target/riscv/movsifgt-sfb.c
index 47ea2c2149d..e48a1991e48 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifgt-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifgt-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifgt-thead.c b/gcc/testsuite/gcc.target/riscv/movsifgt-thead.c
index 0ec4e575f87..75c78ba149f 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifgt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifgt-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifgt-ventana.c b/gcc/testsuite/gcc.target/riscv/movsifgt-ventana.c
index 8896266e243..56d8be1132a 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifgt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifgt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifgt-zicond.c b/gcc/testsuite/gcc.target/riscv/movsifgt-zicond.c
index bada72f44d8..976e27e23b7 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifgt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifgt-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifgt.c b/gcc/testsuite/gcc.target/riscv/movsifgt.c
index 68aca07062d..bb528ff0927 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifgt.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifgt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifle-sfb.c b/gcc/testsuite/gcc.target/riscv/movsifle-sfb.c
index 7cb9167cd13..bffedfa8bfb 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifle-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifle-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifle-thead.c b/gcc/testsuite/gcc.target/riscv/movsifle-thead.c
index b05a02a44f9..71cea469b31 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifle-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifle-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifle-ventana.c b/gcc/testsuite/gcc.target/riscv/movsifle-ventana.c
index 24b49d9dffc..6ad6e57f068 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifle-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifle-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifle-zicond.c b/gcc/testsuite/gcc.target/riscv/movsifle-zicond.c
index 5aad91007ea..ac42c003069 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifle-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifle-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifle.c b/gcc/testsuite/gcc.target/riscv/movsifle.c
index 3b1b06cf089..da22f4923ca 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifle.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifle.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiflt-sfb.c b/gcc/testsuite/gcc.target/riscv/movsiflt-sfb.c
index 110e38a49e6..14f71e04d9e 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiflt-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiflt-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiflt-thead.c b/gcc/testsuite/gcc.target/riscv/movsiflt-thead.c
index 124c408718b..bc8278b53d5 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiflt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiflt-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiflt-ventana.c b/gcc/testsuite/gcc.target/riscv/movsiflt-ventana.c
index 911a5029dda..69727d0d688 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiflt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiflt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiflt-zicond.c b/gcc/testsuite/gcc.target/riscv/movsiflt-zicond.c
index 7db2b994fc5..00c04bd71d5 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiflt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiflt-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiflt.c b/gcc/testsuite/gcc.target/riscv/movsiflt.c
index a74d85978f7..6bb4cc85486 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiflt.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiflt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifne-sfb.c b/gcc/testsuite/gcc.target/riscv/movsifne-sfb.c
index e08a0e21d03..a03b6313585 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifne-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifne-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifne-thead.c b/gcc/testsuite/gcc.target/riscv/movsifne-thead.c
index 19a3950c58c..44ca8072934 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifne-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifne-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifne-ventana.c b/gcc/testsuite/gcc.target/riscv/movsifne-ventana.c
index 6c038fa2622..470614ab4fc 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifne-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifne-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifne-zicond.c b/gcc/testsuite/gcc.target/riscv/movsifne-zicond.c
index 2148f4bcf48..96e73e2829c 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifne-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifne-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsifne.c b/gcc/testsuite/gcc.target/riscv/movsifne.c
index f73f6f8c988..06cc708631d 100644
--- a/gcc/testsuite/gcc.target/riscv/movsifne.c
+++ b/gcc/testsuite/gcc.target/riscv/movsifne.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=5 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsige-sfb.c b/gcc/testsuite/gcc.target/riscv/movsige-sfb.c
index cc9f2b56f76..fb5c30bd150 100644
--- a/gcc/testsuite/gcc.target/riscv/movsige-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsige-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsige-thead.c b/gcc/testsuite/gcc.target/riscv/movsige-thead.c
index 87ce0dfb954..a6d0cec30f4 100644
--- a/gcc/testsuite/gcc.target/riscv/movsige-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsige-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsige-ventana.c b/gcc/testsuite/gcc.target/riscv/movsige-ventana.c
index 8222e10a205..c1e6f2e47ea 100644
--- a/gcc/testsuite/gcc.target/riscv/movsige-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsige-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsige-zicond.c b/gcc/testsuite/gcc.target/riscv/movsige-zicond.c
index 4a8c09d4c39..e718fbf4eb7 100644
--- a/gcc/testsuite/gcc.target/riscv/movsige-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsige-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsige.c b/gcc/testsuite/gcc.target/riscv/movsige.c
index aabd1821639..bd356a8d08b 100644
--- a/gcc/testsuite/gcc.target/riscv/movsige.c
+++ b/gcc/testsuite/gcc.target/riscv/movsige.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigeu-sfb.c b/gcc/testsuite/gcc.target/riscv/movsigeu-sfb.c
index 20bbf513625..15bc9641dfb 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigeu-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigeu-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigeu-thead.c b/gcc/testsuite/gcc.target/riscv/movsigeu-thead.c
index d2f51ad4e9c..bc45519e91f 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigeu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigeu-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigeu-ventana.c b/gcc/testsuite/gcc.target/riscv/movsigeu-ventana.c
index 448b8076460..d129160a3a0 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigeu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigeu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigeu-zicond.c b/gcc/testsuite/gcc.target/riscv/movsigeu-zicond.c
index 6c2ba09e203..6c2f1c538f1 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigeu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigeu-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigeu.c b/gcc/testsuite/gcc.target/riscv/movsigeu.c
index 2828e394757..f78c8c5ee88 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigeu.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigeu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigt-sfb.c b/gcc/testsuite/gcc.target/riscv/movsigt-sfb.c
index c494292b61a..bc8604f9b43 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigt-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigt-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigt-thead.c b/gcc/testsuite/gcc.target/riscv/movsigt-thead.c
index e99b79fb48d..5f4b2241755 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigt-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigt-ventana.c b/gcc/testsuite/gcc.target/riscv/movsigt-ventana.c
index 750366d2262..2f996537e3b 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigt-zicond.c b/gcc/testsuite/gcc.target/riscv/movsigt-zicond.c
index a117bc872af..c869a82773b 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigt-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigt.c b/gcc/testsuite/gcc.target/riscv/movsigt.c
index 5f4af28c54e..c53288f88d9 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigt.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigtu-sfb.c b/gcc/testsuite/gcc.target/riscv/movsigtu-sfb.c
index bfe4a5b29c5..c5baed414a0 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigtu-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigtu-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigtu-thead.c b/gcc/testsuite/gcc.target/riscv/movsigtu-thead.c
index 33770e64a60..bfd6a120349 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigtu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigtu-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigtu-ventana.c b/gcc/testsuite/gcc.target/riscv/movsigtu-ventana.c
index 73a8c539f36..45487425adb 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigtu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigtu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigtu-zicond.c b/gcc/testsuite/gcc.target/riscv/movsigtu-zicond.c
index a42578dd77a..1fb3164c151 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigtu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigtu-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsigtu.c b/gcc/testsuite/gcc.target/riscv/movsigtu.c
index 24ee2c9c873..b1f29c20c36 100644
--- a/gcc/testsuite/gcc.target/riscv/movsigtu.c
+++ b/gcc/testsuite/gcc.target/riscv/movsigtu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsile-sfb.c b/gcc/testsuite/gcc.target/riscv/movsile-sfb.c
index 82a699578f9..6ab84af051e 100644
--- a/gcc/testsuite/gcc.target/riscv/movsile-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsile-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsile-thead.c b/gcc/testsuite/gcc.target/riscv/movsile-thead.c
index 6e724a5ff15..1d97ec2f739 100644
--- a/gcc/testsuite/gcc.target/riscv/movsile-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsile-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsile-ventana.c b/gcc/testsuite/gcc.target/riscv/movsile-ventana.c
index 96bbe92ba94..3136c29a585 100644
--- a/gcc/testsuite/gcc.target/riscv/movsile-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsile-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsile-zicond.c b/gcc/testsuite/gcc.target/riscv/movsile-zicond.c
index 33f9ebddf0d..e7098ebd389 100644
--- a/gcc/testsuite/gcc.target/riscv/movsile-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsile-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsile.c b/gcc/testsuite/gcc.target/riscv/movsile.c
index 8e9fe6a8639..24f2354314a 100644
--- a/gcc/testsuite/gcc.target/riscv/movsile.c
+++ b/gcc/testsuite/gcc.target/riscv/movsile.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsileu-sfb.c b/gcc/testsuite/gcc.target/riscv/movsileu-sfb.c
index e8b7c45dd07..2d957cb52f4 100644
--- a/gcc/testsuite/gcc.target/riscv/movsileu-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsileu-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsileu-thead.c b/gcc/testsuite/gcc.target/riscv/movsileu-thead.c
index fb727536cfc..ca25e8ff5f6 100644
--- a/gcc/testsuite/gcc.target/riscv/movsileu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsileu-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsileu-ventana.c b/gcc/testsuite/gcc.target/riscv/movsileu-ventana.c
index ff64c38fe22..144cb520ba3 100644
--- a/gcc/testsuite/gcc.target/riscv/movsileu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsileu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsileu-zicond.c b/gcc/testsuite/gcc.target/riscv/movsileu-zicond.c
index 29e4fc47352..84106b357b5 100644
--- a/gcc/testsuite/gcc.target/riscv/movsileu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsileu-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsileu.c b/gcc/testsuite/gcc.target/riscv/movsileu.c
index a0b733e4711..e967aca1c09 100644
--- a/gcc/testsuite/gcc.target/riscv/movsileu.c
+++ b/gcc/testsuite/gcc.target/riscv/movsileu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsilt-sfb.c b/gcc/testsuite/gcc.target/riscv/movsilt-sfb.c
index 822c7785808..e4e3f5418bc 100644
--- a/gcc/testsuite/gcc.target/riscv/movsilt-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsilt-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsilt-thead.c b/gcc/testsuite/gcc.target/riscv/movsilt-thead.c
index ca957b96888..8959ba25d04 100644
--- a/gcc/testsuite/gcc.target/riscv/movsilt-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsilt-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsilt-ventana.c b/gcc/testsuite/gcc.target/riscv/movsilt-ventana.c
index 63df59025c4..307380337d9 100644
--- a/gcc/testsuite/gcc.target/riscv/movsilt-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsilt-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsilt-zicond.c b/gcc/testsuite/gcc.target/riscv/movsilt-zicond.c
index 11ce70fb022..3d48b291d9b 100644
--- a/gcc/testsuite/gcc.target/riscv/movsilt-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsilt-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsilt.c b/gcc/testsuite/gcc.target/riscv/movsilt.c
index 109f67ede97..308c4c6f02d 100644
--- a/gcc/testsuite/gcc.target/riscv/movsilt.c
+++ b/gcc/testsuite/gcc.target/riscv/movsilt.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiltu-sfb.c b/gcc/testsuite/gcc.target/riscv/movsiltu-sfb.c
index 5fd441c366d..8859b219966 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiltu-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiltu-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiltu-thead.c b/gcc/testsuite/gcc.target/riscv/movsiltu-thead.c
index 680f673675b..fa88263bc8c 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiltu-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiltu-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiltu-ventana.c b/gcc/testsuite/gcc.target/riscv/movsiltu-ventana.c
index 05ee813bc7f..6478ed4e191 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiltu-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiltu-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiltu-zicond.c b/gcc/testsuite/gcc.target/riscv/movsiltu-zicond.c
index 79e78509666..23f2a66b3a7 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiltu-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiltu-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=4 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsiltu.c b/gcc/testsuite/gcc.target/riscv/movsiltu.c
index a7d4caf346b..38e7d8c0fed 100644
--- a/gcc/testsuite/gcc.target/riscv/movsiltu.c
+++ b/gcc/testsuite/gcc.target/riscv/movsiltu.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsine-sfb.c b/gcc/testsuite/gcc.target/riscv/movsine-sfb.c
index f7ac7c243c7..83e313a032d 100644
--- a/gcc/testsuite/gcc.target/riscv/movsine-sfb.c
+++ b/gcc/testsuite/gcc.target/riscv/movsine-sfb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-7-series -mbranch-cost=1 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsine-thead.c b/gcc/testsuite/gcc.target/riscv/movsine-thead.c
index fc0d1e712cf..0177ba1bff7 100644
--- a/gcc/testsuite/gcc.target/riscv/movsine-thead.c
+++ b/gcc/testsuite/gcc.target/riscv/movsine-thead.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadcondmov -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d -mtune=thead-c906 -mbranch-cost=2 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsine-ventana.c b/gcc/testsuite/gcc.target/riscv/movsine-ventana.c
index c9a2538e894..c4d8053e87e 100644
--- a/gcc/testsuite/gcc.target/riscv/movsine-ventana.c
+++ b/gcc/testsuite/gcc.target/riscv/movsine-ventana.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xventanacondops -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
+/* { dg-options "-march=rv64gc_xventanacondops -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsine-zicond.c b/gcc/testsuite/gcc.target/riscv/movsine-zicond.c
index 326c32cecb9..4e57c8fbcf3 100644
--- a/gcc/testsuite/gcc.target/riscv/movsine-zicond.c
+++ b/gcc/testsuite/gcc.target/riscv/movsine-zicond.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zicond -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zicond -mabi=lp64d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zicond -mabi=ilp32d -mtune=rocket -mbranch-cost=3 -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/movsine.c b/gcc/testsuite/gcc.target/riscv/movsine.c
index 60dee0833cd..8fd587fb246 100644
--- a/gcc/testsuite/gcc.target/riscv/movsine.c
+++ b/gcc/testsuite/gcc.target/riscv/movsine.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d -mtune=sifive-5-series -mbranch-cost=6 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/pr111501.c b/gcc/testsuite/gcc.target/riscv/pr111501.c
index db48c34ce9a..bf94a2bb17d 100644
--- a/gcc/testsuite/gcc.target/riscv/pr111501.c
+++ b/gcc/testsuite/gcc.target/riscv/pr111501.c
@@ -2,3 +2,3 @@ 
 /* { dg-require-effective-target rv64 } */
-/* { dg-options "-march=rv64gc" { target { rv64 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } {"-O0" "-Os" "-Og" "-Oz" "-flto" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/pr115921.c b/gcc/testsuite/gcc.target/riscv/pr115921.c
index e508e7ce790..5eea093f44a 100644
--- a/gcc/testsuite/gcc.target/riscv/pr115921.c
+++ b/gcc/testsuite/gcc.target/riscv/pr115921.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zba" { target { rv64 } } }  */
-/* { dg-options "-O2 -march=rv32gc_zba" { target { rv32 } } }  */
+/* { dg-options "-O2 -march=rv64gc_zba -mabi=lp64d" { target { rv64 } } }  */
+/* { dg-options "-O2 -march=rv32gc_zba -mabi=ilp32d" { target { rv32 } } }  */
 
diff --git a/gcc/testsuite/gcc.target/riscv/pr116033.c b/gcc/testsuite/gcc.target/riscv/pr116033.c
index 881922da026..c0c59682d23 100644
--- a/gcc/testsuite/gcc.target/riscv/pr116033.c
+++ b/gcc/testsuite/gcc.target/riscv/pr116033.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gv_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gv_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gv_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gv_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/pr116035-1.c b/gcc/testsuite/gcc.target/riscv/pr116035-1.c
index bc45941ff8f..b1835dbc52e 100644
--- a/gcc/testsuite/gcc.target/riscv/pr116035-1.c
+++ b/gcc/testsuite/gcc.target/riscv/pr116035-1.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64g_zba_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32g_zba_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64g_zba_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32g_zba_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/pr116035-2.c b/gcc/testsuite/gcc.target/riscv/pr116035-2.c
index 2c1a9694860..4ee3439ee17 100644
--- a/gcc/testsuite/gcc.target/riscv/pr116035-2.c
+++ b/gcc/testsuite/gcc.target/riscv/pr116035-2.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64g_xtheadbb_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32g_xtheadbb_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64g_xtheadbb_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32g_xtheadbb_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/pr116131.c b/gcc/testsuite/gcc.target/riscv/pr116131.c
index 4d644c37cde..abfbe3785e5 100644
--- a/gcc/testsuite/gcc.target/riscv/pr116131.c
+++ b/gcc/testsuite/gcc.target/riscv/pr116131.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-flto" "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/reg_subreg_costs.c b/gcc/testsuite/gcc.target/riscv/reg_subreg_costs.c
index 874dff3a688..39f9f4cb984 100644
--- a/gcc/testsuite/gcc.target/riscv/reg_subreg_costs.c
+++ b/gcc/testsuite/gcc.target/riscv/reg_subreg_costs.c
@@ -3,3 +3,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_zba" } */
+/* { dg-options "-march=rv64gc_zba -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector.c b/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector.c
index 8ad370172e3..2cffa2b98d2 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadvector" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadvector" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadvector -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadvector -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194.c b/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194.c
index fc2d1349425..887dabd681b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadvector" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadvector" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadvector -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadvector -mabi=lp64d" { target { rv64 } } } */
 /* { dg-final { check-function-bodies "**" "" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/sign-extend-rshift-32.c b/gcc/testsuite/gcc.target/riscv/sign-extend-rshift-32.c
index 895dd18c8f6..4d781a83d49 100644
--- a/gcc/testsuite/gcc.target/riscv/sign-extend-rshift-32.c
+++ b/gcc/testsuite/gcc.target/riscv/sign-extend-rshift-32.c
@@ -2,3 +2,3 @@ 
 /* { dg-require-effective-target rv32 } */
-/* { dg-options "-march=rv32gc" } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d" } */
 /* { dg-skip-if "" { *-*-* } {"-O0" "-Os" "-Og" "-Oz" "-flto" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/sign-extend-rshift-64.c b/gcc/testsuite/gcc.target/riscv/sign-extend-rshift-64.c
index 13d18f73eab..37e2716b717 100644
--- a/gcc/testsuite/gcc.target/riscv/sign-extend-rshift-64.c
+++ b/gcc/testsuite/gcc.target/riscv/sign-extend-rshift-64.c
@@ -2,3 +2,3 @@ 
 /* { dg-require-effective-target rv64 } */
-/* { dg-options "-march=rv64gc" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" } */
 /* { dg-skip-if "" { *-*-* } {"-O0" "-Os" "-Og" "-Oz" "-flto" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/sign-extend-rshift.c b/gcc/testsuite/gcc.target/riscv/sign-extend-rshift.c
index 90a44eadb59..44db56d05b9 100644
--- a/gcc/testsuite/gcc.target/riscv/sign-extend-rshift.c
+++ b/gcc/testsuite/gcc.target/riscv/sign-extend-rshift.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } {"-O0" "-O1" "-Os" "-Og" "-Oz" "-flto" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-1.c b/gcc/testsuite/gcc.target/riscv/synthesis-1.c
index c50abb08330..8fd6579050f 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-1.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-1.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gcb" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-10.c b/gcc/testsuite/gcc.target/riscv/synthesis-10.c
index 0838ec9af47..52bd8527343 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-10.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-10.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbkb_zbs" } */
+/* { dg-options "-march=rv64gc_zba_zbb_zbkb_zbs -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-11.c b/gcc/testsuite/gcc.target/riscv/synthesis-11.c
index 89e48edb2d1..4a7bbb919da 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-11.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-11.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-12.c b/gcc/testsuite/gcc.target/riscv/synthesis-12.c
index bf2f89042a0..57b281a1222 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-12.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-12.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-13.c b/gcc/testsuite/gcc.target/riscv/synthesis-13.c
index 80412f29f89..1db85a21713 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-13.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-13.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba" } */
+/* { dg-options "-march=rv64gc_zba -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-14.c b/gcc/testsuite/gcc.target/riscv/synthesis-14.c
index bd4e4afa55a..1b5a89ed762 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-14.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-14.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-15.c b/gcc/testsuite/gcc.target/riscv/synthesis-15.c
index dc1f8b70194..12739ae9168 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-15.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-15.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-16.c b/gcc/testsuite/gcc.target/riscv/synthesis-16.c
index 352c48ec037..61645ec46d7 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-16.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-16.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-2.c b/gcc/testsuite/gcc.target/riscv/synthesis-2.c
index 82383408f77..4295965f5a2 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-2.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-2.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gcb" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-3.c b/gcc/testsuite/gcc.target/riscv/synthesis-3.c
index 88ef0e81203..b660e8c943e 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-3.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-3.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gcb" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-4.c b/gcc/testsuite/gcc.target/riscv/synthesis-4.c
index 54d25e2681f..4e887161ae7 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-4.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-4.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gcb" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-5.c b/gcc/testsuite/gcc.target/riscv/synthesis-5.c
index 4ed07e4def5..870e8ab3ef5 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-5.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-5.c
@@ -8,3 +8,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gcb" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-6.c b/gcc/testsuite/gcc.target/riscv/synthesis-6.c
index 2304855fbd1..b501f834a97 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-6.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-6.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gcb" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-7.c b/gcc/testsuite/gcc.target/riscv/synthesis-7.c
index c71c3cd408a..b00f2e5da65 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-7.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-7.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gcb" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-8.c b/gcc/testsuite/gcc.target/riscv/synthesis-8.c
index 72fd7113321..871ddd81d8b 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-8.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-8.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gcb" } */
+/* { dg-options "-march=rv64gcb -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/synthesis-9.c b/gcc/testsuite/gcc.target/riscv/synthesis-9.c
index cc622188abc..d68ebf6e32a 100644
--- a/gcc/testsuite/gcc.target/riscv/synthesis-9.c
+++ b/gcc/testsuite/gcc.target/riscv/synthesis-9.c
@@ -7,3 +7,3 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O2" "-O3" "-Os" "-Oz" "-flto" } } */
-/* { dg-options "-march=rv64gc_zba_zbb_zbkb_zbs" } */
+/* { dg-options "-march=rv64gc_zba_zbb_zbkb_zbs -mabi=lp64d" } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/target-attr-16.c b/gcc/testsuite/gcc.target/riscv/target-attr-16.c
index f997ae8a9d1..7a1de04bc07 100644
--- a/gcc/testsuite/gcc.target/riscv/target-attr-16.c
+++ b/gcc/testsuite/gcc.target/riscv/target-attr-16.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_zba" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_zba" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zba -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zba -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/target-attr-norelax.c b/gcc/testsuite/gcc.target/riscv/target-attr-norelax.c
index 01663b56864..99f7b7bf25d 100644
--- a/gcc/testsuite/gcc.target/riscv/target-attr-norelax.c
+++ b/gcc/testsuite/gcc.target/riscv/target-attr-norelax.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-flto" } { "" } } */
-/* { dg-options "-march=rv32gc" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadba-addsl.c b/gcc/testsuite/gcc.target/riscv/xtheadba-addsl.c
index 5004735a246..3d827bf2916 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadba-addsl.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadba-addsl.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadba" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadba" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadba -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadba -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadba.c b/gcc/testsuite/gcc.target/riscv/xtheadba.c
index 64ad5601188..7f7d257db39 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadba.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadba.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadba" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadba" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadba -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadba -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-1.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-1.c
index 04b82321045..0b0683a6647 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-1.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-1.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c
index 4645b9c56df..9ddb85ac539 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c
index 2c9ebbc563a..c55a2eb05bb 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-ext.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext.c
index 121d9697d71..6bc5a19f080 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-ext.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-1.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-1.c
index b92445c5132..faee3f47e56 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-1.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-1.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-2.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-2.c
index 029be93f401..f7b8998cc92 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-2.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-2.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-4.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-4.c
index 803bbe7da60..cdc0c6401a5 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-4.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-extu-4.c
@@ -1,3 +1,3 @@ 
 /* { dg-do compile { target { rv32 } } } */
-/* { dg-options "-march=rv32gc_xtheadbb" } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-extu.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-extu.c
index fca9b7e438a..7ca2d52490f 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-extu.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-extu.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-ff1.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-ff1.c
index 72038c4e281..2c9f45a0d85 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-ff1.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-ff1.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-rev.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-rev.c
index 411d52007d2..f0f71dd3675 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-rev.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-rev.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-srri.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-srri.c
index 973ed175f17..1d5440a8795 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-srri.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-srri.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-strcmp.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-strcmp.c
index 6b88912d828..f1ee85d523c 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-strcmp.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-strcmp.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-minline-strcmp -minline-strncmp -march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-minline-strcmp -minline-strncmp -march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-minline-strcmp -minline-strncmp -march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-minline-strcmp -minline-strncmp -march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-strlen-unaligned.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-strlen-unaligned.c
index 57a6b5ea66a..fe146d71fee 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-strlen-unaligned.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-strlen-unaligned.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-minline-strlen -march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-minline-strlen -march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-minline-strlen -march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-minline-strlen -march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-strlen.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-strlen.c
index f243b6f1f4f..ef1086ffeb3 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb-strlen.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-strlen.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-minline-strlen -march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-minline-strlen -march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-minline-strlen -march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-minline-strlen -march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb.c b/gcc/testsuite/gcc.target/riscv/xtheadbb.c
index 803111b03fb..fe0de41a2af 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbs-tst.c b/gcc/testsuite/gcc.target/riscv/xtheadbs-tst.c
index f56d9ad344c..ec540259d58 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbs-tst.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbs-tst.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadbs" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadbs" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbs -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbs -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbs.c b/gcc/testsuite/gcc.target/riscv/xtheadbs.c
index ad9fba52597..10b7a3ff258 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbs.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbs.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadbs" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadbs" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbs -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbs -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcmo.c b/gcc/testsuite/gcc.target/riscv/xtheadcmo.c
index fc13754fe52..5e1381f2d14 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcmo.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcmo.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcmo" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcmo" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcmo -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcmo -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-indirect.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-indirect.c
index 427c9c1a41e..b25cbc78a5d 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-indirect.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-indirect.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcondmov" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } {"-O0" "-Os" "-Og" "-Oz" "-flto" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-eqz.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-eqz.c
index 9cc9ec1d0c7..636de728933 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-eqz.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-eqz.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcondmov" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-not.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-not.c
index 491343370b7..7f78f6ba28f 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-not.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-imm-not.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcondmov" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-eqz.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-eqz.c
index d7227249e84..53310bb0900 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-eqz.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-eqz.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcondmov" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-not.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-not.c
index 6cc98e36e71..bcf9be92b46 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-not.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mveqz-reg-not.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcondmov" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-cond.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-cond.c
index 7cce2c71d18..8f86b0c3f2b 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-cond.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-cond.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcondmov" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-nez.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-nez.c
index 51b90bbc9a9..e566cde0f23 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-nez.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-imm-nez.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcondmov" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-cond.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-cond.c
index d9bde61cd2b..deb38b40183 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-cond.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-cond.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcondmov" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-nez.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-nez.c
index c12501a752c..df3bf9ed8fd 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-nez.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov-mvnez-reg-nez.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcondmov" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov.c
index ad8a777ab2c..dc0850f70da 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadcondmov" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadcondmov -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadcondmov -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-without-xtheadmemidx.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-without-xtheadmemidx.c
index c5502390cca..efcba107c55 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-without-xtheadmemidx.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-without-xtheadmemidx.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadfmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadfmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadfmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadfmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c
index 1617d947594..12fc1074794 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadfmemidx" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadfmemidx" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadfmemidx -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadfmemidx -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmv.c b/gcc/testsuite/gcc.target/riscv/xtheadfmv.c
index f0558d95cb9..1cdb8578f14 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadfmv.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadfmv.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadfmv" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadfmv" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadfmv -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadfmv -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadint.c b/gcc/testsuite/gcc.target/riscv/xtheadint.c
index c9f45d57742..eae65fd3a1c 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadint.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadint.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadint" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadint" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadint -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadint -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmac-mula-muls.c b/gcc/testsuite/gcc.target/riscv/xtheadmac-mula-muls.c
index 751a4be5091..41fffbeea6a 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmac-mula-muls.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmac-mula-muls.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadmac" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadmac" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmac -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmac -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmac.c b/gcc/testsuite/gcc.target/riscv/xtheadmac.c
index aeb3cb03441..57aafae7064 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmac.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmac.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadmac" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadmac" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmac -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmac -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-update.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-update.c
index 5bbf668597c..01b8a5804f0 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-update.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-update.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-xtheadbb-update.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-xtheadbb-update.c
index cfa1d2e02a5..cc261b755ac 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-xtheadbb-update.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-xtheadbb-update.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadbb_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-xtheadbb.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-xtheadbb.c
index 7988fdf5d65..e05c16132c3 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-xtheadbb.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index-xtheadbb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadbb_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index.c
index 92bb0844958..2474cf6f454 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-index.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify-xtheadbb.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify-xtheadbb.c
index 8430b8daadf..e1b848d7379 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify-xtheadbb.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify-xtheadbb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadbb_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify.c
index 0bcd78d8915..1ab72b504ee 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-modify.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-update.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-update.c
index d3fd069459b..713a0427baa 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-update.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-update.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" "-Os" "-Oz" } } */
-/* { dg-options "-march=rv64gc_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-xtheadbb-update.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-xtheadbb-update.c
index ee0486a526e..97b7a6e8c62 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-xtheadbb-update.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-xtheadbb-update.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadbb_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-xtheadbb.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-xtheadbb.c
index ccabe99ae60..2972c4b6e7f 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-xtheadbb.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex-xtheadbb.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadbb_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadbb_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex.c
index 369ffb23ea4..389c49d0fce 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx-uindex.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
-/* { dg-options "-march=rv64gc_xtheadmemidx" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmemidx" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx.c
index a4716acc040..6b8b3e3ac5a 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadmemidx" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadmemidx" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmemidx -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmemidx -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmempair-1.c b/gcc/testsuite/gcc.target/riscv/xtheadmempair-1.c
index 34a29ab9c04..cc97e94fe90 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmempair-1.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmempair-1.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-g" "-Oz" "-Os" "-flto" } } */
-/* { dg-options "-march=rv64gc_xtheadmempair -mtune=thead-c906" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmempair -mtune=thead-c906" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmempair -mabi=lp64d -mtune=thead-c906" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmempair -mabi=ilp32d -mtune=thead-c906" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmempair-2.c b/gcc/testsuite/gcc.target/riscv/xtheadmempair-2.c
index ed639709196..894577a54b1 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmempair-2.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmempair-2.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-g" "-Oz" "-Os" "-flto" } } */
-/* { dg-options "-march=rv64gc_xtheadmempair -mtune=thead-c906" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmempair -mtune=thead-c906" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmempair -mabi=lp64d -mtune=thead-c906" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmempair -mabi=ilp32d -mtune=thead-c906" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmempair-3.c b/gcc/testsuite/gcc.target/riscv/xtheadmempair-3.c
index 99a6ae7f4d7..d0487283ee0 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmempair-3.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmempair-3.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-g" "-Oz" "-Os" "-flto" } } */
-/* { dg-options "-march=rv64gc_xtheadmempair -mtune=thead-c906" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmempair -mtune=thead-c906" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmempair -mabi=lp64d -mtune=thead-c906" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmempair -mabi=ilp32d -mtune=thead-c906" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c b/gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c
index 9aef4e15f8d..95a5ee539cf 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c
@@ -2,4 +2,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-g" "-Oz" "-Os" "-flto" } } */
-/* { dg-options "-march=rv64gc_xtheadmempair -mtune=thead-c906 -funwind-tables" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmempair -mtune=thead-c906 -funwind-tables" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmempair -mabi=lp64d -mtune=thead-c906 -funwind-tables" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmempair -mabi=ilp32d -mtune=thead-c906 -funwind-tables" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmempair-interrupt-fcsr.c b/gcc/testsuite/gcc.target/riscv/xtheadmempair-interrupt-fcsr.c
index d06f05f5c7c..b27562d1211 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmempair-interrupt-fcsr.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmempair-interrupt-fcsr.c
@@ -4,4 +4,4 @@ 
 /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-g" "-Oz" "-Os" "-flto" } } */
-/* { dg-options "-march=rv64gc_xtheadmempair -mtune=thead-c906 -funwind-tables" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_xtheadmempair -mtune=thead-c906 -funwind-tables" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmempair -mabi=lp64d -mtune=thead-c906 -funwind-tables" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmempair -mabi=ilp32d -mtune=thead-c906 -funwind-tables" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmempair.c b/gcc/testsuite/gcc.target/riscv/xtheadmempair.c
index de88d63ed5b..80ed18906c7 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmempair.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmempair.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadmempair" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadmempair" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadmempair -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmempair -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadsync.c b/gcc/testsuite/gcc.target/riscv/xtheadsync.c
index ddda51545f1..4501a882291 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadsync.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadsync.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_xtheadsync" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_xtheadsync" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_xtheadsync -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadsync -mabi=lp64d" { target { rv64 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/za-ext.c b/gcc/testsuite/gcc.target/riscv/za-ext.c
index 126da2fcadd..8b90741348d 100644
--- a/gcc/testsuite/gcc.target/riscv/za-ext.c
+++ b/gcc/testsuite/gcc.target/riscv/za-ext.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_za64rs_za128rs" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_za64rs_za128rs" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_za64rs_za128rs -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_za64rs_za128rs -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zawrs.c b/gcc/testsuite/gcc.target/riscv/zawrs.c
index d61a17b7a48..994ac7c2a30 100644
--- a/gcc/testsuite/gcc.target/riscv/zawrs.c
+++ b/gcc/testsuite/gcc.target/riscv/zawrs.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zawrs" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zawrs" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zawrs -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zawrs -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled-2.c b/gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled-2.c
index f0b3cd542e0..5710e946495 100644
--- a/gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled-2.c
+++ b/gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled-2.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled.c b/gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled.c
index 68497d53280..8c9c6b7e759 100644
--- a/gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled.c
+++ b/gcc/testsuite/gcc.target/riscv/zbb-strcmp-disabled.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-mno-inline-strcmp -mno-inline-strncmp -march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-mno-inline-strcmp -mno-inline-strncmp -march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-mno-inline-strcmp -mno-inline-strncmp -march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-mno-inline-strcmp -mno-inline-strncmp -march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbb-strcmp-limit.c b/gcc/testsuite/gcc.target/riscv/zbb-strcmp-limit.c
index 6bcbd70b542..5dd92925647 100644
--- a/gcc/testsuite/gcc.target/riscv/zbb-strcmp-limit.c
+++ b/gcc/testsuite/gcc.target/riscv/zbb-strcmp-limit.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-minline-strcmp -minline-strncmp --param=riscv-strcmp-inline-limit=32 -march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-minline-strcmp -minline-strncmp --param=riscv-strcmp-inline-limit=32 -march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-minline-strcmp -minline-strncmp --param=riscv-strcmp-inline-limit=32 -march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-minline-strcmp -minline-strncmp --param=riscv-strcmp-inline-limit=32 -march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbb-strcmp-unaligned.c b/gcc/testsuite/gcc.target/riscv/zbb-strcmp-unaligned.c
index 191187643c1..e82daf9ae4b 100644
--- a/gcc/testsuite/gcc.target/riscv/zbb-strcmp-unaligned.c
+++ b/gcc/testsuite/gcc.target/riscv/zbb-strcmp-unaligned.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-minline-strcmp -minline-strncmp -march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-minline-strcmp -minline-strncmp -march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-minline-strcmp -minline-strncmp -march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-minline-strcmp -minline-strncmp -march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbb-strcmp.c b/gcc/testsuite/gcc.target/riscv/zbb-strcmp.c
index f64aa34a162..19803979d64 100644
--- a/gcc/testsuite/gcc.target/riscv/zbb-strcmp.c
+++ b/gcc/testsuite/gcc.target/riscv/zbb-strcmp.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-minline-strcmp -minline-strncmp -march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-minline-strcmp -minline-strncmp -march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-minline-strcmp -minline-strncmp -march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-minline-strcmp -minline-strncmp -march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled-2.c b/gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled-2.c
index 1295aeb0086..3192326fd20 100644
--- a/gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled-2.c
+++ b/gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled-2.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-mno-inline-strlen -march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-mno-inline-strlen -march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-mno-inline-strlen -march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-mno-inline-strlen -march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled.c b/gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled.c
index 1295aeb0086..3192326fd20 100644
--- a/gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled.c
+++ b/gcc/testsuite/gcc.target/riscv/zbb-strlen-disabled.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-mno-inline-strlen -march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-mno-inline-strlen -march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-mno-inline-strlen -march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-mno-inline-strlen -march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbb-strlen-unaligned.c b/gcc/testsuite/gcc.target/riscv/zbb-strlen-unaligned.c
index 326fef885d8..8d81060d251 100644
--- a/gcc/testsuite/gcc.target/riscv/zbb-strlen-unaligned.c
+++ b/gcc/testsuite/gcc.target/riscv/zbb-strlen-unaligned.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-minline-strlen -march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-minline-strlen -march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-minline-strlen -march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-minline-strlen -march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbb-strlen.c b/gcc/testsuite/gcc.target/riscv/zbb-strlen.c
index 267ee414a44..1ded442a1a8 100644
--- a/gcc/testsuite/gcc.target/riscv/zbb-strlen.c
+++ b/gcc/testsuite/gcc.target/riscv/zbb-strlen.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-minline-strlen -march=rv32gc_zbb" { target { rv32 } } } */
-/* { dg-options "-minline-strlen -march=rv64gc_zbb" { target { rv64 } } } */
+/* { dg-options "-minline-strlen -march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-minline-strlen -march=rv64gc_zbb -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zero-extend-rshift-32.c b/gcc/testsuite/gcc.target/riscv/zero-extend-rshift-32.c
index c995a6e0dfa..ad49a04ad4a 100644
--- a/gcc/testsuite/gcc.target/riscv/zero-extend-rshift-32.c
+++ b/gcc/testsuite/gcc.target/riscv/zero-extend-rshift-32.c
@@ -2,3 +2,3 @@ 
 /* { dg-require-effective-target rv32 } */
-/* { dg-options "-march=rv32gc" } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d" } */
 /* { dg-skip-if "" { *-*-* } {"-O0" "-Os" "-Og" "-Oz" "-flto" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zero-extend-rshift-64.c b/gcc/testsuite/gcc.target/riscv/zero-extend-rshift-64.c
index 847fadf660f..5e52c07dd24 100644
--- a/gcc/testsuite/gcc.target/riscv/zero-extend-rshift-64.c
+++ b/gcc/testsuite/gcc.target/riscv/zero-extend-rshift-64.c
@@ -2,3 +2,3 @@ 
 /* { dg-require-effective-target rv64 } */
-/* { dg-options "-march=rv64gc" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" } */
 /* { dg-skip-if "" { *-*-* } {"-O0" "-Os" "-Og" "-Oz" "-flto" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zero-extend-rshift.c b/gcc/testsuite/gcc.target/riscv/zero-extend-rshift.c
index 8b27b0eb9ba..bc19582cab1 100644
--- a/gcc/testsuite/gcc.target/riscv/zero-extend-rshift.c
+++ b/gcc/testsuite/gcc.target/riscv/zero-extend-rshift.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc" { target { rv32 } } } */
-/* { dg-options "-march=rv64gc" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc -mabi=ilp32d" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc -mabi=lp64d" { target { rv64 } } } */
 /* { dg-skip-if "" { *-*-* } {"-O0" "-Os" "-Og" "-Oz" "-flto" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zi-ext.c b/gcc/testsuite/gcc.target/riscv/zi-ext.c
index 65a7acb32af..9d4dbfc7ea3 100644
--- a/gcc/testsuite/gcc.target/riscv/zi-ext.c
+++ b/gcc/testsuite/gcc.target/riscv/zi-ext.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zic64b_ziccamoa_ziccif_zicclsm_ziccrse" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zic64b_ziccamoa_ziccif_zicclsm_ziccrse" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zic64b_ziccamoa_ziccif_zicclsm_ziccrse -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zic64b_ziccamoa_ziccif_zicclsm_ziccrse -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvbb.c b/gcc/testsuite/gcc.target/riscv/zvbb.c
index 0b78fe4dc62..1f693b4ed4e 100644
--- a/gcc/testsuite/gcc.target/riscv/zvbb.c
+++ b/gcc/testsuite/gcc.target/riscv/zvbb.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvbb" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvbb" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvbb -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvbb -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvbc.c b/gcc/testsuite/gcc.target/riscv/zvbc.c
index 2a00c965f32..4627d93169d 100644
--- a/gcc/testsuite/gcc.target/riscv/zvbc.c
+++ b/gcc/testsuite/gcc.target/riscv/zvbc.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvbc" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvbc" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvbc -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvbc -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvkb.c b/gcc/testsuite/gcc.target/riscv/zvkb.c
index d5c28e79ef6..f9911a33f0a 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkb.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkb.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkb" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkb" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkb -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkb -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvkg.c b/gcc/testsuite/gcc.target/riscv/zvkg.c
index fe0a841e745..25a2452df8d 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkg.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkg.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkg" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkg" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkg -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkg -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvkn-1.c b/gcc/testsuite/gcc.target/riscv/zvkn-1.c
index 069a8f66c92..88637447bd3 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkn-1.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkn-1.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvkb_zvkt" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvkb_zvkt" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvkb_zvkt -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvkb_zvkt -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvkn.c b/gcc/testsuite/gcc.target/riscv/zvkn.c
index bcecbcc7e77..c30b07b699c 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkn.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkn.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkn" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkn" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkn -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkn -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvknc-1.c b/gcc/testsuite/gcc.target/riscv/zvknc-1.c
index 64cae2bfe83..13cfa54e707 100644
--- a/gcc/testsuite/gcc.target/riscv/zvknc-1.c
+++ b/gcc/testsuite/gcc.target/riscv/zvknc-1.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvkb_zvkt_zvbc" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvkb_zvkt_zvbc" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvkb_zvkt_zvbc -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvkb_zvkt_zvbc -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvknc-2.c b/gcc/testsuite/gcc.target/riscv/zvknc-2.c
index 1f8b510bfd1..8217889513f 100644
--- a/gcc/testsuite/gcc.target/riscv/zvknc-2.c
+++ b/gcc/testsuite/gcc.target/riscv/zvknc-2.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkn_zvbc" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkn_zvbc" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkn_zvbc -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkn_zvbc -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvknc.c b/gcc/testsuite/gcc.target/riscv/zvknc.c
index 64dda5fdf1f..83df3c31a5a 100644
--- a/gcc/testsuite/gcc.target/riscv/zvknc.c
+++ b/gcc/testsuite/gcc.target/riscv/zvknc.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvknc" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvknc" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvknc -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvknc -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvkned.c b/gcc/testsuite/gcc.target/riscv/zvkned.c
index 8f9f2532f3d..e0066593cfb 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkned.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkned.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkned" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkned" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkned -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkned -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvkng-1.c b/gcc/testsuite/gcc.target/riscv/zvkng-1.c
index 5419585f4de..6685ced6b12 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkng-1.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkng-1.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvkb_zvkt_zvkg" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvkb_zvkt_zvkg" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvkb_zvkt_zvkg -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvkb_zvkt_zvkg -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvkng-2.c b/gcc/testsuite/gcc.target/riscv/zvkng-2.c
index 6c7b239e831..c15c77568d2 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkng-2.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkng-2.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkn_zvkg" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkn_zvkg" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkn_zvkg -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkn_zvkg -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvkng.c b/gcc/testsuite/gcc.target/riscv/zvkng.c
index 6c516a4ae13..89e7a5f9c03 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkng.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkng.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkng" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkng" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkng -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkng -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvknha.c b/gcc/testsuite/gcc.target/riscv/zvknha.c
index 70242a8cb04..eeaf2176551 100644
--- a/gcc/testsuite/gcc.target/riscv/zvknha.c
+++ b/gcc/testsuite/gcc.target/riscv/zvknha.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvknha" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvknha" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvknha -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvknha -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvknhb.c b/gcc/testsuite/gcc.target/riscv/zvknhb.c
index af89d7b1b7d..061f6de3689 100644
--- a/gcc/testsuite/gcc.target/riscv/zvknhb.c
+++ b/gcc/testsuite/gcc.target/riscv/zvknhb.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvknhb" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvknhb" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvknhb -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvknhb -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvks-1.c b/gcc/testsuite/gcc.target/riscv/zvks-1.c
index 180b3f3c2a9..a2931e663e1 100644
--- a/gcc/testsuite/gcc.target/riscv/zvks-1.c
+++ b/gcc/testsuite/gcc.target/riscv/zvks-1.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvksed_zvksh_zvkb_zvkt" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvksed_zvksh_zvkb_zvkt" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvksed_zvksh_zvkb_zvkt -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvksed_zvksh_zvkb_zvkt -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvks.c b/gcc/testsuite/gcc.target/riscv/zvks.c
index 2022d168ec1..352773f0a74 100644
--- a/gcc/testsuite/gcc.target/riscv/zvks.c
+++ b/gcc/testsuite/gcc.target/riscv/zvks.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvks" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvks" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvks -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvks -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvksc-1.c b/gcc/testsuite/gcc.target/riscv/zvksc-1.c
index 0c81b4ee93b..48d0c0e92bb 100644
--- a/gcc/testsuite/gcc.target/riscv/zvksc-1.c
+++ b/gcc/testsuite/gcc.target/riscv/zvksc-1.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvksed_zvksh_zvkb_zvkt_zvbc" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvksed_zvksh_zvkb_zvkt_zvbc" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvksed_zvksh_zvkb_zvkt_zvbc -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvksed_zvksh_zvkb_zvkt_zvbc -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvksc-2.c b/gcc/testsuite/gcc.target/riscv/zvksc-2.c
index 0cee3586390..a36511bb028 100644
--- a/gcc/testsuite/gcc.target/riscv/zvksc-2.c
+++ b/gcc/testsuite/gcc.target/riscv/zvksc-2.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvks_zvbc" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvks_zvbc" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvks_zvbc -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvks_zvbc -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvksc.c b/gcc/testsuite/gcc.target/riscv/zvksc.c
index 6c33a86aa2e..2a7dd1642f1 100644
--- a/gcc/testsuite/gcc.target/riscv/zvksc.c
+++ b/gcc/testsuite/gcc.target/riscv/zvksc.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvksc" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvksc" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvksc -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvksc -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvksed.c b/gcc/testsuite/gcc.target/riscv/zvksed.c
index 2ac58f84819..6723d966067 100644
--- a/gcc/testsuite/gcc.target/riscv/zvksed.c
+++ b/gcc/testsuite/gcc.target/riscv/zvksed.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvksed" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvksed" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvksed -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvksed -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvksg-1.c b/gcc/testsuite/gcc.target/riscv/zvksg-1.c
index a81c8faf302..b30d77f8b84 100644
--- a/gcc/testsuite/gcc.target/riscv/zvksg-1.c
+++ b/gcc/testsuite/gcc.target/riscv/zvksg-1.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvksed_zvksh_zvkb_zvkt_zvkg" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvksed_zvksh_zvkb_zvkt_zvkg" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvksed_zvksh_zvkb_zvkt_zvkg -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvksed_zvksh_zvkb_zvkt_zvkg -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvksg-2.c b/gcc/testsuite/gcc.target/riscv/zvksg-2.c
index f6aa06bfbbe..c2f246c4160 100644
--- a/gcc/testsuite/gcc.target/riscv/zvksg-2.c
+++ b/gcc/testsuite/gcc.target/riscv/zvksg-2.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvks_zvkg" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvks_zvkg" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvks_zvkg -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvks_zvkg -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvksg.c b/gcc/testsuite/gcc.target/riscv/zvksg.c
index af2cd6e26ac..041a7b1e968 100644
--- a/gcc/testsuite/gcc.target/riscv/zvksg.c
+++ b/gcc/testsuite/gcc.target/riscv/zvksg.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvksg" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvksg" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvksg -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvksg -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvksh.c b/gcc/testsuite/gcc.target/riscv/zvksh.c
index f7190a42cc2..1057663e854 100644
--- a/gcc/testsuite/gcc.target/riscv/zvksh.c
+++ b/gcc/testsuite/gcc.target/riscv/zvksh.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvksh" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvksh" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvksh -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvksh -mabi=ilp32d" { target { rv32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/riscv/zvkt.c b/gcc/testsuite/gcc.target/riscv/zvkt.c
index 8871a4aca4c..1bef4098d22 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkt.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkt.c
@@ -1,4 +1,4 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zvkt" { target { rv64 } } } */
-/* { dg-options "-march=rv32gc_zvkt" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_zvkt -mabi=lp64d" { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zvkt -mabi=ilp32d" { target { rv32 } } } */