diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2023-10-16 19:04:50 -0400 |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2023-10-16 19:04:50 -0400 |
| commit | 04013e4464020b4440aa41524a222658d7e36937 (patch) | |
| tree | e0442aab13ae63e98dd880407521ca48a7af162e /gcc | |
| parent | f8644b678285cf420219859a4384490d5947b731 (diff) | |
| download | gcc-04013e4464020b4440aa41524a222658d7e36937.zip gcc-04013e4464020b4440aa41524a222658d7e36937.tar.gz gcc-04013e4464020b4440aa41524a222658d7e36937.tar.bz2 | |
diagnostics: special-case -fdiagnostics-text-art-charset=ascii for LANG=C
In the LWN discussion of the "ASCII" art in GCC 14
https://lwn.net/Articles/946733/#Comments
there was some concern about the use of non-ASCII characters in the
output.
Currently -fdiagnostics-text-art-charset defaults to "emoji".
To better handle older terminals by default, this patch special-cases
LANG=C to use -fdiagnostics-text-art-charset=ascii.
gcc/ChangeLog:
* diagnostic.cc (diagnostic_initialize): When LANG=C, update
default for -fdiagnostics-text-art-charset from emoji to ascii.
* doc/invoke.texi (fdiagnostics-text-art-charset): Document the above.
Signed-off-by: David Malcolm <dmalcolm@redhat.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/diagnostic.cc | 13 | ||||
| -rw-r--r-- | gcc/doc/invoke.texi | 3 |
2 files changed, 13 insertions, 3 deletions
diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc index 0363745..6e46371 100644 --- a/gcc/diagnostic.cc +++ b/gcc/diagnostic.cc @@ -226,8 +226,17 @@ diagnostic_initialize (diagnostic_context *context, int n_opts) context->includes_seen = NULL; context->m_client_data_hooks = NULL; context->m_diagrams.m_theme = NULL; - diagnostics_text_art_charset_init (context, - DIAGNOSTICS_TEXT_ART_CHARSET_DEFAULT); + + enum diagnostic_text_art_charset text_art_charset + = DIAGNOSTICS_TEXT_ART_CHARSET_DEFAULT; + if (const char *lang = getenv ("LANG")) + { + /* For LANG=C, don't assume the terminal supports anything + other than ASCII. */ + if (!strcmp (lang, "C")) + text_art_charset = DIAGNOSTICS_TEXT_ART_CHARSET_ASCII; + } + diagnostics_text_art_charset_init (context, text_art_charset); } /* Maybe initialize the color support. We require clients to do this diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 2a500c1..db59d8b 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -5688,7 +5688,8 @@ value further adds the possibility of emoji in the output (such as emitting U+26A0 WARNING SIGN followed by U+FE0F VARIATION SELECTOR-16 to select the emoji variant of the character). -The default is @samp{emoji}. +The default is @samp{emoji}, except when the environment variable @env{LANG} +is set to @samp{C}, in which case the default is @samp{ascii}. @opindex fdiagnostics-format @item -fdiagnostics-format=@var{FORMAT} |