Re: [PATCH] Fix gnu.ver, fix std::tr1::hash<long double> on {ppc,s390,sparc,alpha}*-linux

[Jakub Jelinek <jakub at redhat dot com>]

On Fri, Feb 29, 2008 at 10:27:56AM -0800, Benjamin Kosnik wrote:
> Attached patch is what I checked in.

Here is the updated long double ABI patch on top of current 4.3 branch.
Regtested on ppc-linux, ok for 4.3? 

2008-02-29  Jakub Jelinek  <jakub@redhat.com>

	* config/abi/pre/gnu.ver: Remove
	_ZNKSt3tr14hashIgEclEg@@GLIBCXX_3.4.10 and
	_ZNKSt4hashIgEclEg@@GLIBCXX_3.4.10 export.
	* config/os/gnu-linux/ldbl-extra.ver: Export
	_ZNKSt3tr14hashIgEclEg@@GLIBCXX_LDBL_3.4.10
	and _ZNKSt4hashIgEclEg@@GLIBCXX_LDBL_3.4.10.
	* src/hash.cc: Only define long double hash specialization if
	_GLIBCXX_LONG_DOUBLE_COMPAT_IMPL is defined.
	* src/compatibility-ldbl.cc: Include "hash.cc".
	(_GLIBCXX_LONG_DOUBLE_COMPAT_IMPL): Define.
	(_ZNKSt4hashIeEclEe): New alias.
	* testsuite/util/testsuite_abi.cc (check_version): Support
	GLIBCXX_LDBL_3.4.10. 

--- libstdc++-v3/src/hash.cc.jj	2008-02-29 10:31:51.000000000 +0100
+++ libstdc++-v3/src/hash.cc	2008-02-29 19:36:50.000000000 +0100
@@ -1,6 +1,6 @@
 //  std::hash and std::tr1::hash definitions -*- C++ -*-
 
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 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
@@ -74,6 +74,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
       return __result;
     };
 
+#ifndef _GLIBCXX_LONG_DOUBLE_COMPAT_IMPL
   template<>
     size_t
     hash<string>::operator()(string __s) const
@@ -101,6 +102,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
       return _Fnv_hash<>::hash(__p, __s.length() * sizeof(wchar_t));
     }
 #endif
+#endif
 
 _GLIBCXX_END_NAMESPACE_TR1
 }
--- libstdc++-v3/src/compatibility-ldbl.cc.jj	2008-02-29 10:31:51.000000000 +0100
+++ libstdc++-v3/src/compatibility-ldbl.cc	2008-02-29 19:47:45.000000000 +0100
@@ -1,6 +1,6 @@
 // Compatibility symbols for -mlong-double-64 compatibility -*- C++ -*-
 
-// Copyright (C) 2006
+// Copyright (C) 2006, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -36,6 +36,8 @@
 #error "compatibility-ldbl.cc must be compiled with -mlong-double-64"
 #endif
 
+#define _GLIBCXX_LONG_DOUBLE_COMPAT_IMPL
+
 namespace std
 {
 #define C char
@@ -70,4 +72,13 @@ namespace std
 #endif
 }
 
+// For std::tr1::hash<long double>::operator ()
+#include "hash.cc"
+
+// std::tr1::hash<long double>::operator ()
+// and std::hash<long double>::operator ()
+// are the same, no need to duplicate them.
+extern "C" void _ZNKSt4hashIeEclEe (void)
+  __attribute__((alias ("_ZNKSt3tr14hashIeEclEe")));
+
 #endif
--- libstdc++-v3/testsuite/util/testsuite_abi.cc.jj	2008-02-29 10:33:00.000000000 +0100
+++ libstdc++-v3/testsuite/util/testsuite_abi.cc	2008-02-29 19:36:50.000000000 +0100
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-// Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -194,6 +194,7 @@ check_version(symbol& test, bool added)
       known_versions.push_back("GLIBCXX_3.4.10");
       known_versions.push_back("GLIBCXX_LDBL_3.4");
       known_versions.push_back("GLIBCXX_LDBL_3.4.7");
+      known_versions.push_back("GLIBCXX_LDBL_3.4.10");
       known_versions.push_back("CXXABI_1.3");
       known_versions.push_back("CXXABI_1.3.1");
       known_versions.push_back("CXXABI_1.3.2");
--- libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver.jj	2008-02-29 10:33:09.000000000 +0100
+++ libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver	2008-02-29 19:36:50.000000000 +0100
@@ -19,6 +19,11 @@ GLIBCXX_LDBL_3.4.7 {
   _ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertIgEERS2_T_;
 } GLIBCXX_LDBL_3.4;
 
+GLIBCXX_LDBL_3.4.10 {
+  _ZNKSt3tr14hashIgEclEg;
+  _ZNKSt4hashIgEclEg;
+} GLIBCXX_LDBL_3.4.7;
+
 CXXABI_LDBL_1.3 {
   _ZT[IS]g;
   _ZT[IS]Pg;
--- libstdc++-v3/config/abi/pre/gnu.ver.jj	2008-02-29 19:34:30.000000000 +0100
+++ libstdc++-v3/config/abi/pre/gnu.ver	2008-02-29 19:42:13.000000000 +0100
@@ -757,13 +757,13 @@ GLIBCXX_3.4.10 {
     _ZNKSt3tr14hashIRKSsEclES2_;
     _ZNKSt3tr14hashISbIwSt11char_traitsIwESaIwEEEclES4_;
     _ZNKSt3tr14hashISsEclESs;
-    _ZNKSt3tr14hashI[eg]EclE[eg];
+    _ZNKSt3tr14hashIeEclEe;
 
     _ZNKSt4hashIRKSbIwSt11char_traitsIwESaIwEEEclES5_;
     _ZNKSt4hashIRKSsEclES1_;
     _ZNKSt4hashISbIwSt11char_traitsIwESaIwEEEclES3_;
     _ZNKSt4hashISsEclESs;
-    _ZNKSt4hashI[eg]EclE[eg];
+    _ZNKSt4hashIeEclEe;
 
     _ZSt17__verify_grouping*;
     


	Jakub