From: Jakub Jelinek Date: Thu, 23 Feb 2023 22:26:43 +0000 (+0100) Subject: xtensa: Fix up fatal_error message strings in xtensa-dynconfig.c [PR108890] X-Git-Tag: basepoints/gcc-14~900 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7423f5b56ad436f51ac1b9defb954e2bdc5b06ab;p=thirdparty%2Fgcc.git xtensa: Fix up fatal_error message strings in xtensa-dynconfig.c [PR108890] The translation PR complains that these 4 messages from xtensa-dynconfig.c are marked in po/gcc.pot as c-format (which doesn't allow %qs) while they should be gcc-internal-format. The problem is in the manual translation of the strings with _(), that should be both unnecessary because fatal_error invokes _() on its argument already, but also incorrect for the above reason, for gcc-internal-format strings one should use G_("...") instead if really needed. The following patch drops those _("..."), tested by regenerating po/gcc.pot to see they are now gcc-internal-format, but not really tested on xtensa target. 2023-02-23 Jakub Jelinek PR translation/108890 * config/xtensa/xtensa-dynconfig.c (xtensa_load_config): Drop _()s around fatal_error format strings. --- diff --git a/gcc/config/xtensa/xtensa-dynconfig.c b/gcc/config/xtensa/xtensa-dynconfig.c index 5347a7e24292..e0091f3e6669 100644 --- a/gcc/config/xtensa/xtensa-dynconfig.c +++ b/gcc/config/xtensa/xtensa-dynconfig.c @@ -87,14 +87,14 @@ const void *xtensa_load_config (const char *name ATTRIBUTE_UNUSED, if (!handle) { fatal_error (input_location, - _("%qs is defined but could not be loaded: %s"), + "%qs is defined but could not be loaded: %s", CONFIG_ENV_NAME, dlerror ()); exit (FATAL_EXIT_CODE); } if (dlsym (handle, "plugin_is_GPL_compatible") == NULL) { fatal_error (input_location, - _("%qs plugin is not licensed under a GPL-compatible license"), + "%qs plugin is not licensed under a GPL-compatible license", CONFIG_ENV_NAME); exit (FATAL_EXIT_CODE); } @@ -111,7 +111,7 @@ const void *xtensa_load_config (const char *name ATTRIBUTE_UNUSED, return no_name_def; fatal_error (input_location, - _("%qs is loaded but symbol %qs is not found: %s"), + "%qs is loaded but symbol %qs is not found: %s", CONFIG_ENV_NAME, name, dlerror ()); exit (FATAL_EXIT_CODE); } @@ -125,7 +125,7 @@ const void *xtensa_load_config (const char *name ATTRIBUTE_UNUSED, if (path) { fatal_error (input_location, - _("%qs is defined but plugin support is disabled"), + "%qs is defined but plugin support is disabled", CONFIG_ENV_NAME); exit (FATAL_EXIT_CODE); }