diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-07-20 09:46:57 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-07-20 09:46:57 +0200 |
commit | ce60a046d9db7b604bb66e47d683e62ac65a2f65 (patch) | |
tree | bbcc7ad99f88342af8da8ff2664f41e0352429a8 /jvmfwk | |
parent | 0d56e73df7decc32f45d375ec8cc9940f8d249f4 (diff) |
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
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map | 31 | ||||
-rw-r--r-- | jvmfwk/source/framework.map | 9 |
2 files changed, 9 insertions, 31 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map deleted file mode 100644 index 502a58cce394..000000000000 --- 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 8def35b6e5ae..ff26edfdf737 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; +}; |