From 9aab6de79e349b8f48b998ef9fdead9ad4f12f42 Mon Sep 17 00:00:00 2001 From: pme Date: Mon, 20 Oct 2003 18:27:17 +0000 Subject: [PATCH] 2003-10-20 Phil Edwards * configure.ac: Fix comment typo. * configure.host: Add vxworks to host_os switch. * crossconfig.m4: Remove old commented os_include_dir variables left over from autotools transition. (*-vxworks): New stanza. (*-windiss): Add missing symbols. * configure: Regenerate. * config/os/vxworks/ctype_base.h, config/os/vxworks/ctype_inline.h, config/os/vxworks/ctype_noninline.h, config/os/vxworks/os_defines.h: New files. * config/os/windiss/os_defines.h: Define __C9X__. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72710 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 14 ++ libstdc++-v3/config/os/vxworks/ctype_base.h | 59 +++++++ libstdc++-v3/config/os/vxworks/ctype_inline.h | 71 ++++++++ libstdc++-v3/config/os/vxworks/ctype_noninline.h | 81 +++++++++ libstdc++-v3/config/os/vxworks/os_defines.h | 37 ++++ libstdc++-v3/config/os/windiss/os_defines.h | 1 + libstdc++-v3/configure | 215 ++++++++++++++++++++--- libstdc++-v3/configure.ac | 2 +- libstdc++-v3/configure.host | 3 + libstdc++-v3/crossconfig.m4 | 51 +++++- 10 files changed, 499 insertions(+), 35 deletions(-) create mode 100644 libstdc++-v3/config/os/vxworks/ctype_base.h create mode 100644 libstdc++-v3/config/os/vxworks/ctype_inline.h create mode 100644 libstdc++-v3/config/os/vxworks/ctype_noninline.h create mode 100644 libstdc++-v3/config/os/vxworks/os_defines.h diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 35dcde6d261..6706b0f4ea3 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2003-10-20 Phil Edwards + + * configure.ac: Fix comment typo. + * configure.host: Add vxworks to host_os switch. + * crossconfig.m4: Remove old commented os_include_dir variables + left over from autotools transition. + (*-vxworks): New stanza. + (*-windiss): Add missing symbols. + * configure: Regenerate. + * config/os/vxworks/ctype_base.h, config/os/vxworks/ctype_inline.h, + config/os/vxworks/ctype_noninline.h, config/os/vxworks/os_defines.h: + New files. + * config/os/windiss/os_defines.h: Define __C9X__. + 2003-10-19 David Edelsohn PR other/12506 diff --git a/libstdc++-v3/config/os/vxworks/ctype_base.h b/libstdc++-v3/config/os/vxworks/ctype_base.h new file mode 100644 index 00000000000..2a34561618f --- /dev/null +++ b/libstdc++-v3/config/os/vxworks/ctype_base.h @@ -0,0 +1,59 @@ +// Locale support -*- C++ -*- + +// Copyright (C) 1997, 1998, 1999, 2003 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 extracted from target/h/ctype.h. + + struct ctype_base + { + // Non-standard typedefs. + typedef const unsigned char* __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 char mask; + static const mask upper = _C_UPPER; + static const mask lower = _C_LOWER; + static const mask alpha = _C_UPPER | _C_LOWER; + static const mask digit = _C_NUMBER; + static const mask xdigit = _C_HEX_NUMBER; + static const mask space = _C_WHITE_SPACE | _C_CONTROL; + static const mask print = (_C_UPPER | _C_LOWER | _C_NUMBER + | _C_WHITE_SPACE | _C_PUNCT); + static const mask graph = _C_UPPER | _C_LOWER | _C_NUMBER | _C_PUNCT; + static const mask cntrl = _C_CONTROL; + static const mask punct = _C_PUNCT; + static const mask alnum = _C_UPPER | _C_LOWER | _C_NUMBER; + }; + + + diff --git a/libstdc++-v3/config/os/vxworks/ctype_inline.h b/libstdc++-v3/config/os/vxworks/ctype_inline.h new file mode 100644 index 00000000000..f5cc78b8e75 --- /dev/null +++ b/libstdc++-v3/config/os/vxworks/ctype_inline.h @@ -0,0 +1,71 @@ +// Locale support -*- C++ -*- + +// Copyright (C) 2000, 2003 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 target/h/ctype.h + +// 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 + { return __ctype[static_cast(__c)] & __m; } + + const char* + ctype:: + is(const char* __low, const char* __high, mask* __vec) const + { + while (__low < __high) + *__vec++ = __ctype[static_cast(*__low++)]; + return __high; + } + + const char* + ctype:: + scan_is(mask __m, const char* __low, const char* __high) const + { + while (__low < __high + && !(__ctype[static_cast(*__low)] & __m)) + ++__low; + return __low; + } + + const char* + ctype:: + scan_not(mask __m, const char* __low, const char* __high) const + { + while (__low < __high + && (__ctype[static_cast(*__low)] & __m)) + ++__low; + return __low; + } diff --git a/libstdc++-v3/config/os/vxworks/ctype_noninline.h b/libstdc++-v3/config/os/vxworks/ctype_noninline.h new file mode 100644 index 00000000000..adb7cfdeb27 --- /dev/null +++ b/libstdc++-v3/config/os/vxworks/ctype_noninline.h @@ -0,0 +1,81 @@ +// Locale support -*- C++ -*- + +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// 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 target/h/ctype.h + + const ctype_base::mask* + ctype::classic_table() throw() + { return __ctype; } + + ctype::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) + : __ctype_abstract_base(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_table(__table ? __table : classic_table()) + { } + + ctype::ctype(const mask* __table, bool __del, size_t __refs) + : __ctype_abstract_base(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), _M_tolower(NULL), + _M_table(__table ? __table : classic_table()) + { } + + char + ctype::do_toupper(char __c) const + { return __toupper(__c); } + + const char* + ctype::do_toupper(char* __low, const char* __high) const + { + while (__low < __high) + { + *__low = __toupper(*__low); + ++__low; + } + return __high; + } + + char + ctype::do_tolower(char __c) const + { return __tolower(__c); } + + const char* + ctype::do_tolower(char* __low, const char* __high) const + { + while (__low < __high) + { + *__low = __tolower(*__low); + ++__low; + } + return __high; + } diff --git a/libstdc++-v3/config/os/vxworks/os_defines.h b/libstdc++-v3/config/os/vxworks/os_defines.h new file mode 100644 index 00000000000..c5f04ff6357 --- /dev/null +++ b/libstdc++-v3/config/os/vxworks/os_defines.h @@ -0,0 +1,37 @@ +// Specific definitions for VxWorks -*- C++ -*- + +// Copyright (C) 2000, 2003 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 1 + +// System-specific #define, typedefs, corrections, etc, go here. This +// file will come before all others. + +#endif diff --git a/libstdc++-v3/config/os/windiss/os_defines.h b/libstdc++-v3/config/os/windiss/os_defines.h index b7aa2a1ff4d..136733ee8e2 100644 --- a/libstdc++-v3/config/os/windiss/os_defines.h +++ b/libstdc++-v3/config/os/windiss/os_defines.h @@ -33,5 +33,6 @@ // System-specific #define, typedefs, corrections, etc, go here. This // file will come before all others. +#define __C9X__ 1 // for sinf etc #endif diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index c888d97abcb..4f1966cc1af 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -971,7 +971,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -1170,7 +1170,7 @@ _ASBOX echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && + rm -f core *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -2800,8 +2800,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - ''\ - '#include ' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2815,8 +2814,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -3126,8 +3125,7 @@ else fi fi for ac_declaration in \ - ''\ - '#include ' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -3141,8 +3139,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -4267,7 +4265,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4270 "configure"' > conftest.$ac_ext + echo '#line 4268 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4871,7 +4869,7 @@ fi; # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 4874 "configure" +#line 4872 "configure" struct S { ~S(); }; void bar(); void foo() @@ -5459,7 +5457,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -5650,7 +5648,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) enable_clocale_flag=generic fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi @@ -7806,7 +7804,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_sectionLDflags=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test "$ac_test_CFLAGS" = set; then CFLAGS="$ac_save_CFLAGS" @@ -27439,7 +27437,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_mmap_fixed_mapped=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 @@ -46885,7 +46883,6 @@ _ACEOF ;; *-freebsd*) - #os_include_dir="os/bsd/freebsd" @@ -47139,7 +47136,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_sectionLDflags=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test "$ac_test_CFLAGS" = set; then CFLAGS="$ac_save_CFLAGS" @@ -49033,7 +49030,6 @@ _ACEOF fi ;; *-hpux*) - #os_include_dir="os/hpux" @@ -49282,7 +49278,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_sectionLDflags=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test "$ac_test_CFLAGS" = set; then CFLAGS="$ac_save_CFLAGS" @@ -51045,7 +51041,6 @@ _ACEOF esac ;; *-linux* | *-uclinux* | *-gnu*) - #os_include_dir="os/gnu-linux" @@ -51294,7 +51289,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_sectionLDflags=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test "$ac_test_CFLAGS" = set; then CFLAGS="$ac_save_CFLAGS" @@ -53079,7 +53074,6 @@ _ACEOF fi ;; *-mingw32*) - #os_include_dir="os/mingw32" @@ -53315,7 +53309,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_sectionLDflags=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test "$ac_test_CFLAGS" = set; then CFLAGS="$ac_save_CFLAGS" @@ -55034,7 +55028,6 @@ echo "${ECHO_T}$enable_wchar_t" >&6 ;; *-netbsd*) - #os_include_dir="os/bsd/netbsd" @@ -55283,7 +55276,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_sectionLDflags=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test "$ac_test_CFLAGS" = set; then CFLAGS="$ac_save_CFLAGS" @@ -57056,7 +57049,6 @@ _ACEOF fi ;; *-qnx6.1* | *-qnx6.2*) - #os_include_dir="os/qnx/qnx6.1" SECTION_FLAGS='-ffunction-sections -fdata-sections' @@ -57150,7 +57142,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_sectionLDflags=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test "$ac_test_CFLAGS" = set; then CFLAGS="$ac_save_CFLAGS" @@ -60589,29 +60581,134 @@ _ACEOF _ACEOF ;; + *-vxworks) + cat >>confdefs.h <<\_ACEOF +#define HAVE_MMAP 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_ACOSF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_ASINF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_ATAN2F 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_ATANF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_CEILF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_COSF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_COSHF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_EXPF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_FABSF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_FLOORF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_FMODF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_HYPOT 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_LOG10F 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_LOGF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_POWF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_SINF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_SINHF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_SQRTF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_TANF 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_TANHF 1 +_ACEOF + + ;; *-windiss*) - #os_include_dir="os/windiss" cat >>confdefs.h <<\_ACEOF #define HAVE_ACOSF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_ACOSL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_ASINF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_ASINL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_ATAN2F 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_ATAN2L 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_ATANF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_ATANL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_CEILF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_CEILL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_COPYSIGN 1 _ACEOF @@ -60624,38 +60721,74 @@ _ACEOF _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_COSL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_COSHF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_COSHL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_EXPF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_EXPL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_FABSF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_FABSL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_FLOORF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_FLOORL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_FMODF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_FMODL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_FREXPF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_FREXPL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_LDEXPF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_LDEXPL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_LOG10F 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_LOG10L 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_LOGF 1 _ACEOF @@ -60664,29 +60797,57 @@ _ACEOF _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_MODFL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_POWF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_POWL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_SINF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_SINL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_SINHF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_SINHL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_SQRTF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_SQRTL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_TANF 1 _ACEOF cat >>confdefs.h <<\_ACEOF +#define HAVE_TANL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_TANHF 1 _ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_TANHL 1 +_ACEOF + ;; *) { { echo "$as_me:$LINENO: error: No support for this host/target combination." >&5 diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index 893b6f8a946..7549202b8c3 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -297,7 +297,7 @@ AC_SUBST(LIBSUPCXX_PICFLAGS) dnl In autoconf 2.5x, AC_OUTPUT is replaced by four AC_CONFIG_* macros, dnl which can all be called multiple times as needed, plus one (different) -dnl AC_OUPUT macro. This one lists the files to be created: +dnl AC_OUTPUT macro. This one lists the files to be created: AC_CONFIG_FILES( \ Makefile \ AC_FOREACH([DIR], glibcxx_SUBDIRS, [DIR/Makefile ]) diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host index 6f2c54e1554..de19fcabc62 100644 --- a/libstdc++-v3/configure.host +++ b/libstdc++-v3/configure.host @@ -186,6 +186,9 @@ case "${host_os}" in solaris2.[789] | solaris2.1[0-9]) os_include_dir="os/solaris/solaris2.7" ;; + vxworks) + os_include_dir="os/vxworks" + ;; windiss*) os_include_dir="os/windiss" ;; diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4 index ce4dca51216..7bd3bacabd3 100644 --- a/libstdc++-v3/crossconfig.m4 +++ b/libstdc++-v3/crossconfig.m4 @@ -43,7 +43,6 @@ case "${host}" in ;; *-freebsd*) - #os_include_dir="os/bsd/freebsd" AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \ machine/endian.h machine/param.h sys/machine.h sys/types.h \ fp.h locale.h float.h inttypes.h sys/resource.h sys/stat.h \ @@ -101,7 +100,6 @@ case "${host}" in fi ;; *-hpux*) - #os_include_dir="os/hpux" AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \ machine/endian.h machine/param.h sys/machine.h sys/types.h \ fp.h locale.h float.h inttypes.h]) @@ -126,7 +124,6 @@ case "${host}" in esac ;; *-linux* | *-uclinux* | *-gnu*) - #os_include_dir="os/gnu-linux" AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \ machine/endian.h machine/param.h sys/machine.h sys/types.h \ fp.h locale.h float.h inttypes.h]) @@ -155,14 +152,12 @@ case "${host}" in fi ;; *-mingw32*) - #os_include_dir="os/mingw32" AC_CHECK_HEADERS([sys/types.h locale.h float.h]) GLIBCXX_CHECK_LINKER_FEATURES GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT GLIBCXX_CHECK_WCHAR_T_SUPPORT ;; *-netbsd*) - #os_include_dir="os/bsd/netbsd" AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \ machine/endian.h machine/param.h sys/machine.h sys/types.h \ fp.h locale.h float.h inttypes.h]) @@ -188,7 +183,6 @@ case "${host}" in fi ;; *-qnx6.1* | *-qnx6.2*) - #os_include_dir="os/qnx/qnx6.1" SECTION_FLAGS='-ffunction-sections -fdata-sections' AC_SUBST(SECTION_FLAGS) GLIBCXX_CHECK_LINKER_FEATURES @@ -330,32 +324,75 @@ case "${host}" in AC_DEFINE(HAVE_MODFF) AC_DEFINE(HAVE_HYPOT) ;; + *-vxworks) + AC_DEFINE(HAVE_MMAP) + AC_DEFINE(HAVE_ACOSF) + AC_DEFINE(HAVE_ASINF) + AC_DEFINE(HAVE_ATAN2F) + AC_DEFINE(HAVE_ATANF) + AC_DEFINE(HAVE_CEILF) + AC_DEFINE(HAVE_COSF) + AC_DEFINE(HAVE_COSHF) + AC_DEFINE(HAVE_EXPF) + AC_DEFINE(HAVE_FABSF) + AC_DEFINE(HAVE_FLOORF) + AC_DEFINE(HAVE_FMODF) + AC_DEFINE(HAVE_HYPOT) + AC_DEFINE(HAVE_LOG10F) + AC_DEFINE(HAVE_LOGF) + AC_DEFINE(HAVE_POWF) + AC_DEFINE(HAVE_SINF) + AC_DEFINE(HAVE_SINHF) + AC_DEFINE(HAVE_SQRTF) + AC_DEFINE(HAVE_TANF) + AC_DEFINE(HAVE_TANHF) + ;; *-windiss*) - #os_include_dir="os/windiss" AC_DEFINE(HAVE_ACOSF) + AC_DEFINE(HAVE_ACOSL) AC_DEFINE(HAVE_ASINF) + AC_DEFINE(HAVE_ASINL) AC_DEFINE(HAVE_ATAN2F) + AC_DEFINE(HAVE_ATAN2L) AC_DEFINE(HAVE_ATANF) + AC_DEFINE(HAVE_ATANL) AC_DEFINE(HAVE_CEILF) + AC_DEFINE(HAVE_CEILL) AC_DEFINE(HAVE_COPYSIGN) AC_DEFINE(HAVE_COPYSIGNF) AC_DEFINE(HAVE_COSF) + AC_DEFINE(HAVE_COSL) AC_DEFINE(HAVE_COSHF) + AC_DEFINE(HAVE_COSHL) AC_DEFINE(HAVE_EXPF) + AC_DEFINE(HAVE_EXPL) AC_DEFINE(HAVE_FABSF) + AC_DEFINE(HAVE_FABSL) AC_DEFINE(HAVE_FLOORF) + AC_DEFINE(HAVE_FLOORL) AC_DEFINE(HAVE_FMODF) + AC_DEFINE(HAVE_FMODL) AC_DEFINE(HAVE_FREXPF) + AC_DEFINE(HAVE_FREXPL) AC_DEFINE(HAVE_LDEXPF) + AC_DEFINE(HAVE_LDEXPL) AC_DEFINE(HAVE_LOG10F) + AC_DEFINE(HAVE_LOG10L) AC_DEFINE(HAVE_LOGF) AC_DEFINE(HAVE_MODFF) + AC_DEFINE(HAVE_MODFL) AC_DEFINE(HAVE_POWF) + AC_DEFINE(HAVE_POWL) AC_DEFINE(HAVE_SINF) + AC_DEFINE(HAVE_SINL) AC_DEFINE(HAVE_SINHF) + AC_DEFINE(HAVE_SINHL) AC_DEFINE(HAVE_SQRTF) + AC_DEFINE(HAVE_SQRTL) AC_DEFINE(HAVE_TANF) + AC_DEFINE(HAVE_TANL) AC_DEFINE(HAVE_TANHF) + AC_DEFINE(HAVE_TANHL) ;; *) AC_MSG_ERROR([No support for this host/target combination.]) -- 2.11.0