From: Nelson Chu <nelson.chu@sifive.com>
To: Tsukasa OI <research_trasio@irq.a4lg.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>,
Andrew Waterman <andrew@sifive.com>,
Jim Wilson <jim.wilson.gcc@gmail.com>,
Binutils <binutils@sourceware.org>
Subject: Re: [PATCH 1/1] RISC-V: Prepare i18n for required ISA extensions
Date: Wed, 22 Jun 2022 18:35:20 +0800 [thread overview]
Message-ID: <CAJYME4HF8_PVj4a1RTT7jGQuYFEQr1JTO-g7wJFN=7Jne1TXcw@mail.gmail.com> (raw)
In-Reply-To: <5cd2086c13bcdddb07bc983c8ec23a36d33cd533.1654854518.git.research_trasio@irq.a4lg.com>
OK, committed.
Thanks
Nelson
On Fri, Jun 10, 2022 at 5:53 PM Tsukasa OI <research_trasio@irq.a4lg.com> wrote:
>
> 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
>
prev parent reply other threads:[~2022-06-22 10:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-10 9:52 [PATCH 0/1] RISC-V: i18n enablement on error messages Tsukasa OI
2022-06-10 9:52 ` [PATCH 1/1] RISC-V: Prepare i18n for required ISA extensions Tsukasa OI
2022-06-22 10:35 ` Nelson Chu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJYME4HF8_PVj4a1RTT7jGQuYFEQr1JTO-g7wJFN=7Jne1TXcw@mail.gmail.com' \
--to=nelson.chu@sifive.com \
--cc=andrew@sifive.com \
--cc=binutils@sourceware.org \
--cc=jim.wilson.gcc@gmail.com \
--cc=palmer@dabbelt.com \
--cc=research_trasio@irq.a4lg.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).