From e8b4b7b258d7bd926de2d8758c2a55e28ba46c48 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 3 Jan 2023 12:03:02 +0000 Subject: [PATCH] Fix a translation problem in the x86 assembler. PR 29952 * config/tc-i386.c (md_assemble): Avoid constructing translatable strings. --- gas/ChangeLog | 6 ++++++ gas/config/tc-i386.c | 26 +++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 59ba916b4c7..b0b8be2e621 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2023-01-03 Nick Clifton + + PR 29952 + * config/tc-i386.c (md_assemble): Avoid constructing translatable + strings. + 2023-01-03 Nick Clifton * po/fr.po: Updated French translation. diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 66d5ea5a99d..c70b9f47aa8 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -5067,14 +5067,26 @@ md_assemble (char *line) return; case unsupported_64bit: if (ISLOWER (mnem_suffix)) - as_bad (_("`%s%c' is %s supported in 64-bit mode"), - pass1_mnem ? pass1_mnem : current_templates->start->name, - mnem_suffix, - flag_code == CODE_64BIT ? _("not") : _("only")); + { + if (flag_code == CODE_64BIT) + as_bad (_("`%s%c' is not supported in 64-bit mode"), + pass1_mnem ? pass1_mnem : current_templates->start->name, + mnem_suffix); + else + as_bad (_("`%s%c' is only supported in 64-bit mode"), + pass1_mnem ? pass1_mnem : current_templates->start->name, + mnem_suffix); + } else - as_bad (_("`%s' is %s supported in 64-bit mode"), - pass1_mnem ? pass1_mnem : current_templates->start->name, - flag_code == CODE_64BIT ? _("not") : _("only")); + { + if (flag_code == CODE_64BIT) + as_bad (_("`%s' is not supported in 64-bit mode"), + pass1_mnem ? pass1_mnem : current_templates->start->name); + else + as_bad (_("`%s' is only supported in 64-bit mode"), + pass1_mnem ? pass1_mnem : current_templates->start->name); + } + return; case invalid_sib_address: err_msg = _("invalid SIB address"); -- 2.30.2