From 609d9bdeab1365b04b84891e5d75cd86d003c8e2 Mon Sep 17 00:00:00 2001 From: Kito Cheng Date: Wed, 7 Aug 2019 03:12:34 +0000 Subject: [PATCH] RISC-V: Handle g extension in multilib-generator gcc/ChangeLog * gcc/config/riscv/multilib-generator: (canonical_order): Add 'g'. (arch_canonicalize): Support rv32g and rv64g and fix error handling. From-SVN: r274156 --- gcc/ChangeLog | 6 ++++++ gcc/config/riscv/multilib-generator | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 11ae775a719..0fc0a212888 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-08-07 Kito Cheng + + * gcc/config/riscv/multilib-generator: (canonical_order): Add 'g'. + (arch_canonicalize): Support rv32g and rv64g and fix error + handling. + 2019-08-06 Martin Liska * cgraph.c (cgraph_node::dump): Dump DECL_IS_OPERATOR_NEW_P diff --git a/gcc/config/riscv/multilib-generator b/gcc/config/riscv/multilib-generator index e58231c2756..a4125ff01fd 100755 --- a/gcc/config/riscv/multilib-generator +++ b/gcc/config/riscv/multilib-generator @@ -36,17 +36,17 @@ abis = collections.OrderedDict() required = [] reuse = [] -canonical_order = "mafdqlcbjtpvn" +canonical_order = "mafdgqlcbjtpvn" def arch_canonicalize(arch): # TODO: Support Z, S, H, or X extensions. # TODO: Support implied extensions, e.g. D implied F in latest spec. # TODO: Support extension version. new_arch = "" - if arch[:5] in ['rv32e', 'rv32i', 'rv64i']: + if arch[:5] in ['rv32e', 'rv32i', 'rv32g', 'rv64i', 'rv64g']: new_arch = arch[:5] else: - raise Exception("Unexpected arch: `%d`" % arch[:5]) + raise Exception("Unexpected arch: `%s`" % arch[:5]) # Find any Z, S, H or X long_ext_prefixes = ['z', 's', 'h', 'x'] -- 2.30.2