From 0bb431d0a77cf8dc790b9c61539b3eb6ab1710f0 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 25 Feb 2025 20:03:38 +0100
Subject: [PATCH] pru: Fix pru_pragma_ctable_entry diagnostics [PR118991]
HOST_WIDE_INT_PRINT* macros aren't supposed to be used in
gcc-internal-format format strings, we have the w modifier for HOST_WIDE_INT
in that case, the HOST_WIDE_INT_PRINT* macros might not work properly on
some hosts (e.g. mingw32 has HOST_LONG_LONG_FORMAT "I64" and that is
something pretty-print doesn't handle, while it handles "ll" for long long)
and also the use of macros in the middle of format strings breaks
translations (both that exgettext can't retrieve the string from there
and we get
#: config/pru/pru-pragma.cc:61
msgid "%<CTABLE_ENTRY%> index %"
msgstr ""
#: config/pru/pru-pragma.cc:64
msgid "redefinition of %<CTABLE_ENTRY %"
msgstr ""
in po/gcc.pot and also the macros are different on different hosts,
so even if exgettext extracted say "%<CTABLE_ENTRY%> index %lld is not valid"
it could be translated on some hosts but not e.g. mingw32).
So, the following patch just uses %wd instead.
Tested it before/after the
patch on
#pragma ctable_entry 12 0x48040000
#pragma ctable_entry 1024 0x48040000
#pragma ctable_entry 12 0x48040001
and the result is the same.
2025-02-25 Jakub Jelinek <jakub@redhat.com>
PR translation/118991
* config/pru/pru-pragma.cc (pru_pragma_ctable_entry): Use %wd
instead of %" HOST_WIDE_INT_PRINT "d to print a hwi in error.
---
gcc/config/pru/pru-pragma.cc | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gcc/config/pru/pru-pragma.cc b/gcc/config/pru/pru-pragma.cc
index 9c182d788141..c3f3d33d5470 100644
--- a/gcc/config/pru/pru-pragma.cc
+++ b/gcc/config/pru/pru-pragma.cc
@@ -58,11 +58,9 @@ pru_pragma_ctable_entry (cpp_reader *)
if (type != CPP_EOF)
error ("junk at end of %<#pragma CTABLE_ENTRY%>");
else if (i >= ARRAY_SIZE (pru_ctable))
- error ("%<CTABLE_ENTRY%> index %" HOST_WIDE_INT_PRINT "d"
- " is not valid", i);
+ error ("%<CTABLE_ENTRY%> index %wd is not valid", i);
else if (pru_ctable[i].valid && pru_ctable[i].base != base)
- error ("redefinition of %<CTABLE_ENTRY "
- "%" HOST_WIDE_INT_PRINT "d%>", i);
+ error ("redefinition of %<CTABLE_ENTRY %wd%>", i);
else
{
if (base & 0xff)
--
GitLab