[Libreoffice-commits] .: jvmaccess/util jvmfwk/plugins jvmfwk/source registry/util store/util

[Stephan Bergmann]

 jvmaccess/util/gcc3.map                             |    9 +++++
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map |   31 --------------------
 jvmfwk/source/framework.map                         |    9 +++++
 registry/util/reg.map                               |    9 +++++
 store/util/store.map                                |    8 +++++
 5 files changed, 35 insertions(+), 31 deletions(-)

New commits:
commit ce60a046d9db7b604bb66e47d683e62ac65a2f65
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jul 20 09:46:57 2012 +0200

    Globally unique symbols missing from some map files
    
    ...after gbuild'ification (they used to be added via solenv/bin/addsym.awk).
    And sunjavaplugin.map is actually unused.
    
    Change-Id: If6804cff8d01e268b84512d6c4b1edebde018cc0

diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
index 5d199a6..70d26fb 100644
--- a/jvmaccess/util/gcc3.map
+++ b/jvmaccess/util/gcc3.map
@@ -18,6 +18,8 @@
 
 UDK_3.1 {
     global:
+        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+
         # jvmaccess/virtualmachine.hxx:
         _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
         _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
@@ -89,3 +91,10 @@ UDK_3.5 { # LibO 3.6
         _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
         _ZTVN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # vtable for jvmaccess::VirtualMachine::AttachGuard::CreationException
 } UDK_3.4;
+
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+    global:
+        _ZGVNSt7num_put*; _ZNSt7num_put*;
+        _ZNSs4_Rep20_S_empty_rep_storageE;
+};
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map
deleted file mode 100644
index 502a58c..0000000
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-UDK_3_0_0 {
-    global:
-    jfw_plugin_getAllJavaInfos;
-    jfw_plugin_getJavaInfoByPath;
-    jfw_plugin_startJavaVirtualMachine;
-    local:
-    *;
-};
-
-UDK_3.1 { # OOo 3.3
-    global:
-    jfw_plugin_existJRE;
-} UDK_3_0_0;
diff --git a/jvmfwk/source/framework.map b/jvmfwk/source/framework.map
index 8def35b..ff26edf 100644
--- a/jvmfwk/source/framework.map
+++ b/jvmfwk/source/framework.map
@@ -18,6 +18,8 @@
 
 UDK_3_0_0 {
     global:
+        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+
         # jvmfwk/framework.h:
     jfw_freeJavaInfo;
     jfw_areEqualJavaInfo;
@@ -47,3 +49,10 @@ UDK_3.1 { # OOo 3.1.0
     global:
     jfw_existJRE;
 } UDK_3_0_0;
+
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+    global:
+        _ZGVNSt7num_put*; _ZNSt7num_put*;
+        _ZNSs4_Rep20_S_empty_rep_storageE;
+};
diff --git a/registry/util/reg.map b/registry/util/reg.map
index 7b9a3f5..ad4c39c 100644
--- a/registry/util/reg.map
+++ b/registry/util/reg.map
@@ -17,6 +17,8 @@
 #
 UDK_3_0_0 {
     global:
+        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+
         initRegistry_Api;
         initRegistryTypeWriter_Api;
         initRegistryTypeReader_Api;
@@ -100,3 +102,10 @@ UDK_3.1 {
         typereg_writer_setReferenceData;
         typereg_writer_getBlob;
 } UDK_3_0_0;
+
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+    global:
+        _ZGVNSt7num_put*; _ZNSt7num_put*;
+        _ZNSs4_Rep20_S_empty_rep_storageE;
+};
diff --git a/store/util/store.map b/store/util/store.map
index a4c00dc..d2c4e03 100644
--- a/store/util/store.map
+++ b/store/util/store.map
@@ -18,6 +18,8 @@
 
 UDK_3_0_0 {
     global:
+        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+
         store_acquireHandle;
         store_attrib;
         store_closeDirectory;
@@ -47,3 +49,9 @@ UDK_3_0_0 {
         *;
 };
 
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+    global:
+        _ZGVNSt7num_put*; _ZNSt7num_put*;
+        _ZNSs4_Rep20_S_empty_rep_storageE;
+};