diff options
Diffstat (limited to 'gcc-4.4.3/libstdc++-v3')
| -rw-r--r-- | gcc-4.4.3/libstdc++-v3/acinclude.m4 | 9 | ||||
| -rw-r--r-- | gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_base.h | 57 | ||||
| -rw-r--r-- | gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_inline.h | 71 | ||||
| -rw-r--r-- | gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_noninline.h | 98 | ||||
| -rw-r--r-- | gcc-4.4.3/libstdc++-v3/config/os/bionic/os_defines.h | 36 | ||||
| -rwxr-xr-x | gcc-4.4.3/libstdc++-v3/configure | 36 | ||||
| -rw-r--r-- | gcc-4.4.3/libstdc++-v3/configure.host | 2 |
7 files changed, 299 insertions, 10 deletions
diff --git a/gcc-4.4.3/libstdc++-v3/acinclude.m4 b/gcc-4.4.3/libstdc++-v3/acinclude.m4 index 186916c2e..195015bd2 100644 --- a/gcc-4.4.3/libstdc++-v3/acinclude.m4 +++ b/gcc-4.4.3/libstdc++-v3/acinclude.m4 @@ -124,7 +124,7 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [ ## (Right now, this only matters for enable_wchar_t, but nothing prevents ## other macros from doing the same. This should be automated.) -pme - # Check for uClibc since Linux platforms use different configuration + # Check for C library flavor since Linux platforms use different configuration # directories depending on the C library in use. AC_EGREP_CPP([_using_uclibc], [ #include <stdio.h> @@ -133,6 +133,13 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [ #endif ], uclibc=yes, uclibc=no) + AC_EGREP_CPP([_using_bionic], [ + #include <stdio.h> + #if __BIONIC__ + _using_bionic + #endif + ], bionic=yes, bionic=no) + # Find platform-specific directories containing configuration info. # Also possibly modify flags used elsewhere, as needed by the platform. GLIBCXX_CHECK_HOST diff --git a/gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_base.h b/gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_base.h new file mode 100644 index 000000000..15f00636d --- /dev/null +++ b/gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_base.h @@ -0,0 +1,57 @@ +// 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 +// <http://www.gnu.org/licenses/>. + +// +// ISO C++ 14882: 22.1 Locales +// + +// Information as gleaned from /usr/include/ctype.h, for solaris2.5.1 + +// Support for Solaris 2.5.1 + +_GLIBCXX_BEGIN_NAMESPACE(std) + + /// @brief Base class for ctype. + struct ctype_base + { + // Non-standard typedefs. + typedef const int* __to_type; + + // NB: Offsets into ctype<char>::_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 = _X | _N; + 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 diff --git a/gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_inline.h b/gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_inline.h new file mode 100644 index 000000000..2c88eb66d --- /dev/null +++ b/gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_inline.h @@ -0,0 +1,71 @@ +// 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 +// <http://www.gnu.org/licenses/>. + +/** @file ctype_inline.h + * This is an internal header file, included by other library headers. + * You should not attempt to use it directly. + */ + +// +// ISO C++ 14882: 22.1 Locales +// + +// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) +// functions go in ctype.cc + +_GLIBCXX_BEGIN_NAMESPACE(std) + + bool + ctype<char>:: + is(mask __m, char __c) const + { return _M_table[static_cast<unsigned char>(__c)] & __m; } + + const char* + ctype<char>:: + is(const char* __low, const char* __high, mask* __vec) const + { + while (__low < __high) + *__vec++ = _M_table[static_cast<unsigned char>(*__low++)]; + return __high; + } + + const char* + ctype<char>:: + scan_is(mask __m, const char* __low, const char* __high) const + { + while (__low < __high && !this->is(__m, *__low)) + ++__low; + return __low; + } + + const char* + ctype<char>:: + 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 diff --git a/gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_noninline.h b/gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_noninline.h new file mode 100644 index 000000000..55eecd871 --- /dev/null +++ b/gcc-4.4.3/libstdc++-v3/config/os/bionic/ctype_noninline.h @@ -0,0 +1,98 @@ +// 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 +// <http://www.gnu.org/licenses/>. + +/** @file ctype_noninline.h + * This is an internal header file, included by other library headers. + * You should not attempt to use it directly. + */ + +// +// ISO C++ 14882: 22.1 Locales +// + +// Information as gleaned from /usr/include/ctype.h + + const ctype_base::mask* + ctype<char>::classic_table() throw() + { return _ctype_ + 1; } + + ctype<char>::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<char>::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<char>::do_toupper(char __c) const + { + int __x = __c; + return (this->is(ctype_base::lower, __c) ? (__x - 'a' + 'A') : __x); + } + + const char* + ctype<char>::do_toupper(char* __low, const char* __high) const + { + while (__low < __high) + { + *__low = this->do_toupper(*__low); + ++__low; + } + return __high; + } + + char + ctype<char>::do_tolower(char __c) const + { + int __x = __c; + return (this->is(ctype_base::upper, __c) ? (__x - 'A' + 'a') : __x); + } + + const char* + ctype<char>::do_tolower(char* __low, const char* __high) const + { + while (__low < __high) + { + *__low = this->do_tolower(*__low); + ++__low; + } + return __high; + } + diff --git a/gcc-4.4.3/libstdc++-v3/config/os/bionic/os_defines.h b/gcc-4.4.3/libstdc++-v3/config/os/bionic/os_defines.h new file mode 100644 index 000000000..832592acd --- /dev/null +++ b/gcc-4.4.3/libstdc++-v3/config/os/bionic/os_defines.h @@ -0,0 +1,36 @@ +// Specific definitions for Bionic -*- 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 +// <http://www.gnu.org/licenses/>. + +/** @file os_defines.h + * This is an internal header file, included by other library headers. + * You should not attempt to use it directly. + */ + +#ifndef _GLIBCXX_OS_DEFINES +#define _GLIBCXX_OS_DEFINES 1 + +// System-specific #define, typedefs, corrections, etc, go here. This +// file will come before all others. + +#endif diff --git a/gcc-4.4.3/libstdc++-v3/configure b/gcc-4.4.3/libstdc++-v3/configure index e6a726244..6922a6c7a 100755 --- a/gcc-4.4.3/libstdc++-v3/configure +++ b/gcc-4.4.3/libstdc++-v3/configure @@ -4131,7 +4131,7 @@ fi ## (Right now, this only matters for enable_wchar_t, but nothing prevents ## other macros from doing the same. This should be automated.) -pme - # Check for uClibc since Linux platforms use different configuration + # Check for C library flavor since Linux platforms use different configuration # directories depending on the C library in use. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4155,6 +4155,24 @@ fi rm -f conftest* +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include <stdio.h> + #if __BIONIC__ + _using_bionic + #endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "_using_bionic" >/dev/null 2>&1; then : + bionic=yes +else + bionic=no +fi +rm -f conftest* + + # Find platform-specific directories containing configuration info. # Also possibly modify flags used elsewhere, as needed by the platform. @@ -5730,7 +5748,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5733 "configure"' > conftest.$ac_ext + echo '#line 5751 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -11257,7 +11275,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11260 "configure" +#line 11278 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11353,7 +11371,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11356 "configure" +#line 11374 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14607,7 +14625,7 @@ fi; # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 14610 "configure" +#line 14628 "configure" struct S { ~S(); }; void bar(); void foo() @@ -14779,7 +14797,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for a builtins test. cat > conftest.$ac_ext << EOF -#line 14782 "configure" +#line 14800 "configure" int main() { typedef bool atomic_type; @@ -14818,7 +14836,7 @@ echo "${ECHO_T}$enable_atomic_builtinsb" >&6 rm -f conftest* cat > conftest.$ac_ext << EOF -#line 14821 "configure" +#line 14839 "configure" int main() { typedef short atomic_type; @@ -14857,7 +14875,7 @@ echo "${ECHO_T}$enable_atomic_builtinss" >&6 rm -f conftest* cat > conftest.$ac_ext << EOF -#line 14860 "configure" +#line 14878 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -14897,7 +14915,7 @@ echo "${ECHO_T}$enable_atomic_builtinsi" >&6 rm -f conftest* cat > conftest.$ac_ext << EOF -#line 14900 "configure" +#line 14918 "configure" int main() { typedef long long atomic_type; diff --git a/gcc-4.4.3/libstdc++-v3/configure.host b/gcc-4.4.3/libstdc++-v3/configure.host index 68ba288ec..c623bde23 100644 --- a/gcc-4.4.3/libstdc++-v3/configure.host +++ b/gcc-4.4.3/libstdc++-v3/configure.host @@ -233,6 +233,8 @@ case "${host_os}" in gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) if [ "$uclibc" = "yes" ]; then os_include_dir="os/uclibc" + elif [ "$bionic" = "yes" ]; then + os_include_dir="os/bionic" else os_include_dir="os/gnu-linux" fi |