diff options
| author | Tamar Christina <tamar.christina@arm.com> | 2021-11-19 08:48:11 +0000 |
|---|---|---|
| committer | Tamar Christina <tamar.christina@arm.com> | 2021-11-19 08:48:11 +0000 |
| commit | 0e510ab53414430e93c6f5b64841e2f40031cda7 (patch) | |
| tree | e2f223f686d1c53c613dcaeb0dfbd25485407350 | |
| parent | fb15abdc9b61a0b7fa24a37f85d19dc449cfd5bf (diff) | |
| download | gcc-0e510ab53414430e93c6f5b64841e2f40031cda7.zip gcc-0e510ab53414430e93c6f5b64841e2f40031cda7.tar.gz gcc-0e510ab53414430e93c6f5b64841e2f40031cda7.tar.bz2 | |
libstdc++: Fix ctype changed after newlib update.
Newlib changed ctype.h recently[1] by moving the short labels from ctype.h intro
the private namespace in ctype_.h. This broke embedded builds due to them no
longer being found. Instead they now expose the long names to match glibc.
This patch now uses the short or long names depending on is the short ones are
defined or not.
[1] https://github.com/bminor/newlib/commit/3ba1bd0d9dbc015c14a0aaafcef042f706d1249a
libstdc++-v3/ChangeLog:
PR libstdc++/103305
* config/os/newlib/ctype_base.h (upper, lower, alpha, digit, xdigit,
space, print, graph, cntrl, punct, alnum, blank): Use short or long
names depending on if short ones are defined.
| -rw-r--r-- | libstdc++-v3/config/os/newlib/ctype_base.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/libstdc++-v3/config/os/newlib/ctype_base.h b/libstdc++-v3/config/os/newlib/ctype_base.h index 33654d7..3a7477a 100644 --- a/libstdc++-v3/config/os/newlib/ctype_base.h +++ b/libstdc++-v3/config/os/newlib/ctype_base.h @@ -41,6 +41,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // NB: Offsets into ctype<char>::_M_table force a particular size // on the mask type. Because of this, we don't use an enum. typedef char mask; +#if defined _U && defined _L && defined _N && defined _S static const mask upper = _U; static const mask lower = _L; static const mask alpha = _U | _L; @@ -52,8 +53,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static const mask cntrl = _C; static const mask punct = _P; static const mask alnum = _U | _L | _N; -#if __cplusplus >= 201103L +# if __cplusplus >= 201103L static const mask blank = space; +# endif +#else + static const mask upper = _ISupper; + static const mask lower = _ISlower; + static const mask alpha = _ISupper | _ISlower; + static const mask digit = _ISdigit; + static const mask xdigit = _ISxdigit | _ISdigit; + static const mask space = _ISspace; + static const mask print = _ISpunct | _ISupper | _ISlower | _ISdigit | _ISblank; + static const mask graph = _ISpunct | _ISupper | _ISlower | _ISdigit; + static const mask cntrl = _IScntrl; + static const mask punct = _ISpunct; + static const mask alnum = _ISupper | _ISlower | _ISdigit; +# if __cplusplus >= 201103L + static const mask blank = _ISspace | _ISblank; +# endif #endif }; |