From a97f6089987ec047e2e0815c68b8c122e4a65940 Mon Sep 17 00:00:00 2001 From: Tsukasa OI Date: Mon, 6 Feb 2023 06:21:26 +0000 Subject: [PATCH] RISC-V: Tidying for riscv_parse_check_conflicts This commit replaces some riscv_lookup_subset calls to simpler riscv_subset_supports calls for tidying. Although it could be applied to 'E' as well, it might require version checking and excluded from tidying. bfd/ChangeLog: * elfxx-riscv.c (riscv_parse_check_conflicts): Tidying. --- bfd/elfxx-riscv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 19391d94e30..20726fa0dd0 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1836,8 +1836,7 @@ riscv_parse_check_conflicts (riscv_parse_subset_t *rps) rps->error_handler (_("rv%d does not support the `q' extension"), xlen); no_conflict = false; } - if (riscv_lookup_subset (rps->subset_list, "zfinx", &subset) - && riscv_lookup_subset (rps->subset_list, "f", &subset)) + if (riscv_subset_supports (rps, "zfinx") && riscv_subset_supports (rps, "f")) { rps->error_handler (_("`zfinx' is conflict with the `f/d/q/zfh/zfhmin' extension"));