From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id 53324383EC74 for ; Fri, 10 Jun 2022 09:53:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 53324383EC74 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id C64DB30008A; Fri, 10 Jun 2022 09:53:20 +0000 (UTC) From: Tsukasa OI To: Tsukasa OI , Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu Cc: binutils@sourceware.org Subject: [PATCH 1/1] RISC-V: Prepare i18n for required ISA extensions Date: Fri, 10 Jun 2022 18:52:50 +0900 Message-Id: <5cd2086c13bcdddb07bc983c8ec23a36d33cd533.1654854518.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2022 09:53:25 -0000 Some strings returned by the riscv_multi_subset_supports_ext function contain not just extension names but words like "and" and "or". This commit wraps such strings with the gettext macro (_) for internationalization in the future. bfd/ChangeLog: * elfxx-riscv.c (riscv_multi_subset_supports_ext): Wrap some strings with the gettext macro to prepare future i18n. --- bfd/elfxx-riscv.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 7c36123338c..a4609b995b8 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -2462,7 +2462,7 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, case INSN_CLASS_F_AND_C: if (!riscv_subset_supports (rps, "f") && !riscv_subset_supports (rps, "c")) - return "f' and `c"; + return _("f' and `c"); else if (!riscv_subset_supports (rps, "f")) return "f"; else @@ -2470,17 +2470,18 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, case INSN_CLASS_D_AND_C: if (!riscv_subset_supports (rps, "d") && !riscv_subset_supports (rps, "c")) - return "d' and `c"; + return _("d' and `c"); else if (!riscv_subset_supports (rps, "d")) return "d"; else return "c"; case INSN_CLASS_F_OR_ZFINX: - return "f' or `zfinx"; + /* i18n: Formatted like "extension `f' or `zfinx' required". */ + return _("f' or `zfinx"); case INSN_CLASS_D_OR_ZDINX: - return "d' or `zdinx"; + return _("d' or `zdinx"); case INSN_CLASS_Q_OR_ZQINX: - return "q' or `zqinx"; + return _("q' or `zqinx"); case INSN_CLASS_ZBA: return "zba"; case INSN_CLASS_ZBB: @@ -2496,9 +2497,9 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, case INSN_CLASS_ZBKX: return "zbkx"; case INSN_CLASS_ZBB_OR_ZBKB: - return "zbb' or `zbkb"; + return _("zbb' or `zbkb"); case INSN_CLASS_ZBC_OR_ZBKC: - return "zbc' or `zbkc"; + return _("zbc' or `zbkc"); case INSN_CLASS_ZKND: return "zknd"; case INSN_CLASS_ZKNE: @@ -2506,25 +2507,25 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, case INSN_CLASS_ZKNH: return "zknh"; case INSN_CLASS_ZKND_OR_ZKNE: - return "zknd' or `zkne"; + return _("zknd' or `zkne"); case INSN_CLASS_ZKSED: return "zksed"; case INSN_CLASS_ZKSH: return "zksh"; case INSN_CLASS_V: - return "v' or `zve64x' or `zve32x"; + return _("v' or `zve64x' or `zve32x"); case INSN_CLASS_ZVEF: - return "v' or `zve64d' or `zve64f' or `zve32f"; + return _("v' or `zve64d' or `zve64f' or `zve32f"); case INSN_CLASS_SVINVAL: return "svinval"; case INSN_CLASS_ZFH: return "zfh"; case INSN_CLASS_ZFH_OR_ZHINX: - return "zfh' or 'zhinx"; + return _("zfh' or 'zhinx"); case INSN_CLASS_D_AND_ZFH_INX: - return "('d' and 'zfh') or 'zhinx"; + return _("('d' and 'zfh') or 'zhinx"); case INSN_CLASS_Q_AND_ZFH_INX: - return "('q' and 'zfh') or 'zhinx"; + return _("('q' and 'zfh') or 'zhinx"); default: rps->error_handler (_("internal: unreachable INSN_CLASS_*")); -- 2.34.1