From: Benjamin Kosnik Date: Mon, 31 May 2004 21:19:52 +0000 (+0000) Subject: linker-map.gnu (GLIBCXX_3.4.1): Add. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7c9fee34e5688d79d96db0e2b2e56d7273cb4335;p=gcc.git linker-map.gnu (GLIBCXX_3.4.1): Add. 2004-05-31 Benjamin Kosnik * config/linker-map.gnu (GLIBCXX_3.4.1): Add. * testsuite/testsuite_abi.cc: Same. * configure.ac (libtool_VERSION): Bump to 6:1:0. * configure: Regenerate. * aclocal.m4: Regenerate. From-SVN: r82498 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 216b9a9623a..63c176b1c45 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2004-05-31 Benjamin Kosnik + + * config/linker-map.gnu (GLIBCXX_3.4.1): Add. + * testsuite/testsuite_abi.cc: Same. + * configure.ac (libtool_VERSION): Bump to 6:1:0. + * configure: Regenerate. + * aclocal.m4: Regenerate. + 2004-05-30 Gabriel Dos Reis * include/std/std_complex.h (complex<_Tp>): Properly indent diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 22823dcf1a4..9cbcf8bed9d 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.8.2 -*- Autoconf -*- +# generated automatically by aclocal 1.8.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.2])]) + [AM_AUTOMAKE_VERSION([1.8.3])]) # AM_AUX_DIR_EXPAND @@ -449,8 +449,16 @@ fi # # Do not use -m 0755 and let people choose whatever they expect by # setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p -- . 2>/dev/null; then +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) @@ -463,7 +471,7 @@ else # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-p ./--; + for d in ./-p ./--version; do test -d $d && rmdir $d done diff --git a/libstdc++-v3/config/linker-map.gnu b/libstdc++-v3/config/linker-map.gnu index b9205db85a0..faee2080d9d 100644 --- a/libstdc++-v3/config/linker-map.gnu +++ b/libstdc++-v3/config/linker-map.gnu @@ -61,7 +61,6 @@ GLIBCXX_3.4 { std::_List_node_base::reverse*; std::_List_node_base::transfer*; std::__throw_*; - std::__basic_file*; std::__timepunct*; std::__numeric_limits_base*; std::__num_base::_S_format_float*; @@ -134,6 +133,22 @@ GLIBCXX_3.4 { # std::__codecvt_abstract_base* _ZNStSt23__codecvt_abstract_base*; + # std::__basic_file + _ZNKSt12__basic_fileIcE7is_openEv; + _ZNSt12__basic_fileIcE2fdEv; + _ZNSt12__basic_fileIcE4openEPKcSt13_Ios_Openmodei; + _ZNSt12__basic_fileIcE4syncEv; + _ZNSt12__basic_fileIcE5closeEv; + _ZNSt12__basic_fileIcE6xsgetnEPci; + _ZNSt12__basic_fileIcE6xsputnEPKci; + _ZNSt12__basic_fileIcE7seekoffExSt12_Ios_Seekdir; + _ZNSt12__basic_fileIcE8sys_openEP8_IO_FILESt13_Ios_Openmode; + _ZNSt12__basic_fileIcE8sys_openEiSt13_Ios_Openmode; + _ZNSt12__basic_fileIcE8xsputn_2EPKciS2_i; + _ZNSt12__basic_fileIcE9showmanycEv; + _ZNSt12__basic_fileIcEC*; + _ZNSt12__basic_fileIcED*; + # virtual table _ZTVNSt8ios_base7failureE; _ZTVNSt6locale5facetE; @@ -234,6 +249,12 @@ GLIBCXX_3.4 { *; }; +GLIBCXX_3.4.1 { + + _ZNSt12__basic_fileIcE4fileEv; + +} GLIBCXX_3.4; + # Symbols in the support library (libsupc++) have their own tag. CXXABI_1.3 { diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index c12de5621ea..34d73e6af8a 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -1373,7 +1373,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ### am handles this now? ORIGINAL_LD_FOR_MULTILIBS=$LD # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=6:0:0 +libtool_VERSION=6:1:0 # Find the rest of the source tree framework. @@ -1749,7 +1749,7 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p -- . 2>/dev/null; then +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) @@ -1762,7 +1762,7 @@ else # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-p ./--; + for d in ./-p ./--version; do test -d $d && rmdir $d done diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index a7533f86a32..c4a8519bb05 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -13,7 +13,7 @@ AC_CONFIG_HEADER(config.h) ### am handles this now? ORIGINAL_LD_FOR_MULTILIBS=$LD # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=6:0:0 +libtool_VERSION=6:1:0 AC_SUBST(libtool_VERSION) # Find the rest of the source tree framework. diff --git a/libstdc++-v3/testsuite/testsuite_abi.cc b/libstdc++-v3/testsuite/testsuite_abi.cc index 45d47777dda..b94b7eb2df0 100644 --- a/libstdc++-v3/testsuite/testsuite_abi.cc +++ b/libstdc++-v3/testsuite/testsuite_abi.cc @@ -162,6 +162,7 @@ check_version(const symbol& test, bool added) known_versions.push_back("GLIBCPP_3.2.2"); known_versions.push_back("GLIBCPP_3.2.3"); // gcc-3.3.0 known_versions.push_back("GLIBCXX_3.4"); + known_versions.push_back("GLIBCXX_3.4.1"); known_versions.push_back("CXXABI_1.2"); known_versions.push_back("CXXABI_1.2.1"); known_versions.push_back("CXXABI_1.3");