[gcc r12-5819] Revert "libstdc++: Fix ctype changed after newlib update."

[gcc r12-5819] Revert "libstdc++: Fix ctype changed after newlib update."

[Tamar Christina]

https://gcc.gnu.org/g:ba6bb287f03d42ab6c4f39ce99dcf94ec5113655

commit r12-5819-gba6bb287f03d42ab6c4f39ce99dcf94ec5113655
Author: Tamar Christina <tamar.christina@arm.com>
Date:   Tue Dec 7 10:37:30 2021 +0000

    Revert "libstdc++: Fix ctype changed after newlib update."
    
    Newlib has reverted the commit that caused us to require a
    workaround.  As such we can now revert the workaround.
    
    This reverts commit 0e510ab53414430e93c6f5b64841e2f40031cda7.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/103305
            * config/os/newlib/ctype_base.h (upper, lower, alpha, digit, xdigit,
            space, print, graph, cntrl, punct, alnum, blank): Revert.

Diff:
---
 libstdc++-v3/config/os/newlib/ctype_base.h | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/libstdc++-v3/config/os/newlib/ctype_base.h b/libstdc++-v3/config/os/newlib/ctype_base.h
index 3a7477afdcc..33654d7794a 100644
--- a/libstdc++-v3/config/os/newlib/ctype_base.h
+++ b/libstdc++-v3/config/os/newlib/ctype_base.h
@@ -41,7 +41,6 @@ _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;
@@ -53,24 +52,8 @@ _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
   };