[Libreoffice-commits] .: cppu/util sal/util

[Stephan Bergmann]

 cppu/util/cppu.map                  |    8 ++++++++
 cppu/util/uno_purpenvhelpergcc3.map |    8 ++++++++
 sal/util/sal.map                    |    9 ++++++++-
 sal/util/sal_textenc/saltextenc.map |    7 +++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 47dda946060068ac4d16ed5e59ccbc12012f9048
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 19 16:29:58 2011 +0100

    Add symbols from addsym.awk to gbuilified .map files.

diff --git a/cppu/util/cppu.map b/cppu/util/cppu.map
index e895946..7c4ea7f 100644
--- a/cppu/util/cppu.map
+++ b/cppu/util/cppu.map
@@ -1,5 +1,7 @@
 UDK_3_0_0 {
     global:
+        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+
         typelib_typedescription_new;
         typelib_typedescription_newInterface;
         typelib_typedescription_newInterfaceMethod;
@@ -125,3 +127,9 @@ UDK_3.3 {   # OOo 2.4
     global:
         cppu_unsatisfied_iset_msg;
 } UDK_3.2;
+
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+    global:
+        _ZGVNSt7num_put*; _ZNSt7num_put*;
+};
diff --git a/cppu/util/uno_purpenvhelpergcc3.map b/cppu/util/uno_purpenvhelpergcc3.map
index 1a8f132..83e05e2 100644
--- a/cppu/util/uno_purpenvhelpergcc3.map
+++ b/cppu/util/uno_purpenvhelpergcc3.map
@@ -1,8 +1,16 @@
 UDK_3_0_0 {
     global:
+        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+
         _ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameter?PK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
         _ZN4cppu6helper7purpenv29Environment_initWithEnterableEP16_uno_EnvironmentPNS_9EnterableE;
 
     local:
         *;
 };
+
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+    global:
+        _ZGVNSt7num_put*; _ZNSt7num_put*;
+};
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 797c1a2..7ccc24c 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -1,6 +1,7 @@
 UDK_3_0_0 {
     global:
-        GetVersionInfo;
+        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+
         osl_acceptConnectionOnSocket;
         osl_acceptPipe;
         osl_acquireSocket;
@@ -629,3 +630,9 @@ PRIVATE_1.2 { # LibreOffice 3.5
         sal_detail_log;
         sal_detail_logFormat;
 } PRIVATE_1.1;
+
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+    global:
+        _ZGVNSt7num_put*; _ZNSt7num_put*;
+};
diff --git a/sal/util/sal_textenc/saltextenc.map b/sal/util/sal_textenc/saltextenc.map
index 86401fe..4b07d57 100644
--- a/sal/util/sal_textenc/saltextenc.map
+++ b/sal/util/sal_textenc/saltextenc.map
@@ -26,7 +26,14 @@
 
 UDK_3_0_0 {
     global:
+        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
         sal_getFullTextEncodingData;
     local:
         *;
 };
+
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+    global:
+        _ZGVNSt7num_put*; _ZNSt7num_put*;
+};