From: Richard Earnshaw Date: Tue, 5 Dec 2000 14:05:34 +0000 (+0000) Subject: *.h: Move here from config/os/bsd/bits. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b971613deb9798ab70fb200a6c1f86caa8d736b;p=gcc.git *.h: Move here from config/os/bsd/bits. * config/os/freebsd/bits/*.h: Move here from config/os/bsd/bits. * aclocal.m4: Adjust accordingly. * configure.target: Likewise. * configure: Regenerate. From-SVN: r38036 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 927ae79307e..a70b982b55a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2000-12-05 Richard Earnshaw + + * config/os/freebsd/bits/*.h: Move here from config/os/bsd/bits. + * aclocal.m4: Adjust accordingly. + * configure.target: Likewise. + * configure: Regenerate. + 2000-12-05 Richard Earnshaw * config/cpu/arm/bits/atomicity.h: Add support for compiling Thumb diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index d45d6442dbf..c2c6f762f5d 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -829,7 +829,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [ ctype_bsd=yes, ctype_bsd=no) AC_MSG_RESULT($ctype_bsd) if test $ctype_bsd = "yes"; then - ctype_include_dir="config/os/bsd" + ctype_include_dir="config/os/freebsd" ctype_default=no fi fi @@ -845,7 +845,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [ ctype_freebsd34=yes, ctype_freebsd34=no) AC_MSG_RESULT($ctype_freebsd34) if test $ctype_freebsd34 = "yes"; then - ctype_include_dir="config/os/bsd" + ctype_include_dir="config/os/freebsd" ctype_default=no fi fi diff --git a/libstdc++-v3/config/os/bsd/bits/ctype_base.h b/libstdc++-v3/config/os/bsd/bits/ctype_base.h deleted file mode 100644 index 145321f5fee..00000000000 --- a/libstdc++-v3/config/os/bsd/bits/ctype_base.h +++ /dev/null @@ -1,78 +0,0 @@ -// 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 -// - -// Information as gleaned from /usr/include/ctype.h on FreeBSD 3.4, -// 4.0 and all versions of the CVS managed file at: -// :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs/src/include/ctype.h -// which should cover most classic BSD configurations - - struct ctype_base - { - typedef unsigned long mask; - // Non-standard typedefs. - typedef const int* __to_type; - - enum - { -#ifdef _CTYPE_S - // FreeBSD 4.0 uses this style of define. - space = _CTYPE_S, - print = _CTYPE_R, - cntrl = _CTYPE_C, - upper = _CTYPE_U, - lower = _CTYPE_L, - alpha = _CTYPE_A, - digit = _CTYPE_D, - punct = _CTYPE_P, - xdigit = _CTYPE_X, - alnum = _CTYPE_A | _CTYPE_D, - graph = _CTYPE_G -#else - // Other BSD's, including Free BSD 3.4, uses this style of define. - space = _S, - print = _R, - cntrl = _C, - upper = _U, - lower = _L, - alpha = _A, - digit = _D, - punct = _P, - xdigit = _X, - alnum = _A | _D, - graph = _G -#endif - }; - }; - - - diff --git a/libstdc++-v3/config/os/bsd/bits/ctype_inline.h b/libstdc++-v3/config/os/bsd/bits/ctype_inline.h deleted file mode 100644 index 92ffe703fd6..00000000000 --- a/libstdc++-v3/config/os/bsd/bits/ctype_inline.h +++ /dev/null @@ -1,78 +0,0 @@ -// 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() - { - if (__m & (digit | xdigit)) - return __isctype(__c, __m); - else - return __istype(__c, __m); - } - - const char* - ctype:: - is(const char* __low, const char* __high, mask* __vec) const throw() - { - // XXX - 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/bsd/bits/ctype_noninline.h b/libstdc++-v3/config/os/bsd/bits/ctype_noninline.h deleted file mode 100644 index 24fdcdb23ea..00000000000 --- a/libstdc++-v3/config/os/bsd/bits/ctype_noninline.h +++ /dev/null @@ -1,71 +0,0 @@ -// 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 -// - -// 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/bsd/bits/os_defines.h b/libstdc++-v3/config/os/bsd/bits/os_defines.h deleted file mode 100644 index 1cb71d149ec..00000000000 --- a/libstdc++-v3/config/os/bsd/bits/os_defines.h +++ /dev/null @@ -1,41 +0,0 @@ -// Specific definitions for BSD -*- 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. */ - - -#endif - - diff --git a/libstdc++-v3/config/os/freebsd/bits/ctype_base.h b/libstdc++-v3/config/os/freebsd/bits/ctype_base.h new file mode 100644 index 00000000000..145321f5fee --- /dev/null +++ b/libstdc++-v3/config/os/freebsd/bits/ctype_base.h @@ -0,0 +1,78 @@ +// 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 +// + +// Information as gleaned from /usr/include/ctype.h on FreeBSD 3.4, +// 4.0 and all versions of the CVS managed file at: +// :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs/src/include/ctype.h +// which should cover most classic BSD configurations + + struct ctype_base + { + typedef unsigned long mask; + // Non-standard typedefs. + typedef const int* __to_type; + + enum + { +#ifdef _CTYPE_S + // FreeBSD 4.0 uses this style of define. + space = _CTYPE_S, + print = _CTYPE_R, + cntrl = _CTYPE_C, + upper = _CTYPE_U, + lower = _CTYPE_L, + alpha = _CTYPE_A, + digit = _CTYPE_D, + punct = _CTYPE_P, + xdigit = _CTYPE_X, + alnum = _CTYPE_A | _CTYPE_D, + graph = _CTYPE_G +#else + // Other BSD's, including Free BSD 3.4, uses this style of define. + space = _S, + print = _R, + cntrl = _C, + upper = _U, + lower = _L, + alpha = _A, + digit = _D, + punct = _P, + xdigit = _X, + alnum = _A | _D, + graph = _G +#endif + }; + }; + + + diff --git a/libstdc++-v3/config/os/freebsd/bits/ctype_inline.h b/libstdc++-v3/config/os/freebsd/bits/ctype_inline.h new file mode 100644 index 00000000000..92ffe703fd6 --- /dev/null +++ b/libstdc++-v3/config/os/freebsd/bits/ctype_inline.h @@ -0,0 +1,78 @@ +// 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() + { + if (__m & (digit | xdigit)) + return __isctype(__c, __m); + else + return __istype(__c, __m); + } + + const char* + ctype:: + is(const char* __low, const char* __high, mask* __vec) const throw() + { + // XXX + 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/freebsd/bits/ctype_noninline.h b/libstdc++-v3/config/os/freebsd/bits/ctype_noninline.h new file mode 100644 index 00000000000..24fdcdb23ea --- /dev/null +++ b/libstdc++-v3/config/os/freebsd/bits/ctype_noninline.h @@ -0,0 +1,71 @@ +// 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 +// + +// 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/freebsd/bits/os_defines.h b/libstdc++-v3/config/os/freebsd/bits/os_defines.h new file mode 100644 index 00000000000..1cb71d149ec --- /dev/null +++ b/libstdc++-v3/config/os/freebsd/bits/os_defines.h @@ -0,0 +1,41 @@ +// Specific definitions for BSD -*- 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. */ + + +#endif + + diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 0f5aa143c5e..77c6967d04d 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -17844,7 +17844,7 @@ fi rm -f conftest* echo "$ac_t""$ctype_bsd" 1>&6 if test $ctype_bsd = "yes"; then - ctype_include_dir="config/os/bsd" + ctype_include_dir="config/os/freebsd" ctype_default=no fi fi @@ -17876,7 +17876,7 @@ fi rm -f conftest* echo "$ac_t""$ctype_freebsd34" 1>&6 if test $ctype_freebsd34 = "yes"; then - ctype_include_dir="config/os/bsd" + ctype_include_dir="config/os/freebsd" ctype_default=no fi fi diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target index 77db99e80a2..0b70d40803c 100644 --- a/libstdc++-v3/configure.target +++ b/libstdc++-v3/configure.target @@ -82,7 +82,7 @@ case "${target_os}" in os_include_dir="config/os/aix" ;; bsd* | freebsd* ) - os_include_dir="config/os/bsd" + os_include_dir="config/os/freebsd" ;; cygwin*) os_include_dir="config/os/newlib" @@ -115,6 +115,11 @@ esac # THIS TABLE IS SORTED. KEEP IT THAT WAY. case "${target}" in + arm*-*-aout | arm*-*-elf) + # Assume newlib + os_include_dir=config/os/newlib + ATOMICITYH=$cpu_include_dir + ;; *-*-aix*) ATOMICITYH=$os_include_dir ;;