[v3] basic_string, __malloc_alloc versioning intaglio

[Benjamin Kosnik <bkoz@redhat.com>]

Fixups for some of the check-ins from the last two weeks.

As these export lists become more complicated, I'll try to note what
should be removed in the future, when the ABI is broken. 

Now that symbol versioning is gaining sophistication, we'll have a
more streamlined export list next time.

tested x86/linux

2002-11-04  Benjamin Kosnik  <bkoz@redhat.com>

	* config/linker-map.gnu: Export string operator+.
	Export __default_alloc_template::_S_force_new.
	* testsuite/abi_check.cc: Output tweaks.


Index: config/linker-map.gnu
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/config/linker-map.gnu,v
retrieving revision 1.21
diff -c -p -r1.21 linker-map.gnu
*** config/linker-map.gnu	1 Nov 2002 17:54:51 -0000	1.21
--- config/linker-map.gnu	4 Nov 2002 22:24:26 -0000
*************** GLIBCPP_3.2 {
*** 28,34 ****
      # All but the last are terminated with a semicolon.
      extern "C++"
      {
!       std::[A-Za-b]*;
        std::c[a-n]*;
        std::co[a-c]*;
        std::codecvt_byname*;
--- 28,42 ----
      # All but the last are terminated with a semicolon.
      extern "C++"
      {
!       std::[A-Za]*;
!       std::ba[a-r]*;
!       std::basic_[a-r]*;
!       std::basic_streambuf*;
!       std::basic_stringbuf*;
!       std::basic_stringstream*;
!       std::basic_[t-z]*;
!       std::ba[t-z]*;
!       std::b[b-z]*;
        std::c[a-n]*;
        std::co[a-c]*;
        std::codecvt_byname*;
*************** GLIBCPP_3.2 {
*** 56,68 ****
        std::__timepunct*;
        std::__numeric_limits_base*;
        std::_S_bit_count;
!       std::_S_first_one;
!       std::__default_alloc_template*;
!       std::__malloc_alloc_template*
      };
  
      # Names not in an 'extern' block are mangled names.
  
      # std::locale destructors
      _ZNSt6localeD*;
  	 
--- 64,102 ----
        std::__timepunct*;
        std::__numeric_limits_base*;
        std::_S_bit_count;
!       std::_S_first_one
      };
  
      # Names not in an 'extern' block are mangled names.
  
+     # std::string minus binary operator plus
+     _ZNKSs*;
+     _ZNKSb*;
+     _ZNSs[A-Za-z]*;
+     _ZNSs[0-9][A-Za-z]*;
+     _ZNSs[0-9][0-9][A-Za-z]*;
+     _ZNSs[0-9]_[A-Ra-z]*;
+     _ZNSs[0-9][0-9]_[A-Ra-z]*;
+     _ZNSs12_S_empty_repEv;
+     _ZNSs20_S_empty_rep_storageE;
+     _ZNSbIwSt11char_traitsIwESaIwEE20_S_empty_rep_storageE;
+     _ZNSs12_S_constructEjcRKSaIcE;
+     _ZNSs13_S_copy_chars*;
+     _ZNSbIwSt11char_traitsIwESaIwEE[A-Ra-z]*;
+     _ZNSbIwSt11char_traitsIwESaIwEE[0-9][A-Ra-z]*;
+     _ZNSbIwSt11char_traitsIwESaIwEE[0-9][0-9][A-Ra-z]*;
+     _ZNSbIwSt11char_traitsIwESaIwEE[0-9]_[A-Ra-z]*;
+     _ZNSbIwSt11char_traitsIwESaIwEE[0-9][0-9]_[A-Ra-z]*;
+     _ZNSbIwSt11char_traitsIwESaIwEE13_S_copy_chars*;
+     _ZNSbIwSt11char_traitsIwESaIwEE12_S_constructEjwRKS1_;
+     _ZNSbIwSt11char_traitsIwESaIwEE12_S_empty_repEv;
+     _ZSt24__uninitialized_copy_auxIN9*;
+     _ZSt26__uninitialized_fill_n_aux*;
+     _ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_EPKS3_RKS6_;
+     _ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ES3_RKS6_;
+     _ZStplIwSt11char_traitsIwESaIwEESbIT_T0_T1_EPKS3_RKS6_;
+     _ZStplIwSt11char_traitsIwESaIwEESbIT_T0_T1_ES3_RKS6_;
+ 
      # std::locale destructors
      _ZNSt6localeD*;
  	 
*************** GLIBCPP_3.2 {
*** 97,102 ****
--- 131,153 ----
      # std::has_facet*
      _ZSt9has_facet*;
  
+     # std::__default_alloc_template
+     _ZNSt24__default_alloc_templateILb1ELi0EE10deallocate*;
+     _ZNSt24__default_alloc_templateILb1ELi0EE8allocate*;
+     _ZNSt24__default_alloc_templateILb1ELi0EE12_S_free_listE;
+     _ZNSt24__default_alloc_templateILb1ELi0EE22_S_node_allocator_lockE;
+     _ZNSt24__default_alloc_templateILb1ELi0EE9_S_refillE*;
+ 
+     # std::__default_alloc_template to be removed in the future
+     _ZNSt24__default_alloc_templateILb1ELi0EE10reallocateEPv*;
+     _ZNSt24__default_alloc_templateILb1ELi0EE11_S_round_upE*;
+     _ZNSt24__default_alloc_templateILb1ELi0EE14_S_chunk_allocE*;
+     _ZNSt24__default_alloc_templateILb1ELi0EE17_S_freelist_indexE*;
+     _ZNSt24__default_alloc_templateILb1ELi0EE11_S_end_freeE;
+     _ZNSt24__default_alloc_templateILb1ELi0EE12_S_heap_sizeE;
+     _ZNSt24__default_alloc_templateILb1ELi0EE13_S_start_freeE;
+     _ZNSt24__default_alloc_templateILb1ELi0EE5_Lock*;
+ 
      # operator new(unsigned)
      _Znwj;
      # operator new(unsigned, std::nothrow_t const&)
*************** GLIBCPP_3.2.1 {
*** 155,160 ****
--- 206,216 ----
    _ZNSt7codecvtIcc11__mbstate_tEC2EP15__locale_structj;
    _ZNSt7codecvtIwc11__mbstate_tEC1EP15__locale_structj;
    _ZNSt7codecvtIwc11__mbstate_tEC2EP15__locale_structj;
+ 
+   _ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_S8_;
+   _ZStplIwSt11char_traitsIwESaIwEESbIT_T0_T1_ERKS6_S8_;
+ 
+   _ZNSt24__default_alloc_templateILb1ELi0EE12_S_force_newE;
  
    # stub functions from libmath
    sinf;
Index: testsuite/abi_check.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/abi_check.cc,v
retrieving revision 1.9
diff -c -p -r1.9 abi_check.cc
*** testsuite/abi_check.cc	15 Oct 2002 04:22:11 -0000	1.9
--- testsuite/abi_check.cc	4 Nov 2002 22:24:28 -0000
*************** check_compatible(const symbol_info& lhs,
*** 108,113 ****
--- 108,115 ----
        if (verbose)
  	{
  	  cout << tab << "incompatible sizes" << endl;
+ 	  cout << tab << lhs.size << endl;
+ 	  cout << tab << rhs.size << endl;
  	}
      }
  
*************** check_compatible(const symbol_info& lhs,
*** 117,125 ****
--- 119,132 ----
        if (verbose)
  	{
  	  cout << tab << "incompatible versions" << endl;
+ 	  cout << tab << lhs.version_name << endl;
+ 	  cout << tab << rhs.version_name << endl;
  	}
      }
  
+   if (verbose)
+     cout << endl;
+ 
    return ret;
  }
  
*************** create_symbol_data(const char* file, sym
*** 247,253 ****
  }
  
  void
! report_symbol_info(const symbol_info& symbol, std::size_t n)
  {
    using namespace std;
    const char tab = '\t';
--- 254,260 ----
  }
  
  void
! report_symbol_info(const symbol_info& symbol, std::size_t n, bool ret = true)
  {
    using namespace std;
    const char tab = '\t';
*************** report_symbol_info(const symbol_info& sy
*** 259,265 ****
    cout << tab << "demangled symbol"<< endl;
    cout << tab << symbol.demangled_name << endl;
  
!   cout << endl;
  }
  
  
--- 266,273 ----
    cout << tab << "demangled symbol"<< endl;
    cout << tab << symbol.demangled_name << endl;
  
!   if (ret)
!     cout << endl;
  }
  
  
*************** main(int argc, char** argv)
*** 370,376 ****
  					  test.name);
  
        if (it1 == end && it2 == end)
! 	incompatible.push_back(symbol_pair(test, test));
      }
  
    // Report results.
--- 378,387 ----
  					  test.name);
  
        if (it1 == end && it2 == end)
! 	{
! 	  incompatible.push_back(symbol_pair(test, test));
! 	  cout << test.version_name << endl;
! 	}
      }
  
    // Report results.
*************** main(int argc, char** argv)
*** 388,394 ****
        // First, report name.
        const symbol_info& base = incompatible[j].first;
        const symbol_info& test = incompatible[j].second;
!       report_symbol_info(test, j + 1);
  
        // Second, report reason or reasons incompatible.
        check_compatible(base, test, true);
--- 399,405 ----
        // First, report name.
        const symbol_info& base = incompatible[j].first;
        const symbol_info& test = incompatible[j].second;
!       report_symbol_info(test, j + 1, false);
  
        // Second, report reason or reasons incompatible.
        check_compatible(base, test, true);