diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-17 23:00:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-18 16:33:19 +0200 |
| commit | 5729da18a1852d842bd7de05d9d7fdcbec1e9ad5 (patch) | |
| tree | 87a64c41f6fc5bb1fd3e15b8f907693fcb957fdb | |
| parent | python: svn 1.7 breaks the build because... (diff) | |
| download | core-5729da18a1852d842bd7de05d9d7fdcbec1e9ad5.tar.gz core-5729da18a1852d842bd7de05d9d7fdcbec1e9ad5.zip | |
fdo#42865: privatized unique empty string symbol:
Unfortunately this --enable-dbg-util only problem (caused by
_GLIBCXX_DEUBG) resurfaced, perhaps because of new std::string based
logging in sal; adapt all map files to export the unique symbol.
| -rw-r--r-- | cppu/util/cppu.map | 1 | ||||
| -rw-r--r-- | cppu/util/uno_purpenvhelpergcc3.map | 1 | ||||
| -rw-r--r-- | cppuhelper/source/gcc3.map | 3 | ||||
| -rw-r--r-- | sal/util/sal.map | 1 | ||||
| -rw-r--r-- | sal/util/sal_textenc/saltextenc.map | 1 | ||||
| -rw-r--r-- | salhelper/source/gcc3.map | 5 | ||||
| -rw-r--r-- | solenv/bin/addsym.awk | 1 |
7 files changed, 10 insertions, 3 deletions
diff --git a/cppu/util/cppu.map b/cppu/util/cppu.map index 7c4ea7fc3a4e..6efebe35ad62 100644 --- a/cppu/util/cppu.map +++ b/cppu/util/cppu.map @@ -132,4 +132,5 @@ UDK_3.3 { # OOo 2.4 GLIBCXX_3.4 { global: _ZGVNSt7num_put*; _ZNSt7num_put*; + _ZNSs4_Rep20_S_empty_rep_storageE; }; diff --git a/cppu/util/uno_purpenvhelpergcc3.map b/cppu/util/uno_purpenvhelpergcc3.map index 83e05e21ec58..4a1f61d5b0f8 100644 --- a/cppu/util/uno_purpenvhelpergcc3.map +++ b/cppu/util/uno_purpenvhelpergcc3.map @@ -13,4 +13,5 @@ UDK_3_0_0 { GLIBCXX_3.4 { global: _ZGVNSt7num_put*; _ZNSt7num_put*; + _ZNSs4_Rep20_S_empty_rep_storageE; }; diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map index 6ce6cf17a044..4c48f5626eb0 100644 --- a/cppuhelper/source/gcc3.map +++ b/cppuhelper/source/gcc3.map @@ -411,5 +411,6 @@ global: # Unique libstdc++ symbols: GLIBCXX_3.4 { global: - _ZGVNSt7num_put*; _ZNSt7num_put*; + _ZGVNSt7num_put*; _ZNSt7num_put*; + _ZNSs4_Rep20_S_empty_rep_storageE; }; diff --git a/sal/util/sal.map b/sal/util/sal.map index 753dfe718500..7a431c3872d9 100644 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -667,4 +667,5 @@ PRIVATE_file.1 { # LibreOffice 3.6 GLIBCXX_3.4 { global: _ZGVNSt7num_put*; _ZNSt7num_put*; + _ZNSs4_Rep20_S_empty_rep_storageE; }; diff --git a/sal/util/sal_textenc/saltextenc.map b/sal/util/sal_textenc/saltextenc.map index 4b07d5798056..8e38ef0ccc42 100644 --- a/sal/util/sal_textenc/saltextenc.map +++ b/sal/util/sal_textenc/saltextenc.map @@ -36,4 +36,5 @@ UDK_3_0_0 { GLIBCXX_3.4 { global: _ZGVNSt7num_put*; _ZNSt7num_put*; + _ZNSs4_Rep20_S_empty_rep_storageE; }; diff --git a/salhelper/source/gcc3.map b/salhelper/source/gcc3.map index b475a1af3c72..e40d45df1e4a 100644 --- a/salhelper/source/gcc3.map +++ b/salhelper/source/gcc3.map @@ -116,6 +116,7 @@ LIBO_UDK_3.6 { # symbols available in >= LibO 3.6 # Unique libstdc++ symbols: GLIBCXX_3.4 { -global: -_ZGVNSt7num_put*; _ZNSt7num_put*; + global: + _ZGVNSt7num_put*; _ZNSt7num_put*; + _ZNSs4_Rep20_S_empty_rep_storageE; }; diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk index 4c18bdc53847..a9e64fb9d26d 100644 --- a/solenv/bin/addsym.awk +++ b/solenv/bin/addsym.awk @@ -43,6 +43,7 @@ END { print "GLIBCXX_3.4 {" print "global:" print "_ZGVNSt7num_put*; _ZNSt7num_put*;" + print "_ZNSs4_Rep20_S_empty_rep_storageE;" print "};" } state == 2 { |