From: Xiao Zeng Date: Tue, 8 Oct 2024 01:10:35 +0000 (+0800) Subject: RISC-V: Fix implicit dependency of Zabha and Zacas X-Git-Tag: gdb-16-branchpoint~718 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=542d8137f9f6a2c66e898af136dc792a3963f932;p=thirdparty%2Fbinutils-gdb.git RISC-V: Fix implicit dependency of Zabha and Zacas 1 Zabha depends on Zaamo: 2 Zacas depends on Zaamo: bfd/ChangeLog: * elfxx-riscv.c: Zabha and Zacas implicitly depend on Zaamo. gas/ChangeLog: * testsuite/gas/riscv/imply.d: Updated. Signed-off-by: Xiao Zeng --- diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 26ec664d88a..4b48d8ee9f0 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1182,8 +1182,8 @@ static struct riscv_implicit_subset riscv_implicit_subsets[] = {"m", "+zmmul", check_implicit_always}, - {"zabha", "+a", check_implicit_always}, - {"zacas", "+a", check_implicit_always}, + {"zabha", "+zaamo", check_implicit_always}, + {"zacas", "+zaamo", check_implicit_always}, {"a", "+zaamo,+zalrsc", check_implicit_always}, {"xsfvcp", "+zve32x", check_implicit_always}, diff --git a/gas/testsuite/gas/riscv/imply.d b/gas/testsuite/gas/riscv/imply.d index 88b8c46bb89..26eff8c650a 100644 --- a/gas/testsuite/gas/riscv/imply.d +++ b/gas/testsuite/gas/riscv/imply.d @@ -15,8 +15,8 @@ SYMBOL TABLE: [0-9a-f]+ l .text 0+000 \$xrv32i2p1_zicntr2p0_zicsr2p0 [0-9a-f]+ l .text 0+000 \$xrv32i2p1_zicsr2p0_zihpm2p0 [0-9a-f]+ l .text 0+000 \$xrv32i2p1_m2p0_zmmul1p0 -[0-9a-f]+ l .text 0+000 \$xrv32i2p1_a2p1_zaamo1p0_zabha1p0_zalrsc1p0 -[0-9a-f]+ l .text 0+000 \$xrv32i2p1_a2p1_zaamo1p0_zacas1p0_zalrsc1p0 +[0-9a-f]+ l .text 0+000 \$xrv32i2p1_zaamo1p0_zabha1p0 +[0-9a-f]+ l .text 0+000 \$xrv32i2p1_zaamo1p0_zacas1p0 [0-9a-f]+ l .text 0+000 \$xrv32i2p1_a2p1_zaamo1p0_zalrsc1p0 [0-9a-f]+ l .text 0+000 \$xrv32i2p1_zicsr2p0_zve32x1p0_zvl32b1p0_xsfvcp1p0 [0-9a-f]+ l .text 0+000 \$xrv32i2p1_f2p2_d2p2_v1p0_zicsr2p0_zve32f1p0_zve32x1p0_zve64d1p0_zve64f1p0_zve64x1p0_zvl128b1p0_zvl32b1p0_zvl64b1p0