From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from fencepost.gnu.org (fencepost.gnu.org [IPv6:2001:470:142:3::e]) by sourceware.org (Postfix) with ESMTPS id 3C05E3858403 for ; Sat, 17 Sep 2022 21:56:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3C05E3858403 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gnu.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gnu.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=In-Reply-To:MIME-Version:References:Subject:To:From: Date; bh=Q8VxzonQ0X0TgCC7skGmfjKLc2FuEuaeoN/2QDuCZGg=; b=moB+0DQtIPbRiXMEolQP D1ipC1DIUTBmy0lN08lY/gwp4zuJDZdkVGqowq7S0X1jwmvos4hYFjoYmRbPcK4ufQePxDTj73kEH GK64Ro3slW2xZUUDGbzkfeih7BuDz86Ft4dw2+3WaO7ufxsDPhhYFZcR403fmgA+2pPGsiGNnIAl8 km1imhZWUgZhHm0YNKHtrtFZU/WLC5nn2ivmcPfBD2eHl1YgjyDKg8SuhC/DPkxfWcSNUUKJhFqNc dMDA9DbT34d0SXjA5FYT73NA/+j6Ij9OHj5LgCuk0wyVE6i5vcHqtmGDv5IU2I/dlD4Xy7kfUhTT6 Sg7UPjRR94wTaQ==; Received: from [2a01:cb19:956:1b00:de41:a9ff:fe47:ec49] (port=48356 helo=begin) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZfn5-0007LF-KG; Sat, 17 Sep 2022 17:55:59 -0400 Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1oZfn2-008wtM-2L; Sat, 17 Sep 2022 23:55:56 +0200 Date: Sat, 17 Sep 2022 23:55:56 +0200 From: Samuel Thibault To: gcc-patches@gcc.gnu.org, bug-hurd@gnu.org Subject: Re: [PATCH] libstdc++: Introduce GNU/Hurd-specific libstdc++ os-defines.h Message-ID: <20220917215556.3kgrg3qtr3noxgbt@begin> Mail-Followup-To: gcc-patches@gcc.gnu.org, bug-hurd@gnu.org References: <20220829003040.kfgr7epzzyavbsjm@begin> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220829003040.kfgr7epzzyavbsjm@begin> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Ping? Samuel Thibault, le lun. 29 août 2022 02:30:40 +0200, a ecrit: > This is notably needed because in glibc 2.34, the move of pthread functions > into libc.so happened for Linux only, not GNU/Hurd. > > The pthread_self() function can also always be used fine as it is. > > libstdc++-v3/ChangeLog: > > * config/os/gnu/os_defines.h: New file. > * config/os/gnu/ctype_base.h: New file. > * config/os/gnu/ctype_configure_char.cc: New file. > * config/os/gnu/ctype_inline.h: New file. > * configure.host: On gnu* host, use os/gnu instead of os/gnu-linux. > > diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog > index ba5939d9003..dd288cce2ca 100644 > --- a/libstdc++-v3/ChangeLog > +++ b/libstdc++-v3/ChangeLog > @@ -1,3 +1,11 @@ > +2022-08-28 Samuel Thibault > + > + * config/os/gnu/os_defines.h: New file. > + * config/os/gnu/ctype_base.h: New file. > + * config/os/gnu/ctype_configure_char.cc: New file. > + * config/os/gnu/ctype_inline.h: New file. > + * configure.host: On gnu* host, use os/gnu instead of os/gnu-linux. > + > 2022-08-27 Patrick Palka > > * testsuite/20_util/logical_traits/requirements/base_classes.cc: New test. > diff --git a/libstdc++-v3/config/os/gnu/ctype_base.h b/libstdc++-v3/config/os/gnu/ctype_base.h > new file mode 100644 > index 00000000000..955146543db > --- /dev/null > +++ b/libstdc++-v3/config/os/gnu/ctype_base.h > @@ -0,0 +1,66 @@ > +// Locale support -*- C++ -*- > + > +// Copyright (C) 1997-2022 Free Software Foundation, Inc. > +// > +// This file is part of the GNU ISO C++ Library. This library is free > +// software; you can redistribute it and/or modify it under the > +// terms of the GNU General Public License as published by the > +// Free Software Foundation; either version 3, or (at your option) > +// any later version. > + > +// This library is distributed in the hope that it will be useful, > +// but WITHOUT ANY WARRANTY; without even the implied warranty of > +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +// GNU General Public License for more details. > + > +// Under Section 7 of GPL version 3, you are granted additional > +// permissions described in the GCC Runtime Library Exception, version > +// 3.1, as published by the Free Software Foundation. > + > +// You should have received a copy of the GNU General Public License and > +// a copy of the GCC Runtime Library Exception along with this program; > +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > +// . > + > +/** @file bits/ctype_base.h > + * This is an internal header file, included by other library headers. > + * Do not attempt to use it directly. @headername{locale} > + */ > + > +// > +// ISO C++ 14882: 22.1 Locales > +// > + > +// Information as gleaned from /usr/include/ctype.h > + > +namespace std _GLIBCXX_VISIBILITY(default) > +{ > +_GLIBCXX_BEGIN_NAMESPACE_VERSION > + > + /// @brief Base class for ctype. > + struct ctype_base > + { > + // Non-standard typedefs. > + typedef const int* __to_type; > + > + // NB: Offsets into ctype::_M_table force a particular size > + // on the mask type. Because of this, we don't use an enum. > + typedef unsigned short mask; > + static const mask upper = _ISupper; > + static const mask lower = _ISlower; > + static const mask alpha = _ISalpha; > + static const mask digit = _ISdigit; > + static const mask xdigit = _ISxdigit; > + static const mask space = _ISspace; > + static const mask print = _ISprint; > + static const mask graph = _ISalpha | _ISdigit | _ISpunct; > + static const mask cntrl = _IScntrl; > + static const mask punct = _ISpunct; > + static const mask alnum = _ISalpha | _ISdigit; > +#if __cplusplus >= 201103L > + static const mask blank = _ISblank; > +#endif > + }; > + > +_GLIBCXX_END_NAMESPACE_VERSION > +} // namespace > diff --git a/libstdc++-v3/config/os/gnu/ctype_configure_char.cc b/libstdc++-v3/config/os/gnu/ctype_configure_char.cc > new file mode 100644 > index 00000000000..5a88fc11ab3 > --- /dev/null > +++ b/libstdc++-v3/config/os/gnu/ctype_configure_char.cc > @@ -0,0 +1,196 @@ > +// Locale support -*- C++ -*- > + > +// Copyright (C) 2011-2022 Free Software Foundation, Inc. > +// > +// This file is part of the GNU ISO C++ Library. This library is free > +// software; you can redistribute it and/or modify it under the > +// terms of the GNU General Public License as published by the > +// Free Software Foundation; either version 3, or (at your option) > +// any later version. > + > +// This library is distributed in the hope that it will be useful, > +// but WITHOUT ANY WARRANTY; without even the implied warranty of > +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +// GNU General Public License for more details. > + > +// Under Section 7 of GPL version 3, you are granted additional > +// permissions described in the GCC Runtime Library Exception, version > +// 3.1, as published by the Free Software Foundation. > + > +// You should have received a copy of the GNU General Public License and > +// a copy of the GCC Runtime Library Exception along with this program; > +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > +// . > + > +/** @file ctype_configure_char.cc */ > + > +// > +// ISO C++ 14882: 22.1 Locales > +// > + > +#include > +#include > +#include > + > +namespace std _GLIBCXX_VISIBILITY(default) > +{ > +_GLIBCXX_BEGIN_NAMESPACE_VERSION > + > +// Information as gleaned from /usr/include/ctype.h > + > +#if _GLIBCXX_C_LOCALE_GNU > + const ctype_base::mask* > + ctype::classic_table() throw() > + { return _S_get_c_locale()->__ctype_b; } > +#else > + const ctype_base::mask* > + ctype::classic_table() throw() > + { > + const ctype_base::mask* __ret; > + char* __old = setlocale(LC_CTYPE, NULL); > + char* __sav = NULL; > + if (__builtin_strcmp(__old, "C")) > + { > + const size_t __len = __builtin_strlen(__old) + 1; > + __sav = new char[__len]; > + __builtin_memcpy(__sav, __old, __len); > + setlocale(LC_CTYPE, "C"); > + } > +#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) > + __ret = *__ctype_b_loc(); > +#else > + __ret = __ctype_b; > +#endif > + if (__sav) > + { > + setlocale(LC_CTYPE, __sav); > + delete [] __sav; > + } > + return __ret; > + } > +#endif > + > +#if _GLIBCXX_C_LOCALE_GNU > + ctype::ctype(__c_locale __cloc, const mask* __table, bool __del, > + size_t __refs) > + : facet(__refs), _M_c_locale_ctype(_S_clone_c_locale(__cloc)), > + _M_del(__table != 0 && __del), > + _M_toupper(_M_c_locale_ctype->__ctype_toupper), > + _M_tolower(_M_c_locale_ctype->__ctype_tolower), > + _M_table(__table ? __table : _M_c_locale_ctype->__ctype_b), > + _M_widen_ok(0), _M_narrow_ok(0) > + { > + __builtin_memset(_M_widen, 0, sizeof(_M_widen)); > + __builtin_memset(_M_narrow, 0, sizeof(_M_narrow)); > + } > +#else > + ctype::ctype(__c_locale, const mask* __table, bool __del, > + size_t __refs) > + : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), > + _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0) > + { > + char* __old = setlocale(LC_CTYPE, NULL); > + char* __sav = NULL; > + if (__builtin_strcmp(__old, "C")) > + { > + const size_t __len = __builtin_strlen(__old) + 1; > + __sav = new char[__len]; > + __builtin_memcpy(__sav, __old, __len); > + setlocale(LC_CTYPE, "C"); > + } > +#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) > + _M_toupper = *__ctype_toupper_loc(); > + _M_tolower = *__ctype_tolower_loc(); > + _M_table = __table ? __table : *__ctype_b_loc(); > +#else > + _M_toupper = __ctype_toupper; > + _M_tolower = __ctype_tolower; > + _M_table = __table ? __table : __ctype_b; > +#endif > + if (__sav) > + { > + setlocale(LC_CTYPE, __sav); > + delete [] __sav; > + } > + __builtin_memset(_M_widen, 0, sizeof(_M_widen)); > + __builtin_memset(_M_narrow, 0, sizeof(_M_narrow)); > + } > +#endif > + > +#if _GLIBCXX_C_LOCALE_GNU > + ctype::ctype(const mask* __table, bool __del, size_t __refs) > + : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), > + _M_del(__table != 0 && __del), > + _M_toupper(_M_c_locale_ctype->__ctype_toupper), > + _M_tolower(_M_c_locale_ctype->__ctype_tolower), > + _M_table(__table ? __table : _M_c_locale_ctype->__ctype_b), > + _M_widen_ok(0), _M_narrow_ok(0) > + { > + __builtin_memset(_M_widen, 0, sizeof(_M_widen)); > + __builtin_memset(_M_narrow, 0, sizeof(_M_narrow)); > + } > +#else > + ctype::ctype(const mask* __table, bool __del, size_t __refs) > + : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), > + _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0) > + { > + char* __old = setlocale(LC_CTYPE, NULL); > + char* __sav = NULL; > + if (__builtin_strcmp(__old, "C")) > + { > + const size_t __len = __builtin_strlen(__old) + 1; > + __sav = new char[__len]; > + __builtin_memcpy(__sav, __old, __len); > + setlocale(LC_CTYPE, "C"); > + } > +#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) > + _M_toupper = *__ctype_toupper_loc(); > + _M_tolower = *__ctype_tolower_loc(); > + _M_table = __table ? __table : *__ctype_b_loc(); > +#else > + _M_toupper = __ctype_toupper; > + _M_tolower = __ctype_tolower; > + _M_table = __table ? __table : __ctype_b; > +#endif > + if (__sav) > + { > + setlocale(LC_CTYPE, __sav); > + delete [] __sav; > + } > + __builtin_memset(_M_widen, 0, sizeof(_M_widen)); > + __builtin_memset(_M_narrow, 0, sizeof(_M_narrow)); > + } > +#endif > + > + char > + ctype::do_toupper(char __c) const > + { return _M_toupper[static_cast(__c)]; } > + > + const char* > + ctype::do_toupper(char* __low, const char* __high) const > + { > + while (__low < __high) > + { > + *__low = _M_toupper[static_cast(*__low)]; > + ++__low; > + } > + return __high; > + } > + > + char > + ctype::do_tolower(char __c) const > + { return _M_tolower[static_cast(__c)]; } > + > + const char* > + ctype::do_tolower(char* __low, const char* __high) const > + { > + while (__low < __high) > + { > + *__low = _M_tolower[static_cast(*__low)]; > + ++__low; > + } > + return __high; > + } > + > +_GLIBCXX_END_NAMESPACE_VERSION > +} // namespace > diff --git a/libstdc++-v3/config/os/gnu/ctype_inline.h b/libstdc++-v3/config/os/gnu/ctype_inline.h > new file mode 100644 > index 00000000000..af60239382f > --- /dev/null > +++ b/libstdc++-v3/config/os/gnu/ctype_inline.h > @@ -0,0 +1,76 @@ > +// Locale support -*- C++ -*- > + > +// Copyright (C) 2000-2022 Free Software Foundation, Inc. > +// > +// This file is part of the GNU ISO C++ Library. This library is free > +// software; you can redistribute it and/or modify it under the > +// terms of the GNU General Public License as published by the > +// Free Software Foundation; either version 3, or (at your option) > +// any later version. > + > +// This library is distributed in the hope that it will be useful, > +// but WITHOUT ANY WARRANTY; without even the implied warranty of > +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +// GNU General Public License for more details. > + > +// Under Section 7 of GPL version 3, you are granted additional > +// permissions described in the GCC Runtime Library Exception, version > +// 3.1, as published by the Free Software Foundation. > + > +// You should have received a copy of the GNU General Public License and > +// a copy of the GCC Runtime Library Exception along with this program; > +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > +// . > + > +/** @file bits/ctype_inline.h > + * This is an internal header file, included by other library headers. > + * Do not attempt to use it directly. @headername{locale} > + */ > + > +// > +// ISO C++ 14882: 22.1 Locales > +// > + > +// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) > +// functions go in ctype.cc > + > +namespace std _GLIBCXX_VISIBILITY(default) > +{ > +_GLIBCXX_BEGIN_NAMESPACE_VERSION > + > + bool > + ctype:: > + is(mask __m, char __c) const > + { return _M_table[static_cast(__c)] & __m; } > + > + const char* > + ctype:: > + is(const char* __low, const char* __high, mask* __vec) const > + { > + while (__low < __high) > + *__vec++ = _M_table[static_cast(*__low++)]; > + return __high; > + } > + > + const char* > + ctype:: > + scan_is(mask __m, const char* __low, const char* __high) const > + { > + while (__low < __high > + && !(_M_table[static_cast(*__low)] & __m)) > + ++__low; > + return __low; > + } > + > + const char* > + ctype:: > + scan_not(mask __m, const char* __low, const char* __high) const > + { > + while (__low < __high > + && (_M_table[static_cast(*__low)] & __m) != 0) > + ++__low; > + return __low; > + } > + > +_GLIBCXX_END_NAMESPACE_VERSION > +} // namespace > diff --git a/libstdc++-v3/config/os/gnu/os_defines.h b/libstdc++-v3/config/os/gnu/os_defines.h > new file mode 100644 > index 00000000000..b4226d95d28 > --- /dev/null > +++ b/libstdc++-v3/config/os/gnu/os_defines.h > @@ -0,0 +1,52 @@ > +// Specific definitions for GNU/Hurd -*- C++ -*- > + > +// Copyright (C) 2000-2022 Free Software Foundation, Inc. > +// > +// This file is part of the GNU ISO C++ Library. This library is free > +// software; you can redistribute it and/or modify it under the > +// terms of the GNU General Public License as published by the > +// Free Software Foundation; either version 3, or (at your option) > +// any later version. > + > +// This library is distributed in the hope that it will be useful, > +// but WITHOUT ANY WARRANTY; without even the implied warranty of > +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +// GNU General Public License for more details. > + > +// Under Section 7 of GPL version 3, you are granted additional > +// permissions described in the GCC Runtime Library Exception, version > +// 3.1, as published by the Free Software Foundation. > + > +// You should have received a copy of the GNU General Public License and > +// a copy of the GCC Runtime Library Exception along with this program; > +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > +// . > + > +/** @file bits/os_defines.h > + * This is an internal header file, included by other library headers. > + * Do not attempt to use it directly. @headername{iosfwd} > + */ > + > +#ifndef _GLIBCXX_OS_DEFINES > +#define _GLIBCXX_OS_DEFINES 1 > + > +// System-specific #define, typedefs, corrections, etc, go here. This > +// file will come before all others. > + > +// This keeps isalnum, et al from being propagated as macros. > +#define __NO_CTYPE 1 > + > +#include > + > +// Provide a declaration for the possibly deprecated gets function, as > +// glibc 2.15 and later does not declare gets for ISO C11 when > +// __GNU_SOURCE is defined. > +#if __GLIBC_PREREQ(2,15) && defined(_GNU_SOURCE) > +# undef _GLIBCXX_HAVE_GETS > +#endif > + > +// Glibc 2.23 removed the obsolete isinf and isnan declarations. Check the > +// version dynamically in case it has changed since libstdc++ was configured. > +#define _GLIBCXX_NO_OBSOLETE_ISINF_ISNAN_DYNAMIC __GLIBC_PREREQ(2,23) > + > +#endif > diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host > index ec32980aa0d..d03492eb8da 100644 > --- a/libstdc++-v3/configure.host > +++ b/libstdc++-v3/configure.host > @@ -258,7 +258,7 @@ case "${host_os}" in > linux-musl*) > os_include_dir="os/generic" > ;; > - gnu* | linux* | kfreebsd*-gnu | uclinux*) > + linux* | kfreebsd*-gnu | uclinux*) > if [ "$uclibc" = "yes" ]; then > os_include_dir="os/uclibc" > elif [ "$bionic" = "yes" ]; then > @@ -267,6 +267,9 @@ case "${host_os}" in > os_include_dir="os/gnu-linux" > fi > ;; > + gnu*) > + os_include_dir="os/gnu" > + ;; > hpux*) > os_include_dir="os/hpux" > ;; -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria.