From 11b176c156aecf09298da2f3be09507806fdad2b Mon Sep 17 00:00:00 2001 From: Richard Earnshaw Date: Tue, 5 Dec 2000 10:29:47 +0000 Subject: [PATCH] Support for NetBSD. * aclocal.m4: Add test for NetBSD's ctype support. * configure: Regenerate. * configure.target: Support NetBSD. * config/os/netbsd/bits/ctype_base.h: New file. * config/os/netbsd/bits/ctype_inline.h: New file. * config/os/netbsd/bits/ctype_noinline.h: New file. * config/os/netbsd/bits/os_defines.h: New file. From-SVN: r38032 --- libstdc++-v3/ChangeLog | 11 ++ libstdc++-v3/aclocal.m4 | 16 +++ .../config/os/netbsd/bits/ctype_base.h | 63 +++++++++ .../config/os/netbsd/bits/ctype_inline.h | 72 +++++++++++ .../config/os/netbsd/bits/ctype_noninline.h | 71 ++++++++++ .../config/os/netbsd/bits/os_defines.h | 47 +++++++ libstdc++-v3/configure | 122 +++++++++++------- libstdc++-v3/configure.target | 8 +- 8 files changed, 364 insertions(+), 46 deletions(-) create mode 100644 libstdc++-v3/config/os/netbsd/bits/ctype_base.h create mode 100644 libstdc++-v3/config/os/netbsd/bits/ctype_inline.h create mode 100644 libstdc++-v3/config/os/netbsd/bits/ctype_noninline.h create mode 100644 libstdc++-v3/config/os/netbsd/bits/os_defines.h diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ce3fb4a4691..5e2a9a33118 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2000-12-05 Richard Earnshaw + + Support for NetBSD. + * aclocal.m4: Add test for NetBSD's ctype support. + * configure: Regenerate. + * configure.target: Support NetBSD. + * config/os/netbsd/bits/ctype_base.h: New file. + * config/os/netbsd/bits/ctype_inline.h: New file. + * config/os/netbsd/bits/ctype_noinline.h: New file. + * config/os/netbsd/bits/os_defines.h: New file. + 2000-12-05 Gabriel Dos Reis * src/complex.cc (pow): Remove definitions for explicit diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 78a933afdca..d45d6442dbf 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -850,6 +850,22 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [ fi fi + dnl Test for functionality -- NetBSD + if test $ctype_default = "yes"; then + AC_MSG_CHECKING([ for NetBSD]) + AC_TRY_COMPILE([#include ], + [int + foo (int a) + { return _S + _C + _U + _L \ + + _N + _P + _X + _tolower_tab_[a] + _toupper_tab_[a];}], \ + ctype_netbsd=yes, ctype_netbsd=no) + AC_MSG_RESULT($ctype_netbsd) + if test $ctype_netbsd = "yes"; then + ctype_include_dir="config/os/netbsd" + ctype_default=no + fi + fi + dnl Test for functionality -- Solaris 2.6 and up if test $ctype_default = "yes"; then AC_MSG_CHECKING([ for Solaris 2.6,7,8]) diff --git a/libstdc++-v3/config/os/netbsd/bits/ctype_base.h b/libstdc++-v3/config/os/netbsd/bits/ctype_base.h new file mode 100644 index 00000000000..648d839d9a6 --- /dev/null +++ b/libstdc++-v3/config/os/netbsd/bits/ctype_base.h @@ -0,0 +1,63 @@ +// 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 NetBSD. +// Full details can be found from the CVS files at: +// anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h +// See www.netbsd.org for details of access. + + struct ctype_base + { + typedef unsigned char mask; + // Non-standard typedefs. + typedef const unsigned char* __to_type; + + enum + { + // NetBSD + space = _S, + print = _P | _U | _L | _N | _B, + cntrl = _C, + upper = _U, + lower = _L, + alpha = _U | _L, + digit = _N, + punct = _P, + xdigit = _N | _X, + alnum = _U | _L | _N, + graph = _P | _U | _L | _N, + }; + }; + + + diff --git a/libstdc++-v3/config/os/netbsd/bits/ctype_inline.h b/libstdc++-v3/config/os/netbsd/bits/ctype_inline.h new file mode 100644 index 00000000000..952b0da8c98 --- /dev/null +++ b/libstdc++-v3/config/os/netbsd/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/netbsd/bits/ctype_noninline.h b/libstdc++-v3/config/os/netbsd/bits/ctype_noninline.h new file mode 100644 index 00000000000..c5b3370cda7 --- /dev/null +++ b/libstdc++-v3/config/os/netbsd/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 ? (_ctype_ + 1) : __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/netbsd/bits/os_defines.h b/libstdc++-v3/config/os/netbsd/bits/os_defines.h new file mode 100644 index 00000000000..6115e97714b --- /dev/null +++ b/libstdc++-v3/config/os/netbsd/bits/os_defines.h @@ -0,0 +1,47 @@ +// Specific definitions for NetBSD -*- 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 + + +/* Settings for NetBSD. */ + +/* __off_t is a typedef declared in stdio.h. */ +/* #define __off_t off_t */ + +/* We don't have off64_t */ +/* #define __off64_t off64_t */ + +#define __ssize_t ssize_t + +#endif + + diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index bb40e4690b7..0f5aa143c5e 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -17882,13 +17882,45 @@ rm -f conftest* fi if test $ctype_default = "yes"; then - echo $ac_n "checking for Solaris 2.6,7,8""... $ac_c" 1>&6 -echo "configure:17887: checking for Solaris 2.6,7,8" >&5 + echo $ac_n "checking for NetBSD""... $ac_c" 1>&6 +echo "configure:17887: checking for NetBSD" >&5 cat > conftest.$ac_ext < int main() { +int + foo (int a) + { return _S + _C + _U + _L \ + + _N + _P + _X + _tolower_tab_[a] + _toupper_tab_[a];} +; return 0; } +EOF +if { (eval echo configure:17899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + \ + ctype_netbsd=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ctype_netbsd=no +fi +rm -f conftest* + echo "$ac_t""$ctype_netbsd" 1>&6 + if test $ctype_netbsd = "yes"; then + ctype_include_dir="config/os/netbsd" + ctype_default=no + fi + fi + + if test $ctype_default = "yes"; then + echo $ac_n "checking for Solaris 2.6,7,8""... $ac_c" 1>&6 +echo "configure:17919: checking for Solaris 2.6,7,8" >&5 + cat > conftest.$ac_ext < +int main() { int foo (int a) { return _ISSPACE + _ISPRINT + _ISCNTRL + _ISUPPER + _ISLOWER + _ISALPHA \ @@ -17896,7 +17928,7 @@ int + __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];} ; return 0; } EOF -if { (eval echo configure:17900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris=yes @@ -17911,7 +17943,7 @@ rm -f conftest* if test $ctype_solaris = "yes"; then echo $ac_n "checking for version""... $ac_c" 1>&6 -echo "configure:17915: checking for version" >&5 +echo "configure:17947: checking for version" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -17920,14 +17952,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { typedef long* __to_type; __to_type const& _M_toupper = __trans_upper; ; return 0; } EOF -if { (eval echo configure:17931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris26=yes @@ -17959,9 +17991,9 @@ cross_compiling=$ac_cv_prog_cc_cross if test $ctype_default = "yes"; then echo $ac_n "checking for Solaris 2.5.1""... $ac_c" 1>&6 -echo "configure:17963: checking for Solaris 2.5.1" >&5 +echo "configure:17995: checking for Solaris 2.5.1" >&5 cat > conftest.$ac_ext < int main() { @@ -17971,7 +18003,7 @@ int + __ctype[a];} ; return 0; } EOF -if { (eval echo configure:17975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris25=yes @@ -17991,9 +18023,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:17995: checking for AIX" >&5 +echo "configure:18027: checking for AIX" >&5 cat > conftest.$ac_ext < int main() { @@ -18004,7 +18036,7 @@ int + _VALC('a') + _IS('c', 0);} ; return 0; } EOF -if { (eval echo configure:18008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_aix=yes @@ -18024,9 +18056,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for IRIX""... $ac_c" 1>&6 -echo "configure:18028: checking for IRIX" >&5 +echo "configure:18060: checking for IRIX" >&5 cat > conftest.$ac_ext < int main() { @@ -18036,7 +18068,7 @@ int _A + _PR + _G + _BL;} ; return 0; } EOF -if { (eval echo configure:18040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_irix=yes @@ -18056,9 +18088,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for newlib""... $ac_c" 1>&6 -echo "configure:18060: checking for newlib" >&5 +echo "configure:18092: checking for newlib" >&5 cat > conftest.$ac_ext < int main() { @@ -18068,7 +18100,7 @@ int + _ctype_[a];} ; return 0; } EOF -if { (eval echo configure:18072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_newlib=yes @@ -18108,12 +18140,12 @@ fi for ac_func in strtof do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18112: checking for $ac_func" >&5 +echo "configure:18144: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18162,7 +18194,7 @@ done echo $ac_n "checking for strtold declaration""... $ac_c" 1>&6 -echo "configure:18166: checking for strtold declaration" >&5 +echo "configure:18198: checking for strtold declaration" >&5 if eval "test \"`echo '$''{'glibcpp_cv_func_strtold_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18176,14 +18208,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { strtold(0, 0); ; return 0; } EOF -if { (eval echo configure:18187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_strtold_use=yes else @@ -18208,12 +18240,12 @@ fi for ac_func in strtold do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18212: checking for $ac_func" >&5 +echo "configure:18244: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18270,17 +18302,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18274: checking for $ac_hdr" >&5 +echo "configure:18306: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18309,12 +18341,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18313: checking for $ac_func" >&5 +echo "configure:18345: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18362,7 +18394,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:18366: checking for working mmap" >&5 +echo "configure:18398: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18370,7 +18402,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -18621,17 +18653,17 @@ rm -f confcache ac_safe=`echo "locale.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for locale.h""... $ac_c" 1>&6 -echo "configure:18625: checking for locale.h" >&5 +echo "configure:18657: checking for locale.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18649,19 +18681,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:18653: checking for LC_MESSAGES" >&5 +echo "configure:18685: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:18665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_val_LC_MESSAGES=yes else @@ -18703,14 +18735,14 @@ INTERFACE=v3 # Check for the interface version number for specifying where header # files are installed, if a version number is provided. echo $ac_n "checking for interface version number""... $ac_c" 1>&6 -echo "configure:18707: checking for interface version number" >&5 +echo "configure:18739: checking for interface version number" >&5 libstdcxx_interface=$INTERFACE echo "$ac_t""$libstdcxx_interface" 1>&6 # Process the option --with-gxx-include-dir= echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6 -echo "configure:18714: checking for --with-gxx-include-dir" >&5 +echo "configure:18746: checking for --with-gxx-include-dir" >&5 # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. if test "${with_gxx_include_dir+set}" = set; then withval="$with_gxx_include_dir" @@ -18744,7 +18776,7 @@ fi # Process the option "--enable-version-specific-runtime-libs" echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 -echo "configure:18748: checking for --enable-version-specific-runtime-libs" >&5 +echo "configure:18780: checking for --enable-version-specific-runtime-libs" >&5 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. if test "${enable_version_specific_runtime_libs+set}" = set; then enableval="$enable_version_specific_runtime_libs" diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target index 774149fc8c9..77db99e80a2 100644 --- a/libstdc++-v3/configure.target +++ b/libstdc++-v3/configure.target @@ -81,7 +81,7 @@ case "${target_os}" in aix*) os_include_dir="config/os/aix" ;; - bsd* | freebsd*) + bsd* | freebsd* ) os_include_dir="config/os/bsd" ;; cygwin*) @@ -93,6 +93,9 @@ case "${target_os}" in irix*) os_include_dir="config/os/irix" ;; + netbsd*) + os_include_dir="config/os/netbsd" + ;; solaris2.5*) os_include_dir="config/os/solaris/solaris2.5" ;; @@ -124,6 +127,9 @@ case "${target}" in *-*-linux*) ATOMICITYH=$cpu_include_dir ;; + *-*-netbsd*) + ATOMICITYH=$cpu_include_dir + ;; sparc*-*-*) ATOMICITYH=$cpu_include_dir ;; -- 2.30.2