From f5b10973531cdda7e1aba7496f70476b5146fcf8 Mon Sep 17 00:00:00 2001 From: Nelson Chu Date: Mon, 12 Apr 2021 17:59:57 +0800 Subject: [PATCH] RISC-V: The version of i-ext should be RISCV_UNKNOWN_VERSION when expanding g-ext. Fix the wrong version of i-ext when expanding g-ext. This was changed by the previous patch accidently. bfd/ * elfxx-riscv.c (riscv_parse_std_ext): Fixed the wrong versions of i-ext when expanding g-ext. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-riscv.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 58a862c0ea5..cb85678a716 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2021-04-12 Nelson Chu + + * elfxx-riscv.c (riscv_parse_std_ext): Fixed the wrong versions of + i-ext when expanding g-ext. + 2021-04-12 Nelson Chu * elfxx-riscv.c (riscv_ext_dont_care_version): Removed. diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index ef55d8384eb..13719e508b9 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1514,8 +1514,8 @@ riscv_parse_std_ext (riscv_parse_subset_t *rps, &minor_version, true); /* Expand g to imafd. */ riscv_parse_add_subset (rps, "i", - major_version, - minor_version, false); + RISCV_UNKNOWN_VERSION, + RISCV_UNKNOWN_VERSION, false); for ( ; *std_exts != 'q'; std_exts++) { subset[0] = *std_exts; -- 2.30.2