From 598730fe6e7b2da6bbc72a7a5a1cdd189381e9e7 Mon Sep 17 00:00:00 2001 From: Jeffrey A Law Date: Wed, 6 Dec 2000 03:23:34 +0000 Subject: [PATCH] configure.target (hpux): Set os_include_dir. * configure.target (hpux): Set os_include_dir. * config/os/hpux/bits/ctype_base.h: New file * config/os/hpux/bits/ctype_inline.h: New file * config/os/hpux/bits/ctype_noinline.h: New file * config/os/hpux/bits/os_defines.h: New file Forgot to commit last week... From-SVN: r38061 --- libstdc++-v3/ChangeLog | 8 +++ libstdc++-v3/config/os/hpux/bits/ctype_base.h | 59 +++++++++++++++ .../config/os/hpux/bits/ctype_inline.h | 72 +++++++++++++++++++ .../config/os/hpux/bits/ctype_noninline.h | 71 ++++++++++++++++++ libstdc++-v3/config/os/hpux/bits/os_defines.h | 44 ++++++++++++ libstdc++-v3/configure.target | 3 + 6 files changed, 257 insertions(+) create mode 100644 libstdc++-v3/config/os/hpux/bits/ctype_base.h create mode 100644 libstdc++-v3/config/os/hpux/bits/ctype_inline.h create mode 100644 libstdc++-v3/config/os/hpux/bits/ctype_noninline.h create mode 100644 libstdc++-v3/config/os/hpux/bits/os_defines.h diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c3227ce03ef..33e1661d7e4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +Tue Dec 5 20:24:15 2000 Jeffrey A Law (law@cygnus.com) + + * configure.target (hpux): Set os_include_dir. + * config/os/hpux/bits/ctype_base.h: New file + * config/os/hpux/bits/ctype_inline.h: New file + * config/os/hpux/bits/ctype_noinline.h: New file + * config/os/hpux/bits/os_defines.h: New file + 2000-12-05 Alexandre Petit-Bianco * src/Makefile.am (libstdc++.INC): Revert for libjava builds. diff --git a/libstdc++-v3/config/os/hpux/bits/ctype_base.h b/libstdc++-v3/config/os/hpux/bits/ctype_base.h new file mode 100644 index 00000000000..8b5e0a07252 --- /dev/null +++ b/libstdc++-v3/config/os/hpux/bits/ctype_base.h @@ -0,0 +1,59 @@ +// Locale support -*- C++ -*- + +// Copyright (C) 1997-1999 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 2, 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. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 22.1 Locales +// + +// Default information, may not be appropriate for specific host. + + struct ctype_base + { + typedef unsigned int mask; + // Non-standard typedefs. + typedef const int* __to_type; + + enum + { + space = (1 << 5), // Whitespace + print = (1 << 6), // Printing + cntrl = (1 << 9), // Control character + upper = (1 << 0), // UPPERCASE + lower = (1 << 1), // lowercase + alpha = (1 << 5), // Alphabetic + digit = (1 << 2), // Numeric + punct = (1 << 10),// Punctuation + xdigit = (1 << 4),// Hexadecimal numeric + alnum = (1 << 11),// Alphanumeric + graph = (1 << 7) // Graphical + }; + }; + + + diff --git a/libstdc++-v3/config/os/hpux/bits/ctype_inline.h b/libstdc++-v3/config/os/hpux/bits/ctype_inline.h new file mode 100644 index 00000000000..952b0da8c98 --- /dev/null +++ b/libstdc++-v3/config/os/hpux/bits/ctype_inline.h @@ -0,0 +1,72 @@ +// Locale support -*- C++ -*- + +// Copyright (C) 2000 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 2, 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. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 22.1 Locales +// + +// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) +// functions go in ctype.cc + + bool + ctype:: + is(mask __m, char __c) const throw() + { return _M_table[(unsigned char)(__c)] & __m; } + + const char* + ctype:: + is(const char* __low, const char* __high, mask* __vec) const throw() + { + while (__low < __high) + *__vec++ = _M_table[(unsigned char)(*__low++)]; + return __high; + } + + const char* + ctype:: + scan_is(mask __m, const char* __low, const char* __high) const throw() + { + while (__low < __high && !this->is(__m, *__low)) + ++__low; + return __low; + } + + const char* + ctype:: + scan_not(mask __m, const char* __low, const char* __high) const throw() + { + while (__low < __high && this->is(__m, *__low) != 0) + ++__low; + return __low; + } + + + + + diff --git a/libstdc++-v3/config/os/hpux/bits/ctype_noninline.h b/libstdc++-v3/config/os/hpux/bits/ctype_noninline.h new file mode 100644 index 00000000000..bc99064b0dc --- /dev/null +++ b/libstdc++-v3/config/os/hpux/bits/ctype_noninline.h @@ -0,0 +1,71 @@ +// Locale support -*- C++ -*- + +// Copyright (C) 1997-1999, 2000 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 2, 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. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 22.1 Locales +// + +// Information as gleaned from /usr/include/ctype.h + + ctype::ctype(const mask* __table = 0, bool __del = false, + size_t __refs = 0) + : _Ctype_nois(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_ctable(NULL), _M_table(__table == 0 ? _M_ctable: __table) + { } + + 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; + } diff --git a/libstdc++-v3/config/os/hpux/bits/os_defines.h b/libstdc++-v3/config/os/hpux/bits/os_defines.h new file mode 100644 index 00000000000..35834395463 --- /dev/null +++ b/libstdc++-v3/config/os/hpux/bits/os_defines.h @@ -0,0 +1,44 @@ +// Specific definitions for generic platforms -*- C++ -*- + +// Copyright (C) 2000 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 2, 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. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + + +#ifndef _GLIBCPP_OS_DEFINES +# define _GLIBCPP_OS_DEFINES + + +/* System-specific #define, typedefs, corrections, etc, go here. This + file will come before all others. */ + +#define __off_t off_t +#define __off64_t off64_t +#define __ssize_t ssize_t + +#endif + + diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target index 0b70d40803c..ac4e172dd2e 100644 --- a/libstdc++-v3/configure.target +++ b/libstdc++-v3/configure.target @@ -105,6 +105,9 @@ case "${target_os}" in solaris2.7* | solaris2.8*) os_include_dir="config/os/solaris/solaris2.7" ;; + hpux) + os_include_dir="config/os/hpux" + ;; *) os_include_dir="config/os/generic" ;; -- 2.30.2