From patchwork Mon Oct 8 19:45:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kettenis X-Patchwork-Id: 190115 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 4CB5D2C0315 for ; Tue, 9 Oct 2012 06:45:30 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1350330330; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:Message-Id:From:To:CC:In-reply-to:Subject:References: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=RUadfpHH+e/6gu7uCW+h lgh2KpQ=; b=icGqO2/bA2+uzm86Qtx4GkiF5RYqWJ3ZsUwGzC2BQxLBAS0E8/51 +b11Z/3om0OMKJReLWxo15xBuqTsBfWH+e9HHmEJuGhKg3hcsP6Qqolr0Fmx71cE 6xePGP7WC4UfhFDyzy4E8kZEPcsTx0VDBtnq1AIWz/42X+12f1Rczzk= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:Message-Id:From:To:CC:In-reply-to:Subject:References:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=dNTEnDKNCOo9nxWXo3eHhbS8PVBF18Z+CFkYRG7DgEqrS0r9ym++7m/zdNLae6 hY6JgwkvghqK55lTLPnt3L1jnRIOsjVTmcVQfI90oG23c3GEgSaY5Rh3cijQuoET mIztvCTGq2jUio2JRakAXQfqcb+r6/zin8Du+n8vL88Pg=; Received: (qmail 7520 invoked by alias); 8 Oct 2012 19:45:23 -0000 Received: (qmail 7509 invoked by uid 22791); 8 Oct 2012 19:45:20 -0000 X-SWARE-Spam-Status: No, hits=-4.0 required=5.0 tests=AWL, BAYES_00, KHOP_THREADED, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from sibelius.xs4all.nl (HELO glazunov.sibelius.xs4all.nl) (83.163.83.176) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 08 Oct 2012 19:45:13 +0000 Received: from glazunov.sibelius.xs4all.nl (kettenis@localhost [127.0.0.1]) by glazunov.sibelius.xs4all.nl (8.14.5/8.14.3) with ESMTP id q98JjBLK030992; Mon, 8 Oct 2012 21:45:11 +0200 (CEST) Received: (from kettenis@localhost) by glazunov.sibelius.xs4all.nl (8.14.5/8.14.3/Submit) id q98Jj9P8011913; Mon, 8 Oct 2012 21:45:09 +0200 (CEST) Date: Mon, 8 Oct 2012 21:45:09 +0200 (CEST) Message-Id: <201210081945.q98Jj9P8011913@glazunov.sibelius.xs4all.nl> From: Mark Kettenis To: jwakely.gcc@gmail.com CC: libstdc++@gnu.org, gcc-patches@gcc.gnu.org In-reply-to: (message from Jonathan Wakely on Mon, 10 Sep 2012 09:04:24 +0100) Subject: Re: [PATCH, libstdc++] Add proper OpenBSD support References: <201209041926.q84JQcjb003985@glazunov.sibelius.xs4all.nl> <201209100634.q8A6YtLe024584@glazunov.sibelius.xs4all.nl> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Jonathan, Any further thoughts about this? I've attached a diff that combines my origional diff with the change to use the "newlib" locale model on OpenBSD since they probably should be committed together. > > > On 10 September 2012 07:34, Mark Kettenis wrote: > > >> Date: Sun, 9 Sep 2012 21:07:39 +0100 > > >> From: Jonathan Wakely > > >> > > >> On 4 September 2012 20:26, Mark Kettenis wrote: > > >> > Fixes a few testcases. Mostly based on the existing > > >> > NetBSD/FreeBSD/Darwin code. > > >> > > > >> > 2012-09-04 Mark Kettenis > > >> > > > >> > * configure.host (*-*-openbsd*) Set cpu_include_dir. > > >> > * config/os/bsd/openbsd/ctype_base.h: New file. > > >> > * config/os/bsd/openbsd/ctype_configure_char.cc: New file. > > >> > * config/os/bsd/openbsd/ctype_inline.h: New file. > > >> > * config/os/bsd/openbsd/os_defines.h: New file. > > >> > > >> This patch is OK, thanks. Do you want me to commit it for you? > > > > > > Yes please. > > > > It occurs to me now that the patch changes the size of > > ctype_base::mask, from the generic unsigned to char. I assume the > > OpenBSD system compiler uses char? How long has that change been > > present in the OpenBSD source tree? > > Yes, the system compile uses char and has been doing so since mid-2005. > > > I'm not sure whether or not it's better to change the size of that > > type in GCC 4.8, which would break compatibility with previous > > versions of the FSF sources but provide compatibility with the OpenBSD > > system compiler. My guess would be that most people on OpenBSD are > > using the system compiler not upstream FSF sources. > > Indeed. People either use the system compiler or install one from > ports/packages. Given the sorry state of OpenBSD support in the FSF > source tree (barely buildable) I think binary compatibility with the > system compiler is more important. 2012-10-08 Mark Kettenis * configure.host (*-*-openbsd*) Set cpu_include_dir. * config/os/bsd/openbsd/ctype_base.h: New file. * config/os/bsd/openbsd/ctype_configure_char.cc: New file. * config/os/bsd/openbsd/ctype_inline.h: New file. * config/os/bsd/openbsd/os_defines.h: New file. * acinclude.m4 (GLIBCXX_ENABLE_CLOCALE): Use newlib locale model for OpenBSD. * configure: Regenerated. Index: acinclude.m4 =================================================================== --- acinclude.m4 (revision 192154) +++ acinclude.m4 (working copy) @@ -1862,6 +1862,9 @@ darwin* | freebsd*) enable_clocale_flag=darwin ;; + openbsd*) + enable_clocale_flag=newlib + ;; *) if test x"$with_newlib" = x"yes"; then enable_clocale_flag=newlib Index: config/os/bsd/openbsd/ctype_base.h =================================================================== --- config/os/bsd/openbsd/ctype_base.h (revision 0) +++ config/os/bsd/openbsd/ctype_base.h (working copy) @@ -0,0 +1,59 @@ +// Locale support -*- C++ -*- + +// Copyright (C) 2000, 2009, 2012 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 +// . + +// +// ISO C++ 14882: 22.1 Locales +// + +// Information as gleaned from /usr/include/ctype.h on OpenBSD. + +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + /// @brief Base class for ctype. + struct ctype_base + { + // Non-standard typedefs. + typedef const short* __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 char mask; + + static const mask upper = _U; + static const mask lower = _L; + static const mask alpha = _U | _L; + static const mask digit = _N; + static const mask xdigit = _N | _X; + static const mask space = _S; + static const mask print = _P | _U | _L | _N | _B; + static const mask graph = _P | _U | _L | _N; + static const mask cntrl = _C; + static const mask punct = _P; + static const mask alnum = _U | _L | _N; + }; + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace Index: config/os/bsd/openbsd/ctype_configure_char.cc =================================================================== --- config/os/bsd/openbsd/ctype_configure_char.cc (revision 0) +++ config/os/bsd/openbsd/ctype_configure_char.cc (working copy) @@ -0,0 +1,99 @@ +// Locale support -*- C++ -*- + +// Copyright (C) 2011 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 + + const ctype_base::mask* + ctype::classic_table() throw() + { return _ctype_ + 1; } + + ctype::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_table(__table ? __table : classic_table()) + { + memset(_M_widen, 0, sizeof(_M_widen)); + _M_widen_ok = 0; + memset(_M_narrow, 0, sizeof(_M_narrow)); + _M_narrow_ok = 0; + } + + ctype::ctype(const mask* __table, bool __del, size_t __refs) + : facet(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_table(__table ? __table : classic_table()) + { + memset(_M_widen, 0, sizeof(_M_widen)); + _M_widen_ok = 0; + memset(_M_narrow, 0, sizeof(_M_narrow)); + _M_narrow_ok = 0; + } + + char + ctype::do_toupper(char __c) const + { return ::toupper((int) __c); } + + const char* + ctype::do_toupper(char* __low, const char* __high) const + { + while (__low < __high) + { + *__low = ::toupper((int) *__low); + ++__low; + } + return __high; + } + + char + ctype::do_tolower(char __c) const + { return ::tolower((int) __c); } + + const char* + ctype::do_tolower(char* __low, const char* __high) const + { + while (__low < __high) + { + *__low = ::tolower((int) *__low); + ++__low; + } + return __high; + } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace Index: config/os/bsd/openbsd/ctype_inline.h =================================================================== --- config/os/bsd/openbsd/ctype_inline.h (revision 0) +++ config/os/bsd/openbsd/ctype_inline.h (working copy) @@ -0,0 +1,74 @@ +// Locale support -*- C++ -*- + +// Copyright (C) 2010 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 && !this->is(__m, *__low)) + ++__low; + return __low; + } + + const char* + ctype:: + scan_not(mask __m, const char* __low, const char* __high) const + { + while (__low < __high && this->is(__m, *__low) != 0) + ++__low; + return __low; + } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace Index: config/os/bsd/openbsd/os_defines.h =================================================================== --- config/os/bsd/openbsd/os_defines.h (revision 0) +++ config/os/bsd/openbsd/os_defines.h (working copy) @@ -0,0 +1,41 @@ +// Specific definitions for OpenBSD -*- C++ -*- + +// Copyright (C) 2000, 2002, 2009, 2012 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. + +#define _GLIBCXX_USE_C99_DYNAMIC (!(__ISO_C_VISIBLE >= 1999)) +#define _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC _GLIBCXX_USE_C99_DYNAMIC +#define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC _GLIBCXX_USE_C99_DYNAMIC +#define _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC _GLIBCXX_USE_C99_DYNAMIC + +#endif Index: configure.host =================================================================== --- configure.host (revision 192154) +++ configure.host (working copy) @@ -291,6 +291,9 @@ netbsd*) os_include_dir="os/bsd/netbsd" ;; + openbsd*) + os_include_dir="os/bsd/openbsd" + ;; qnx6.[12]*) os_include_dir="os/qnx/qnx6.1" c_model=c