From 23d2c3da1f7f0d51240001b45f58c6cff4fe3e63 Mon Sep 17 00:00:00 2001 From: kan Date: Sat, 19 May 2007 02:42:17 +0000 Subject: This commit was generated by cvs2svn to compensate for changes in r169708, which included commits to RCS files with non-trunk default branches. --- contrib/libstdc++/src/allocator.cc | 170 ------------------------ contrib/libstdc++/src/globals_locale.cc | 210 ------------------------------ contrib/libstdc++/src/io-inst.cc | 59 --------- contrib/libstdc++/src/locale-misc-inst.cc | 47 ------- 4 files changed, 486 deletions(-) delete mode 100644 contrib/libstdc++/src/allocator.cc delete mode 100644 contrib/libstdc++/src/globals_locale.cc delete mode 100644 contrib/libstdc++/src/io-inst.cc delete mode 100644 contrib/libstdc++/src/locale-misc-inst.cc (limited to 'contrib/libstdc++/src') diff --git a/contrib/libstdc++/src/allocator.cc b/contrib/libstdc++/src/allocator.cc deleted file mode 100644 index 4953d01..0000000 --- a/contrib/libstdc++/src/allocator.cc +++ /dev/null @@ -1,170 +0,0 @@ -// Allocator details. - -// Copyright (C) 2004 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: -// - -#include -#include -#include -#include - -namespace __gnu_internal -{ - __glibcxx_mutex_define_initialized(palloc_init_mutex); -} - -namespace __gnu_cxx -{ - // Definitions for __pool_alloc_base. - __pool_alloc_base::_Obj* volatile* - __pool_alloc_base::_M_get_free_list(size_t __bytes) - { - size_t __i = ((__bytes + (size_t)_S_align - 1) / (size_t)_S_align - 1); - return _S_free_list + __i; - } - - mutex_type& - __pool_alloc_base::_M_get_mutex() - { return __gnu_internal::palloc_init_mutex; } - - // Allocate memory in large chunks in order to avoid fragmenting the - // heap too much. Assume that __n is properly aligned. We hold the - // allocation lock. - char* - __pool_alloc_base::_M_allocate_chunk(size_t __n, int& __nobjs) - { - char* __result; - size_t __total_bytes = __n * __nobjs; - size_t __bytes_left = _S_end_free - _S_start_free; - - if (__bytes_left >= __total_bytes) - { - __result = _S_start_free; - _S_start_free += __total_bytes; - return __result ; - } - else if (__bytes_left >= __n) - { - __nobjs = (int)(__bytes_left / __n); - __total_bytes = __n * __nobjs; - __result = _S_start_free; - _S_start_free += __total_bytes; - return __result; - } - else - { - // Try to make use of the left-over piece. - if (__bytes_left > 0) - { - _Obj* volatile* __free_list = _M_get_free_list(__bytes_left); - ((_Obj*)(void*)_S_start_free)->_M_free_list_link = *__free_list; - *__free_list = (_Obj*)(void*)_S_start_free; - } - - size_t __bytes_to_get = (2 * __total_bytes - + _M_round_up(_S_heap_size >> 4)); - try - { - _S_start_free = static_cast(::operator new(__bytes_to_get)); - } - catch (...) - { - // Try to make do with what we have. That can't hurt. We - // do not try smaller requests, since that tends to result - // in disaster on multi-process machines. - size_t __i = __n; - for (; __i <= (size_t) _S_max_bytes; __i += (size_t) _S_align) - { - _Obj* volatile* __free_list = _M_get_free_list(__i); - _Obj* __p = *__free_list; - if (__p != 0) - { - *__free_list = __p->_M_free_list_link; - _S_start_free = (char*)__p; - _S_end_free = _S_start_free + __i; - return _M_allocate_chunk(__n, __nobjs); - // Any leftover piece will eventually make it to the - // right free list. - } - } - // What we have wasn't enough. Rethrow. - _S_start_free = _S_end_free = 0; // We have no chunk. - __throw_exception_again; - } - _S_heap_size += __bytes_to_get; - _S_end_free = _S_start_free + __bytes_to_get; - return _M_allocate_chunk(__n, __nobjs); - } - } - - // Returns an object of size __n, and optionally adds to "size - // __n"'s free list. We assume that __n is properly aligned. We - // hold the allocation lock. - void* - __pool_alloc_base::_M_refill(size_t __n) - { - int __nobjs = 20; - char* __chunk = _M_allocate_chunk(__n, __nobjs); - _Obj* volatile* __free_list; - _Obj* __result; - _Obj* __current_obj; - _Obj* __next_obj; - - if (__nobjs == 1) - return __chunk; - __free_list = _M_get_free_list(__n); - - // Build free list in chunk. - __result = (_Obj*)(void*)__chunk; - *__free_list = __next_obj = (_Obj*)(void*)(__chunk + __n); - for (int __i = 1; ; __i++) - { - __current_obj = __next_obj; - __next_obj = (_Obj*)(void*)((char*)__next_obj + __n); - if (__nobjs - 1 == __i) - { - __current_obj->_M_free_list_link = 0; - break; - } - else - __current_obj->_M_free_list_link = __next_obj; - } - return __result; - } - - __pool_alloc_base::_Obj* volatile __pool_alloc_base::_S_free_list[_S_free_list_size]; - - char* __pool_alloc_base::_S_start_free = 0; - - char* __pool_alloc_base::_S_end_free = 0; - - size_t __pool_alloc_base::_S_heap_size = 0; -} // namespace __gnu_cxx diff --git a/contrib/libstdc++/src/globals_locale.cc b/contrib/libstdc++/src/globals_locale.cc deleted file mode 100644 index 67192c4..0000000 --- a/contrib/libstdc++/src/globals_locale.cc +++ /dev/null @@ -1,210 +0,0 @@ -// Copyright (C) 2001, 2002, 2003, 2004 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. - -#include - -// On AIX, and perhaps other systems, library initialization order is -// not guaranteed. For example, the static initializers for the main -// program might run before the static initializers for this library. -// That means that we cannot rely on static initialization in the -// library; there is no guarantee that things will get initialized in -// time. This file contains definitions of all global variables that -// require initialization as arrays of characters. - -// NB: asm directives can rename these non-exported, namespace -// __gnu_cxx symbols into exported, namespace std symbols with the -// appropriate symbol version name. -// The rename syntax is -// asm (".symver currentname,oldname@@GLIBCXX_3.2") -// In macro form: -// _GLIBCXX_ASM_SYMVER(currentname, oldname, GLIBCXX_3.2) - -namespace __gnu_internal -{ - using namespace std; - - typedef char fake_locale_Impl[sizeof(locale::_Impl)] - __attribute__ ((aligned(__alignof__(locale::_Impl)))); - fake_locale_Impl c_locale_impl; - - typedef char fake_locale[sizeof(locale)] - __attribute__ ((aligned(__alignof__(locale)))); - fake_locale c_locale; - - typedef char fake_name_vec[sizeof(char*)] - __attribute__ ((aligned(__alignof__(char*)))); - fake_name_vec name_vec[6 + _GLIBCXX_NUM_CATEGORIES]; - - typedef char fake_names[sizeof(char[2])] - __attribute__ ((aligned(__alignof__(char[2])))); - fake_names name_c[6 + _GLIBCXX_NUM_CATEGORIES]; - - typedef char fake_facet_vec[sizeof(locale::facet*)] - __attribute__ ((aligned(__alignof__(locale::facet*)))); - fake_facet_vec facet_vec[_GLIBCXX_NUM_FACETS]; - - typedef char fake_cache_vec[sizeof(locale::facet*)] - __attribute__ ((aligned(__alignof__(locale::facet*)))); - fake_cache_vec cache_vec[_GLIBCXX_NUM_FACETS]; - - typedef char fake_ctype_c[sizeof(std::ctype)] - __attribute__ ((aligned(__alignof__(std::ctype)))); - fake_ctype_c ctype_c; - - typedef char fake_collate_c[sizeof(std::collate)] - __attribute__ ((aligned(__alignof__(std::collate)))); - fake_collate_c collate_c; - - typedef char fake_numpunct_c[sizeof(numpunct)] - __attribute__ ((aligned(__alignof__(numpunct)))); - fake_numpunct_c numpunct_c; - - typedef char fake_num_get_c[sizeof(num_get)] - __attribute__ ((aligned(__alignof__(num_get)))); - fake_num_get_c num_get_c; - - typedef char fake_num_put_c[sizeof(num_put)] - __attribute__ ((aligned(__alignof__(num_put)))); - fake_num_put_c num_put_c; - - typedef char fake_codecvt_c[sizeof(codecvt)] - __attribute__ ((aligned(__alignof__(codecvt)))); - fake_codecvt_c codecvt_c; - - typedef char fake_moneypunct_c[sizeof(moneypunct)] - __attribute__ ((aligned(__alignof__(moneypunct)))); - fake_moneypunct_c moneypunct_ct; - fake_moneypunct_c moneypunct_cf; - - typedef char fake_money_get_c[sizeof(money_get)] - __attribute__ ((aligned(__alignof__(money_get)))); - fake_money_get_c money_get_c; - - typedef char fake_money_put_c[sizeof(money_put)] - __attribute__ ((aligned(__alignof__(money_put)))); - fake_money_put_c money_put_c; - - typedef char fake_timepunct_c[sizeof(__timepunct)] - __attribute__ ((aligned(__alignof__(__timepunct)))); - fake_timepunct_c timepunct_c; - - typedef char fake_time_get_c[sizeof(time_get)] - __attribute__ ((aligned(__alignof__(time_get)))); - fake_time_get_c time_get_c; - - typedef char fake_time_put_c[sizeof(time_put)] - __attribute__ ((aligned(__alignof__(time_put)))); - fake_time_put_c time_put_c; - - typedef char fake_messages_c[sizeof(messages)] - __attribute__ ((aligned(__alignof__(messages)))); - fake_messages_c messages_c; - -#ifdef _GLIBCXX_USE_WCHAR_T - typedef char fake_wtype_w[sizeof(std::ctype)] - __attribute__ ((aligned(__alignof__(std::ctype)))); - fake_wtype_w ctype_w; - - typedef char fake_wollate_w[sizeof(std::collate)] - __attribute__ ((aligned(__alignof__(std::collate)))); - fake_wollate_w collate_w; - - typedef char fake_numpunct_w[sizeof(numpunct)] - __attribute__ ((aligned(__alignof__(numpunct)))); - fake_numpunct_w numpunct_w; - - typedef char fake_num_get_w[sizeof(num_get)] - __attribute__ ((aligned(__alignof__(num_get)))); - fake_num_get_w num_get_w; - - typedef char fake_num_put_w[sizeof(num_put)] - __attribute__ ((aligned(__alignof__(num_put)))); - fake_num_put_w num_put_w; - - typedef char fake_wodecvt_w[sizeof(codecvt)] - __attribute__ ((aligned(__alignof__(codecvt)))); - fake_wodecvt_w codecvt_w; - - typedef char fake_moneypunct_w[sizeof(moneypunct)] - __attribute__ ((aligned(__alignof__(moneypunct)))); - fake_moneypunct_w moneypunct_wt; - fake_moneypunct_w moneypunct_wf; - - typedef char fake_money_get_w[sizeof(money_get)] - __attribute__ ((aligned(__alignof__(money_get)))); - fake_money_get_w money_get_w; - - typedef char fake_money_put_w[sizeof(money_put)] - __attribute__ ((aligned(__alignof__(money_put)))); - fake_money_put_w money_put_w; - - typedef char fake_timepunct_w[sizeof(__timepunct)] - __attribute__ ((aligned(__alignof__(__timepunct)))); - fake_timepunct_w timepunct_w; - - typedef char fake_time_get_w[sizeof(time_get)] - __attribute__ ((aligned(__alignof__(time_get)))); - fake_time_get_w time_get_w; - - typedef char fake_time_put_w[sizeof(time_put)] - __attribute__ ((aligned(__alignof__(time_put)))); - fake_time_put_w time_put_w; - - typedef char fake_messages_w[sizeof(messages)] - __attribute__ ((aligned(__alignof__(messages)))); - fake_messages_w messages_w; -#endif - - // Storage for "C" locale caches. - typedef char fake_num_cache_c[sizeof(std::__numpunct_cache)] - __attribute__ ((aligned(__alignof__(std::__numpunct_cache)))); - fake_num_cache_c numpunct_cache_c; - - typedef char fake_money_cache_c[sizeof(std::__moneypunct_cache)] - __attribute__ ((aligned(__alignof__(std::__moneypunct_cache)))); - fake_money_cache_c moneypunct_cache_ct; - fake_money_cache_c moneypunct_cache_cf; - - typedef char fake_time_cache_c[sizeof(std::__timepunct_cache)] - __attribute__ ((aligned(__alignof__(std::__timepunct_cache)))); - fake_time_cache_c timepunct_cache_c; - -#ifdef _GLIBCXX_USE_WCHAR_T - typedef char fake_num_cache_w[sizeof(std::__numpunct_cache)] - __attribute__ ((aligned(__alignof__(std::__numpunct_cache)))); - fake_num_cache_w numpunct_cache_w; - - typedef char fake_money_cache_w[sizeof(std::__moneypunct_cache)] - __attribute__ ((aligned(__alignof__(std::__moneypunct_cache)))); - fake_money_cache_w moneypunct_cache_wt; - fake_money_cache_w moneypunct_cache_wf; - - typedef char fake_time_cache_w[sizeof(std::__timepunct_cache)] - __attribute__ ((aligned(__alignof__(std::__timepunct_cache)))); - fake_time_cache_w timepunct_cache_w; -#endif -} // namespace __gnu_internal diff --git a/contrib/libstdc++/src/io-inst.cc b/contrib/libstdc++/src/io-inst.cc deleted file mode 100644 index 0b407ef..0000000 --- a/contrib/libstdc++/src/io-inst.cc +++ /dev/null @@ -1,59 +0,0 @@ -// Explicit instantiation file. - -// 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: -// - -#include -#include - -namespace std -{ - // basic_ios - template class basic_ios; -#ifdef _GLIBCXX_USE_WCHAR_T - template class basic_ios; -#endif - - // iomanip - template class _Setfill; - template _Setfill setfill(char); -#ifdef _GLIBCXX_USE_WCHAR_T - template class _Setfill; - template _Setfill setfill(wchar_t); -#endif - - // iostream - template class basic_iostream; -#ifdef _GLIBCXX_USE_WCHAR_T - template class basic_iostream; -#endif -} // namespace std diff --git a/contrib/libstdc++/src/locale-misc-inst.cc b/contrib/libstdc++/src/locale-misc-inst.cc deleted file mode 100644 index e7ecb03..0000000 --- a/contrib/libstdc++/src/locale-misc-inst.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Locale support -*- C++ -*- - -// Copyright (C) 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 -// - -#include - -namespace std -{ - template - int - __convert_from_v(char*, const int, const char*, double, - const __c_locale&, int); - - template - int - __convert_from_v(char*, const int, const char*, long double, - const __c_locale&, int); -} // namespace std -- cgit v1.1