git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR bootstrap/77569 (self tests fail when not using C locale) 

PR bootstrap/77569
	* input.c (ebcdic_execution_charset::on_error): Don't use strstr for
	a substring of the message, but strcmp with the whole message.  Ifdef
	ENABLE_NLS, translate the message first using dgettext.

From-SVN: r244047
This commit is contained in:
Jakub Jelinek 2017-01-04 08:53:30 +01:00 committed by Jakub Jelinek
parent 27e99c9b9d
commit a7085816dc
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2017-01-04 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/77569
* input.c (ebcdic_execution_charset::on_error): Don't use strstr for
a substring of the message, but strcmp with the whole message. Ifdef
ENABLE_NLS, translate the message first using dgettext.
2017-01-03 Jeff Law <law@redhat.com> 2017-01-03 Jeff Law <law@redhat.com>
PR tree-optimizatin/78856 PR tree-optimizatin/78856

7
gcc/input.c
View File

@ -2026,9 +2026,14 @@ class ebcdic_execution_charset : public lexer_test_options
ATTRIBUTE_FPTR_PRINTF(5,0) ATTRIBUTE_FPTR_PRINTF(5,0)
{ {
gcc_assert (s_singleton); gcc_assert (s_singleton);
/* Avoid exgettext from picking this up, it is translated in libcpp. */
const char *msg = "conversion from %s to %s not supported by iconv";
#ifdef ENABLE_NLS
msg = dgettext ("cpplib", msg);
#endif
/* Detect and record errors emitted by libcpp/charset.c:init_iconv_desc /* Detect and record errors emitted by libcpp/charset.c:init_iconv_desc
when the local iconv build doesn't support the conversion. */ when the local iconv build doesn't support the conversion. */
if (strstr (msgid, "not supported by iconv")) if (strcmp (msgid, msg) == 0)
{ {
s_singleton->m_num_iconv_errors++; s_singleton->m_num_iconv_errors++;
return true; return true;