From 995a71ff7113fc95325ee2d8b51cc5a27ee617d8 Mon Sep 17 00:00:00 2001 From: "max.ma" Date: Mon, 11 Oct 2021 02:44:58 -0700 Subject: [PATCH 03/11] fix unrecoginized "b" ext issue --- bfd/elfxx-riscv.c | 3 ++- gas/config/tc-riscv.c | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 39b69e2b0a..9999ec418a 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1077,7 +1077,8 @@ static struct riscv_implicit_subset riscv_implicit_subsets[] = static const char * const riscv_std_z_ext_strtab[] = { - "zba", "zbb", "zbc", "zicsr", "zifencei", "zihintpause", NULL + "zba", "zbb", "zbc", "zicsr", "zifencei", "zihintpause", + "zbe", "zbf", "zbm", "zbp", "zbr", "zbs", "zbt", "zvamo", "zvlsseg",NULL }; static const char * const riscv_std_s_ext_strtab[] = diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index 898ee89f96..2fb613467e 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -140,9 +140,20 @@ static const struct riscv_ext_version ext_version_table[] = {"zihintpause", ISA_SPEC_CLASS_DRAFT, 1, 0}, - {"zbb", ISA_SPEC_CLASS_DRAFT, 0, 93}, - {"zba", ISA_SPEC_CLASS_DRAFT, 0, 93}, - {"zbc", ISA_SPEC_CLASS_DRAFT, 0, 93}, + {"b", ISA_SPEC_CLASS_DRAFT, 0, 94}, + {"zbb", ISA_SPEC_CLASS_DRAFT, 0, 94}, + {"zba", ISA_SPEC_CLASS_DRAFT, 0, 94}, + {"zbc", ISA_SPEC_CLASS_DRAFT, 0, 94}, + {"zbe", ISA_SPEC_CLASS_DRAFT, 0, 94}, + {"zbf", ISA_SPEC_CLASS_DRAFT, 0, 94}, + {"zbm", ISA_SPEC_CLASS_DRAFT, 0, 94}, + {"zbp", ISA_SPEC_CLASS_DRAFT, 0, 94}, + {"zbr", ISA_SPEC_CLASS_DRAFT, 0, 94}, + {"zbs", ISA_SPEC_CLASS_DRAFT, 0, 94}, + {"zbt", ISA_SPEC_CLASS_DRAFT, 0, 94}, + + {"zvamo", ISA_SPEC_CLASS_NONE, 1, 0}, + {"zvlsseg", ISA_SPEC_CLASS_NONE, 1, 0}, /* Terminate the list. */ {NULL, 0, 0, 0} -- 2.33.1