| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
--enable-cstdio=stdio the default. Disable wide character support
in that event.
* configure.in: Move GLIBCPP_ENABLE_C_MBCHAR after
(GLIBCPP_ENABLE_CSTDIO).
* config/c_io_stdio.h: Don't include <libio.h>, don't define
__c_wfile_type.
* aclocal.m4: Regenerated.
* configure: Likewise.
* Makefile.in: Likewise.
* libio/Makefile.in: Likewise.
* libmath/Makefile.in: Likewise.
* libsupc++/Makefile.in: Likewise.
* src/Makefile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37509 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
* src/Makefile.am (libstdc___la_LIBADD): Use it.
* aclocal.m4: Regenerated.
* configure: Likewise.
* Makefile.in: Likewise.
* libio/Makefile.in: Likewise.
* libmath/Makefile.in: Likewise.
* libsupc++/Makefile.in: Likewise.
* src/Makfile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37491 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPOR): Set LIBS back to
initial value.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* include/bits/c++config (__GLIBCPP__): Set release version for 2.91.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37457 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* acinclude.m4 (GLIBCPP_CHECK_TARGET): New macro, replacing
GLIBCPP_CHECK_CPU and GLIBCPP_CHECK_OS, sourcing configure.target.
(GLIBCPP_CONFIGURE): Call new macro here.
* configure.host: Cleanup.
* configure.in: Remove those two macros.
* configure.target: New file.
* aclocal.m4: Regenerated.
* configure: Ditto.
* Makefile.in: Ditto.
* libio/Makefile.in: Ditto.
* libmath/Makefile.in: Ditto.
* libsupc++/Makefile.in: Ditto.
* src/Makefile.in: Ditto.
* mkcheck.in: Use libtool. Split things out into functions.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37443 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
| |
* Makefile.am (tmp-libstdsc++.INC:): Do not use -I$(top_builddir).
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37442 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* include/c_std/bits/wrap_langinfo.h: New file.
* include/c_std/langinfo.h: New file.
* include/bits/codecvt.h (__enc_trants::__enc_traits()): Bring in
CODESET from _C_legacy::CODESET if using shadow headers.
* src/Makefile.am: Add new files.
* src/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37437 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
| |
_M_fill_insert and fill_n<..., unsigned long,...> .
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37324 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
| |
* aclocal.m4, configure, */Makefile.in: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37245 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* acinclude.m4 (GLIBCPP_CHECK_OS): Add AIX target selecting threads
flag based on multilib definition of $CXX.
* mknumeric_limits (LDFLAGS): Add AIX target linking with pthreads
based on multilib definition of $CXX.
* config/os/aix/bits/os_defines.h (_G_USING_THUNKS): Define as 0.
2000-11-03 Phil Edwards <pme@sources.redhat.com>
* acinclude.m4: Cleanups.
* aclocal.m4: Regenerated.
* configure: Ditto.
* Makefile.in: Ditto.
* libio/Makefile.in: Ditto.
* libmath/Makefile.in: Ditto.
* libsupc++/Makefile.in: Ditto.
* src/Makefile.in: Ditto.
* docs/install.html: Removal of EGCS.
* docs/23_containers/wrappers_h.txt: Likewise.
* docs/faq/index.html: Likewise.
* docs/faq/index.txt: Regenerated.
* docs/thanks.html: More people.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37241 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
| |
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37219 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* aclocal.m4: Regenerated.
* Makefile.in: Regenerated.
* libio/Makefile.in: Likewise.
* libmath/Makefile.in: Likewise.
* libsupc++/Makefile.in: Likewise.
* src/Makefile.in: Likewise.
* configure: Likewise.
* config/os/irix/bits/ctype_base.h: Revise.
* config/os/irix/bits/ctype_inline.h: Likewise.
* config/os/irix/bits/ctype_noninline.h: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37215 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
| |
* src/locale.cc: Match orderings for static members.
* include/bits/fstream.tcc: Fixes for cin.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37200 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
| |
exp<>, log<>, log<>, sin, sinh<>) friend declarations.
(cos, cosh, sin, sinh): Define primary templates.
* src/complex.cc (cos<>, cosh<>, sin<>, sinh<>): Comment out
definitions.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37197 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* bits/basic_file.h (_M_open_mode): Change signature, move
specializations to..
* config/c_io_libio.cc: ...here.
* acinclude.m4 (GLIBCPP_ENABLE_CSTDIO): Add sdtio option, remove wince.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* config/c_io_stdio.h: New file.
* config/c_io_stdio.cc: New file.
* docs/configopts.html: Modify documentation.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37195 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
| |
(complex<>): Comment out friend declaration of conj<>.
(conj<>): Comment out specialization.
(exp, log, log10): Define primary templates.
* src/complex.cc (exp<>, log<>, log10<>): Comment out
specializations.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37165 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
| |
* include/bits/std_complex.h (complex<>): Remove arg<> friend
declaration.
(arg): Define primary template.
(polar): Likewise.
(conj): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37159 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
macro definitions of iswxxx functions, which might be brought in
by <wctype.h>. Those macro definitions prevent build on some
linux-based systems.
* include/bits/std_complex.h (complex<>): Comment out friend
declarations of abs<> specializations.
(abs): Define primary template.
* src/complex.cc (abs): Comment out specialization definition.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37157 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* acinclude.m4 (GLIBCPP_ENABLE_DEBUG): Raise debugging level from
the default of 2 to 3.
* configure.in: Fix minor typos. SUBST the values of enable_shared
and enable_static so that mkcheck will be aware of them. Put the
test for gconv.h in with all the other header tests.
* aclocal.m4: Regenerate.
* configure: Ditto.
* Makefile.in: Ditto.
* libio/Makefile.in: Ditto.
* libmath/Makefile.in: Ditto.
* libsupc++/Makefile.in: Ditto.
* src/Makefile.in: Ditto.
* config/os/solaris/solaris2.7/bits/os_defines.h: Define
_G_USING_THUNKS to 0.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37151 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* src/complex_io.cc : Remove ancient defines.
* config/os/gnu-linux/bits/os_defines.h: Add defines.
* libsupc++/tinfo2.cc: Change to cstddef.
* include/bits/codecvt.h: Add include of c++config.h, so that
__USE_GNU gets defined. (Important for alpha.)
* include/c/bits/std_cwctype.h: Same.
* include/c/bits/std_ctime.h: And here.
* include/c/bits/std_cstdarg.h: Same.
* include/c/bits/std_csignal.h: Same.
* include/c/bits/std_csetjmp.h: Same.
* include/c/bits/std_clocale.h: Same.
* include/c/bits/std_climits.h: Touch.
* include/c/bits/std_cfloat.h: Same.
* include/c/bits/std_cerrno.h: Same.
* include/c/bits/std_cwchar.h: Same.
* include/c/bits/std_cassert.h: Same.
* include/c/bits/std_cctype.h: Same.
* include/c/bits/std_cstddef.h: And here.
* include/c/bits/std_cstdlib.h: And here.
* include/c/bits/std_cstdio.h: Same.
* include/c/bits/std_cstring.h: Add names to namespace std::.
* include/bits/c++config (_GNU_SOURCE): Move linux-specific macros
from here...
(_ISOC99_SOURCE): And this one....
* config/os/gnu-linux/bits/os_defines.h: ...to here.
* include/bits/codecvt.h (codecvt<_InternT, _ExternT,
__enc_traits>::do_in): Don't cast to const, this is a bug in glibc
prior to 2.2.
(codecvt<_InternT, _ExternT, __enc_traits>::do_out): Same.
* include/c/bits/std_cwchar.h: Add using declarations for mbstate_t.
2000-10-30 Steven King <sxking@uswest.net>
* include/bits/codecvt.h: Add cast.
* include/c_std/stdio.h: Re-add printf using declaration.
* include/c_std/bits/std_cstdio.h: Same
* testsuite/22_locale/codecvt_wchar_t_char.cc: Fixup testsuite.
* testsuite/22_locale/ctor_copy_dtor.cc: Same.
* testsuite/22_locale/facet.cc: Same.
* testsuite/22_locale/global_templates.cc: Same.
* testsuite/22_locale/operators.cc: Same.
* testsuite/22_locale/static_members.cc: Same.
* testsuite/26_numerics/c_math.cc: Same.
* testsuite/26_numerics/complex_inserters_extractors.cc: Same.
* testsuite/27_io/fpos.cc: Same.
* testsuite/27_io/istream_extractor_arith.cc: Same.
* testsuite/27_io/istream_unformatted.cc: Same.
* testsuite/27_io/ostream_inserter_arith.cc: Same.
* testsuite/27_io/streambuf.cc: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37149 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
for cabs, cabsf, and cabsl, too.
* aclocal.m4: Regenerated.
* config.h.in: Likewise.
* configure: Likewise.
* libmath/Makefile.am (libmath_la_SOURCES): Remove cabs.c and
cabsf.c.
* libmath/Makefile.in: Regenerated.
* libmath/complex-stub.h (cabs): Don't declare if the system
already provides this function.
(cabsf): Likewise.
(cabsl): Likewise.
* src/complex.cc (abs): Directly use `hypot' since we can't call
cabs on IRIX.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37145 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
| |
gcc.gnu.org.
* aclocal.m4, configure: Regenerate.
* src/gen-num-limits.cc, include/bits/c++config,
include/bits/stl_config.h: Remove EGCS references.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37144 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* configure.in: Simplify use of AC_CACHE_SAVE. Put linked files
in $(top_builddir)/include/bits, not $(top_builddir)/bits, to help
with libgcj build issues and improve consistency with the source
directory's include directory setup.
* configure: Regenerate.
* acinclude.m4: Same here.
* aclocal.m4: Regenerate.
* mknumeric_limits (OUT_H): Also change paths here.
* mkcheck.in (C_DIR): And here.
* mkc++config (OUT_H): And here.
* libmath/Makefile.am (INCLUDES): And here.
* src/Makefile.am (INCLUDES): Change to $(top_builddir)/include.
* libio/Makefile.am: Ditto.
* libsupc++/Makefile.am (INCLUDES): Ditto.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37134 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
| |
* src/Makefile.am: Change logic for include dir options.
* src/Makefile.in: Regenerate.
* libsupc++/Makefile.am: Ditto.
* libsupc++/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37132 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Don't pass a NULL _IO_wide_data to _IO_no_init when
_GLIBCPP_USE_WCHAR_T is not defined.
* config/c_io_libio.h (_IO_codecvt): Don't declare when
_GLIBCPP_USE_WCHAR_T is not defined.
* config/c_io_libio_codecvt.c: Don't compile it
when _GLIBCPP_USE_WCHAR_T is not defined.
* include/bits/codecvt.h (codecvt<_InternT, _ExternT, __enc_traits):
Don't define this specialization when _GLIBCPP_USE_WCHAR_T
is not defined.
* include/bits/locale_facets.h (<bits/std_cwctype.h>): Don't
include it when _GLIBCPP_USE_WCHAR_T is not defined.
* src/codecvt.cc (__enc_traits::_S_max_size): Don't define
when _GLIBCPP_USE_WCHAR_T is not defined.
* src/localename.cc (locale::_Impl::_M_construct_collate):
Don't call wide-character functions when _GLIBCPP_USE_WCHAR_T is
not defined.
(locale::_Impl::_M_construct_ctype): Likewise.
(locale::_Impl::_M_construct_monetary): Likewise.
(locale::_Impl::_M_construct_numeric): Likewise.
(locale::_Impl::_M_construct_time): Likewise.
(locale::_Impl::_M_construct_messages): Likewise.
* iofopen.c (_IO_new_fopen): Don't define `_IO_wide_data wd'
if _GLIBCPP_USE_WCHAR_T is not defined.
* iofwide.c: Don't define codecvt functions when
_GLIBCPP_USE_WCHAR_T is not defined.
(_IO_fwide): Don't try to put the stream in wide mode when
_GLIBCPP_USE_WCHAR_T is not defined.
* libio.h (_IO_wide_data): Define it as an incomplete struct
when _GLIBCPP_USE_WCHAR_T is not defined.
* wfiledoalloc.c: Don't define anything when
_GLIBCPP_USE_WCHAR_T is not defined.
* wfileops.c: Likewise.
* wgenops.c: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37131 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
| |
instantiate it.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37106 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* acinclude.m4 (GLIBCPP_ENABLE_LONG_DOUBLE): Remove.
* aclocal.m4: Regenerate.
* configure.in: Remove GLIBCPP_ENABLE_LONG_DOUBLE.
* configure: Regenerate.
* docs/configopts.html: Remove.
* src/complexl.cc: Revert.
* config.h.in: Remove.
* include/c_std/bits/std_cmath.h: Remove guards based on
_GLIBCPP_USE_LONG_DOUBLE.
* include/c/bits/std_cmath.h: Same. Format. Match c_std behavior
with respect to long double signatures.
* config/os/aix/bits/ctype_noninline.h (ctype): Remove throw
specification.
* config/os/newlib/bits/ctype_noninline.h (ctype): And here.
* config/os/solaris/solaris2.6/bits/ctype_noninline.h (ctype): Same.
* config/os/solaris/solaris2.5/bits/ctype_noninline.h (ctype): Same.
* config/os/generic/bits/ctype_noninline.h (ctype): Same.
* config/os/bsd/bits/ctype_noninline.h (ctype): Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37073 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* testsuite/21_strings/compare.cc (test01): Add using declarations.
* include/c_std/bits/std_cerrno.h: And here.
* include/c_std/bits/std_cassert.h: Tweaks.
* mkcheck.in: Simplify.
* acinclude.m4 (GLIBCPP_ENABLE_LONG_DOUBLE): Simplify.
(GLIBCPP_ENABLE_LONG_LONG): Same.
* aclocal.m4: Regenerate.
* src/Makefile.am (c_shadow_headers): Add features.h,
bits/wrap_features.h.
* src/Makefile.in: Regenerate.
* include/c_std/features.h: New file.
* include/c_std/bits/wrap_features.h (_CPP_WRAP_FEATURES_H): New
file. Need to have c++config.h included before this file so
_ISOC99_SOURCE around.
* include/c_std/sys/cdefs.h: Hack.
* include/c_std/stdlib.h: Same, use c++config.h.
* include/c_std/bits/std_cstdlib.h: Use _GLIBCPP_HAVE_STRTOLD.
* include/c_std/bits/std_cassert.h: Fix.
* include/c_std/bits/std_cerrno.h: Make consistent.
* include/c_std/bits/std_csetjmp.h (setjmp): Unscope global
declaration from ::_C_legacy to _C_legacy.
* include/c_std/bits/std_cstdio.h: same with printf.
* include/c_std/stdio.h: And here.
* include/c_std/bits/std_cstdlib.h: abort, exit comment.
* include/c_std/stdlib.h: Same here.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37035 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
* acinclude.m4 (GLIBCPP_ENABLE_LONG_DOUBLE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regenerate.
* src/complexl.cc: Fixup.
* include/c_std/bits/std_cmath.h: Fixup.
* include/c/bits/std_cmath.h: Fixup.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36998 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* testsuite/22_locale/codecvt_unicode_char.cc (test01): Adjust
creation of state_type for unicode_codecvt to take into account
the byte order markings. Add distinct tests for UCS-2BE and UCS-2LE.
* testsuite/22_locale/codecvt_unicode_wchar_t.cc (test01): Same.
* include/bits/codecvt.h (__enc_traits): Add support for encodings
that need a byte order marker. Needed for correct unicode support.
* src/locale.cc: Remove explicit qualification std::.
(locale::locale(const char* __name)): Revert, as named locale
support not finished.
* src/localename.cc (locale::_Impl:: _Impl(size_t __numfacets,
size_t __refs, bool __has_name = false, string __name): Move
default argument...
* include/bits/localefwd.h: Here.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36959 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* libsupc++/Makefile.am (exception): Change exception.cc to
exception_support.cc.
(CXXLINK): Remove bogus --tag CC.
* libsupc++/Makefile.in: Regenerate.
* libsupc++/exception.cc: Move to...
* libsupc++/exception_support.cc: ...here.
* src/Makefile.am: Remove bogus --tag CC.
* src/Makefile.in: Regenerate.
* include/bits/locale_facets.tcc (use_facet): Simplify.
* include/bits/locale_facets.h (use_facet<ctype<char> >): Correct
use_facet declaration. Replace 'const ctype<T>' with ctype<T>.
(use_facet<ctype<wchar_t> >): Same.
* src/locale-inst.cc: Remove explicit instantiation.
* src/locale.cc: Correct signature here too.
(_Bad_use_facet::what()): Correct error string.
* include/bits/localefwd.h: Correct comment.
* mkcheck.in (C_DIR): Change libsupc++/include to libsupc++.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36943 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
via Alexandre Oliva <aoliva@redhat.com>
* libsupc++/Makefile.am: Add --tag CXX, --tag CC, comments.
* libsupc++/Makefile.in: Regenerate.
* src/Makefile.am: Duplicate code.
* src/Makefile.in: Regenerate.
* acinclude.m4 (GLIBCPP_ENABLE_RELIBGCC): Take this out.
* aclocal.m4: Regenerate.
* configure.in: And here.
* configure: Regenerate.
* acinclude.m4 (GLIBCPP_CHECK_LINKER_FEATURES): Disable
test for SECTION_LDFLAGS.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36902 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Mark Harig <markh@landmark.com>
* src/Makefile.am (toolexeclibdir): Add support fo
VERSION_SPECIFIC_LIBS and --with-gxx-include-dir.
* src/Makefile.in: Regenerate.
* libsupc++/Makefile.am: Same.
(glibcppinstalldir): Adjust.
* libsupc++/Makefile.in: Regenerate.
* Makefile.am: Remove gxx_include_dir. Remove INCLUDE.
* Makefile.in: Regenerate.
* docs/configopts.html: Add descriptions of flags.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36872 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* libsupc++/Makefile.am: Use it.
* libio/Makefile.am: Use it.
* libmath/Makefile.am: Use it.
* src/Makefile.am: Use it.
* Makefile.am (AM_MAKEFLAGS): Remove includes.
* acinclude.m4 (GLIBCPP_EXPORT_INCLUES): Move include macros here.
(GLIBCPP_EXPORT_FLAGS): Move CXX flag setting here.
* configure.in: Use it.
* mkcheck.in (SRC_DIR): Use C_INCLUDE_DIR.
* src/Makefile.am (CXXCOMPILE): Remove.
* src/Makefile.in: Regenerate.
* libsupc++/Makefile.am (CXXCOMPILE): Same here.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36848 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* libsupc++/Makefile.am: Use it.
* libio/Makefile.am: Use it.
* libmath/Makefile.am: Use it.
* src/Makefile.am: Use it.
* Makefile.am (AM_MAKEFLAGS): Remove includes.
* acinclude.m4 (GLIBCPP_EXPORT_INCLUES): Move include macros here.
(GLIBCPP_EXPORT_FLAGS): Move CXX flag setting here.
* configure.in: Use it.
* mkcheck.in (SRC_DIR): Use C_INCLUDE_DIR.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36847 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Makefile.am (LIBSUPCXX_INCLUDES): Adjust.
* libsupc++/include: Remove
* libsupc++/include/*: Move to ...
* libsupc++: Here.
* libsupc++/Makefile.am (glibcppinstall_HEADERS): Install headers.
(glibcppinstalldir): New.
* src/Makefile.am (c_base_headers): New.
(c_shadow_headers): New
(c_headers): New.
(myinstallheaders): Correct install issues.
* src/Makefile.in: Regenerate.
* Makefile.am (CSHADOW_INCLUDES): Simplify.
* Makefile.in: Regenerate.
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add c_include_dir.
* aclocal.m4: Regenerate.
* mkcheck.in (SRC_DIR): Use it.
* include/bits/std_stdexcept.h: And here.
* include/bits/std_ios.h: Change std_exception.h to exception.
* src/locale.cc: And here.
* src/locale-inst.cc: And here.
* include/bits/valarray_array.h: And here.
* include/bits/stl_alloc.h: And here.
* include/bits/stl_algobase.h: And here.
* include/bits/pthread_allocimpl.h: And here.
* include/bits/stl_construct.h: Change to std_new.h to new.
* include/bits/locale_facets.h: Change std_typeinfo.h to typeinfo.
* src/Makefile.am (INCLUDES): Add LIBSUPCXX_INCLUDES.
(headers): Remove duplicated headers.
(std_headers): And here.
* src/Makefile.in: Regenerate.
* libsupc++/Makefile.am (LIBSUPCXX_INCLUDES): Remove.
* libsupc++/Makefile.in: Regenerate.
* Makefile.am (LIBSUPCXX_INCLUDES): Add here.
(AM_MAKEFLAGS): And here.
* Makefile.in: Regenerate.
* include/bits/std_typeinfo.h: Remove.
* include/bits/std_new.h: Remove
* include/bits/std_exception.h: Remove.
* std/new: Remove.
* std/typeinfo: Remove.
* std/exception: Remove.
* libio/_G_config.h (__need_ptrdiff_t): Add.
* libsupc++/include/new: Change stddef.h to cstddef.
* libsupc++/tinfo.h: Change limits.h to climits.
* libsupc++/pure.cc: Comment out _GNU_LIBRARY_ bits, as this
renders the file uncompilable. Add copyright.
* include/c_std/bits/std_cstddef.h: Don't bring wchar_t into std
namespace, as it is a fundamental type.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36833 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* docs/configopts.html: Edit.
* libio/Makefile.am (INCLUDES): Remove duplicates, simplify.
* libio/Makefile.in: Regenerate.
* libmath/Makefile.am (INCLUDES): Remove duplicates, simplify.
* libmath/Makefile.in: Regenerate.
* libsupc++/Makefile.am (INCLUDES): Remove duplicate.
* libsupc++/Makefile.in: Regenerate.
* Makefile.am (AM_MAKEFLAGS): Add GLIBCPP_INCLUDES,
TOPLEVEL_INCLUDES, LIBMATH_INCLUDES, LIBIO_INCLUDES,
CSHADOW_INCLUDES up here.
* Makefile.in: Regenerate.
* src/Makefile.am (CSHADOW_INCLUDES): Add include/c_std, include/c
for shadow headers.
(myinstallheaders): Change glibcpp_includedir to GLIBCPP_INCLUDES.
Move GLIBCPP_INCLUDES, TOPLEVEL_INCLUDES, LIBMATH_INCLUDES,
LIBIO_INCLUDES, CSHADOW_INCLUDES up Makefile hierarchy.
* src/Makefile.in: Regenerate.
* include/c: New directory.
* include/c/bits/(std_cassert.h, std_cctype.h, std_cerrno.h,
std_cfloat.h, std_climits.h, std_clocale.h, std_cmath.h,
std_csetjmp.h, std_csignal.h, std_cstdarg.h, std_cstddef.h,
std_cstdio.h, std_cstdlib.h, std_cstring.h, std_ctime.h,
std_cwchar.h, std_cwctype.h): Add, moving from...
* include/bits: ...here.
* include/c_std: New directory.
* include/c_std/bits/*: Populate from...
* shadow: ...here. Remove directory.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36805 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* config/os/aix/bits/atomicity.h: New file.
2000-10-07 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* acinclude.m4: Remove CPU_FLAGS
* libio/Makefile.am: Here too.
* Makefile.am: Here too.
* src/Makefile.am (CONFIG_INCLUDES): Remove.
(INCLUDES): Remove CONFIG_INCLUDES.
(cpu_headers): Remove.
(myinstallheaders): Remove cpu_headers.
(generated_headers): Rename to build_headers.
(build_headers): Add atomicity.h, ctype_base.h,
ctype_specializations.h.
* config/os: New directory.
* config/aix: Move to...
* config/bsd: Move to...
* config/generic: Move to...
* config/gnu-linux: Move to...
* config/irix: Move to...
* config/newlib: Move to...
* config/solaris: Move to...
* config/os/*: Here.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36778 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* src/Makefile.am: Remove OPTIMIZE_CXXFLAGS, WARN_CXXFLAGS,
CONFIG_CXXFLAGS from here, and move to...
* src/Makefile.in: Regenerate.
* Makefile.am: ... here. Clean.
(OPTIMIZE_CXXFLAGS): Move up Makefile hierarchy to here.
(WARN_CXXFLAGS): Same.
(CONFIG_CXXFLAGS): Same.
* Makefile.in: Regenerate.
* libsupc++/Makefile.am: Use top-level OPTIMIZE_CXXFLAGS,
WARN_CXXFLAGS, CONFIG_CXXFLAGS as part of local AM_CXXFLAGS.
* libsupc++/Makefile.in: Regenerate.
Change math to libmath.
* math: Move to libmath, delete.
* libmath: New directory.
* libmath/*: Populate.
* src/Makefile.am (LIBMATH_INCLUDES): Change to libmath.
(libstdc___la_LIBADD): Same.
* src/Makefile.in: Regenerate.
* configure.in: Add AC_OUTPUT for libmath/Makefile.
* configure: Regenerate.
* Makefile.am (SUBDIRS): Add libmath.
* Makefile.in: Regenerate.
* README (file): Change name.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36767 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Richard Henderson <rth@cygnus.com>
Alexandre Oliva <aoliva@redhat.com>
* libsupc++: New directory.
* libsupc++/*: Populate.
* libsupc++/Makefile.am (INCLUDES): Add -I../../gcc for
eh-common.h, gansidecl.h.
* configure.in: Add in libsupc++/Makefile to AC_OUTPUT.
* configure: Regenerate.
* Makefile.am (SUBDIRS): Add libsupc++.
* Makefile.in: Regenerate.
* src/Makefile.am (libstdc___la_LIBADD): Add in libsupc++.la
* src/Makefile.in: Regenerate.
* libio/Makefile.am: Remove extraneous, confusing bits.
* libio/Makefile.in: Regeneate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36763 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* include: New directory.
* include/backward: New directory.
* include/bits: New directory.
* include/ext: New directory.
* include/std: New directory.
* include/*/*: Populate.
* backwards: Move to include/backwards, delete.
* bits: Move to include/bits, delete.
* ext: Move to include/ext, delete.
* std: Move to include/std, delete.
* src/complex.cc: Adjust include of mathconf.
* mkc++config (BASE_H): Add include.
* src/Makefile.am: Support for topleve sources include directory.
(INCLUDES): Add LIBMATH_INCLUDE.
* src/Makefile.in: Regenerate.
* math/Makefile.am (INCLUDES): Append /include.
* math/Makefile.in: Regenerate.
* libio/Makefile.am (INCLUDES): Add glibcpp_includedir.
* libio/Makefile.in: Regenerate.
2
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36725 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
* docs/22_locale/howto.html: Add link to proto-documentation on
locales.
* docs/documentation.html: Rename links for clarity.
* src/Makefile.am (headers): Remove unistd.h, wrap_unistd.h. Add
fcntl.h, iolibio.h, libioP.h, pthread.h, iconv.h.
* src/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36708 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* mkcshadow: Fixed script to output proper include guard.
* bits/char_traits.h: Cleaned up types in char_traits<char> functions.
* libio/_G_config.h: Hacked to make work with shadow heraders.
* shadow/*: Hacked to make shadow headers work.
2000-10-02 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
Self-compile with shadow headers.
* acconfig.h (_GLIBCPP_USE_SHADOW_HEADERS): Define. Eventually,
like _GLIBCPP_USE_NAMESPACES before it, this macro will die when
it becomes the default way the library is built.
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): New macro.
* config/gnu-linux/bits/ctype_base.h (ctype_base): Use it.
* config/gnu-linux/ctype.cc (ctype): Use it.
* src/localename.cc (locale::_Impl::_M_replace_categories): Remove
call to assert.
* src/locale.cc: Explicitly cast mbstate_t to void* in calls to
memset. This should not be necessary, but an ambiguous overload
with it in.
* shadow/bits/std_cwchar.h: Fix.
* shadow/wchar.h: Fix.
* config/gnu-linux/bits/ctype_base.h (ctype_base): Inject ctype
enums into namespace std:: for ctype_base enum. Other OS types
will have to do this as well.
* config/gnu-linux/ctype.cc (ctype): Inject ctype data into
namespace std, in particular __ctype_toupper, __ctype_tolower,
__ctype_b.
* shadow/iolibio.h: New file.
* shadow/bits/wrap_iolibio.h: New file.
* shadow/libioP.h: New file.
* shadow/bits/wrap_libioP.h: New file.
* shadow/bits/wrap_fcntl.h: New file.
* shadow/fcntl.h: New file.
* shadow/iconv.h: New file. Inject iconv names into the global
namespace, unmangled for the moment.
* shadow/bits/wrap_iconv.h: New file.
* shadow/unistd.h: Remove. Useless.
* shadow/bits/wrap_unistd.h: Remove.
* src/Makefile.am: Take out machine-ansi.h, add fcntl.h unistd.h.
* src/Makefile.in: Regenerate.
* config/c_io_libio.h (_IO_codecvt): Change to normal C++ decl.
* shadow/libio.h: Fix.
* shadow/bits/wrap_libio.h: Fix.
* shadow/bits/std_clocale.h: Remove typedef struct construct,
which will not compile.
* shadow/bits/std_ctime.h: Same.
* shadow/pthread.h: New file. Put pthreads types and functions
into global scope, which is probably not the correct long-term
solution but has to be done at the moment before libio wrappers
can even be started.
* shadow/bits/wrap_pthread.h: New file.
* bits/std_ios.h: Formatting tweak.
* shadow/bits/std_cstdio.h: Format. Remove extraneous bits.
* acinclude.m4 (GLIBCPP_CHECK_COMPILER_FEATURES): Add -Werror to
tests for compiler features.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* config/c_io_libio.cc: Remove fcntl.h include, as SEEK_SET
redefined.
* libio/libioP.h: Comment out fcntl.h include.
* shadow/math.h: Add in float and long declarations, as per ISO C9X.
* bits/c++config: Define _ISOC99_SOURCE.
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add -fno-builtins to
CSHADOWFLAGS, as well as _ISOC99_SOURCE.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* src/Makefile.am (CSHADOW_INCLUDES): Enable, again.
(CSHADOW_INCLUDES): Add -I$(top_srcdir)/std before shadow include dir.
(CXXCOMPILE): Remove $(DEFS), which searches $(top_srcdir) before
std or shadow directories.
(LTCXXCOMPILE): Same.
(INCLUDES): Add $(top_builddir) before $(top_srcdir).
(AC_CXXFLAGS): Add CSHADOWFLAGS.
* src/Makefile.in: Regenerate.
* src/complex.cc (FCT): Change ::name to name.
* src/complexl.cc (FCT): Same. Use _GLIBCPP_USE_LONG_LONG here.
* src/complexf.cc (FCT): Same.
* src/complexf.cc: Remove FCT define, as things are properly
overloaded in the std namespace with the shadow headers.
* src/complexl.cc: Same.
* src/complex.cc: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36707 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
* src/localename.cc (locale::_Imp) : Remove typedefs.
* bits/localefwd.h (locale::locale(const locale& __other, _Facet*
__f): Consistency check,, call _Imp ctor with refererence argument
of 1.
* bits/localefwd.h: Change _S_num_categories to
_S_categories_num. Add new data member, _S_facets_num, which is
the number of standard facets.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36550 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* src/locale-inst.cc: Add time_put_byname and
time_get_byname instantiations.
* bits/locale_facets.h: Correct default, private derivation to
public derivation in _byname declarations.
* src/locale.cc (locale::classic()): Simplify.
* src/localename.cc (locale::_Impl:: _Impl(const _Impl& __other,
const string& __name, category __cat, size_t __refs): Re-work for
named locales.
(_M_normalize_category_names): Remove.
* testsuite/22_locale/global_templates.cc (test01): Tweaks.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): More tests.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36526 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* src/locale.cc (locale::locale(const char* __name)): Consolidate
name setting. Add checks for NULL __name pointers. Remove calls to
_S_initialize() as initial locale initialization can either be
assumed, or needs to be made consistent throughout locale
constructors.
(locale::locale(const locale& __other, const char* __name,
category __cat): Add checks for NULL name. Add checks for
assignment to self.
* src/localename.cc (locale::_Impl:: _Impl(const _Impl& __other,
const string& __name, category __cat, size_t __refs)): Set correct
name, has_name values.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): More tests.
* docs/22_locale/locale.html: New file, more unfinished docs...
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36451 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* src/locale.cc (locale::name()): Implement.
(_Impl(size_t __numfacets, size_t __refs, bool __namep = false,
string __name = "*")): Change signature.
(locale::classic): Initialize the "C" locale as a named locale.
* bits/localefwd.h (locale): Change _M_num_references to
_M_references. Eliminate _M_cached_name_ok. Rename _M_cached_name
to _M_name.
* bits/localefwd.h: Tweaks.
* src/localename.cc: Tweaks.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Add tests.
(test01): Fix.
* bits/basic_string.h: Consistency check, change _M_state ->
_M_references.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36426 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* bits/string.tcc (_Rep::_S_max_size): Use typename for its size_type
return type.
* src/Makefile.an (headers): Also install backward/fstream.h.
* src/Makefile.in: Regenerate.
* bits/char_traits.h (char_traits<_CharT>::get_state,
char_traits<char>::get_state, char_traits<wchar_t>::get_state): Pass
argument in by reference, not by value. Uglify to _S_get_state.
(char_traits<*>::__eos): Uglify to _S_eos.
* bits/std_ostream.h (ends(basic_ostream<_CharT, _Traits>& __os)):
Change __eos to _S_eos.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36417 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* acinclude.m4 (GLIBCPP_ENABLE_CSTDIO): Force glibc_satisfactory
to no, so that libstdc++-v3's libio will be built on glibc-2.2
systems.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* */Makefile.in: Regenerate.
* bits/std_cwctype.h: Put in temporary hack to work around -O2 +
glibc 2.1.x unsigned errors. Or disable -Werror by default...
* testsuite/23_containers/vector_element_access.cc: New file.
* bits/stl_config.h (__STL_THROW_RANGE_ERRORS): Define.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36218 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
| |
* src/locale-inst.cc: Remove pre-instantiation of unicode
codecvt types. Now unnecessary, as locale header now correct.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36105 138bc75d-0d04-0410-961f-82ee72b054a4
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* bits/locale_facets.tcc (_S_build_float_format): Move ...
* src/locale.cc: Here.
* bits/locale_facets.tcc (num_get::_M_extract): Clean up generic
definition. Move specialization to ...
* src/locale.cc: Here.
* bits/locale_facets.tcc: Move _Format_cache specializations to ...
* src/locale.cc: Here.
* bits/locale_facets.tcc: Move use_facet<ctype> specializations to ...
* src/locale.cc: Here.
* bits/std_locale.h: Note that locale_facets.tcc should be
included here, for standards conformance. It may increase
compile times though. For the time being, enable.
* testsuite/22_locale/facet.cc: New file, some parts commented out
for the time being.
* mkcheck.in: Append total time to test summary file.
* bits/sbuf_iter.h : Formatting tweaks.
Clean up static const data member definitions.
* src/locale.cc: Add definitions for all missing locale,
locale::_Imp, and locale::id static data members.
(ctype<char>): Add table_size define.
(money_base): Add _S_default_pattern, uglify.
* bits/localefwd.h: Add definitions for static members of _Count_ones.
* bits/locale_facets.h: Tweaks.
* bits/locale_facets.tcc: Tweaks.
* bits/string.tcc: Add definition for npos.
* bits/ios_base.h: Tweaks.
* bits/ios_base.h (ios_base::Init::_M_ios_base_init): Change to
_S_ios_base_init.
* src/ios.cc: And here. Add _S_local_words definition.
Add definitions for __ios_flags const static data.
* src/codecvt.cc: Same for __enc_traits.
* src/locale-inst.cc: Remove money_base data member definition
here.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36093 138bc75d-0d04-0410-961f-82ee72b054a4
|
