summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-12-19 16:29:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-12-19 16:30:23 +0100
commit47dda946060068ac4d16ed5e59ccbc12012f9048 (patch)
tree07ec89fd6602208943020e4f4c1f8c888fa6ada5
parentsw: avoid creating cursor with non-text node text range (fdo#40195) (diff)
downloadcore-47dda946060068ac4d16ed5e59ccbc12012f9048.tar.gz
core-47dda946060068ac4d16ed5e59ccbc12012f9048.zip
Add symbols from addsym.awk to gbuilified .map files.
-rw-r--r--cppu/util/cppu.map8
-rw-r--r--cppu/util/uno_purpenvhelpergcc3.map8
-rw-r--r--sal/util/sal.map9
-rw-r--r--sal/util/sal_textenc/saltextenc.map7
4 files changed, 31 insertions, 1 deletions
diff --git a/cppu/util/cppu.map b/cppu/util/cppu.map
index e89594615f53..7c4ea7fc3a4e 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 1a8f13238ab8..83e05e21ec58 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 797c1a25c576..7ccc24ca631b 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 86401fe47e88..4b07d5798056 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*;
+};