Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Jul 2016 14:26:33 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r303293 - stable/10/lib/libcxxrt
Message-ID:  <201607251426.u6PEQXKV042845@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Mon Jul 25 14:26:33 2016
New Revision: 303293
URL: https://svnweb.freebsd.org/changeset/base/303293

Log:
  MFC r302278:   libcxxrt: correct mangled "typeinfo name" symbols in Version.map
  
  r261644 (MFC of r260553) added missing C++ typinfos to libcxxrt's
  version script. It appears that a number of duplicate mangled symbols
  were added due to a cut and paste error. Switch the second instances to
  _ZTS*, typeinfo name for *.
  
  Found by lld, which produces an error or warning for duplicate symbols.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/lib/libcxxrt/Version.map
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libcxxrt/Version.map
==============================================================================
--- stable/10/lib/libcxxrt/Version.map	Mon Jul 25 14:16:28 2016	(r303292)
+++ stable/10/lib/libcxxrt/Version.map	Mon Jul 25 14:26:33 2016	(r303293)
@@ -209,19 +209,19 @@ CXXABI_1.3 {
         "typeinfo name for void*";
         "typeinfo name for unsigned int*";
         "typeinfo name for float*";
-        # C++11 typeinfo not understood by our linker
+        # C++11 typeinfo name not understood by our linker
         # std::nullptr_t
-        _ZTSDn;_ZTIPDn;_ZTIPKDn;
+        _ZTSDn;_ZTSPDn;_ZTSPKDn;
         # char16_t
-        _ZTSDi;_ZTIPDi;_ZTIPKDi;
+        _ZTSDi;_ZTSPDi;_ZTSPKDi;
         # char32_t
-        _ZTSDs;_ZTIPDs;_ZTIPKDs;
+        _ZTSDs;_ZTSPDs;_ZTSPKDs;
         # IEEE 754r decimal floating point
-        _ZTSDd;_ZTIPDd;_ZTIPKDd;
-        _ZTSDe;_ZTIPDe;_ZTIPKDe;
-        _ZTSDf;_ZTIPDf;_ZTIPKDf;
+        _ZTSDd;_ZTSPDd;_ZTSPKDd;
+        _ZTSDe;_ZTSPDe;_ZTSPKDe;
+        _ZTSDf;_ZTSPDf;_ZTSPKDf;
         # IEEE 754r half-precision floating point
-        _ZTSDh;_ZTIPDh;_ZTIPKDh;
+        _ZTSDh;_ZTSPDh;_ZTSPKDh;
 
         "typeinfo name for __cxxabiv1::__array_type_info";
         "typeinfo name for __cxxabiv1::__class_type_info";



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607251426.u6PEQXKV042845>