diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-22 02:06:43 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-22 02:38:54 +0200 |
commit | 42a12264d4eb10db1841e83b7dd8a5ddca97d9f1 (patch) | |
tree | 6aeb58cf0c6b09f9d7a979ea0ae37f4f59a670e6 /jvmaccess | |
parent | 983c32238c831e24bdf3417eac66c7ec63c8dfc2 (diff) |
Use separate .map files for 64-bit MSVC build
Diffstat (limited to 'jvmaccess')
-rw-r--r-- | jvmaccess/util/makefile.mk | 2 | ||||
-rw-r--r-- | jvmaccess/util/msvc_win32_x86-64.map | 37 |
2 files changed, 39 insertions, 0 deletions
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk index 1dc327c8c..a1d8536c6 100644 --- a/jvmaccess/util/makefile.mk +++ b/jvmaccess/util/makefile.mk @@ -53,6 +53,8 @@ SHL1RPATH = URELIB .IF "$(COMNAME)" == "msci" SHL1VERSIONMAP = msvc_win32_intel.map +.ELIF "$(COMNAME)" == "mscx" +SHL1VERSIONMAP = msvc_win32_x86-64.map .ELIF "$(COMNAME)" == "sunpro5" SHL1VERSIONMAP = cc5_solaris_sparc.map .ELIF "$(GUI)$(COM)" == "WNTGCC" diff --git a/jvmaccess/util/msvc_win32_x86-64.map b/jvmaccess/util/msvc_win32_x86-64.map new file mode 100644 index 000000000..d75ab1c4a --- /dev/null +++ b/jvmaccess/util/msvc_win32_x86-64.map @@ -0,0 +1,37 @@ +UDK_3.1 { + global: + # jvmaccess/virtualmachine.hxx: + ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QEAA@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException() + ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QEAA@AEBV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &) + ??1CreationException@AttachGuard@VirtualMachine@jvmaccess@@UEAA@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException() + ??4CreationException@AttachGuard@VirtualMachine@jvmaccess@@QEAAAEAV0123@AEBV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &) + ??0AttachGuard@VirtualMachine@jvmaccess@@QEAA@AEBV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@@Z; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) + ??1AttachGuard@VirtualMachine@jvmaccess@@QEAA@XZ; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() + ??0VirtualMachine@jvmaccess@@QEAA@PEAUJavaVM_@@H_NPEAUJNIEnv_@@@Z; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) + + local: + *; +}; + +UDK_3.2 { + global: +} UDK_3.1; + +UDK_3.3 { + global: + # jvmaccess/unovirtualmachine.hxx: + ??0CreationException@UnoVirtualMachine@jvmaccess@@QEAA@AEBV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &) + ??0CreationException@UnoVirtualMachine@jvmaccess@@QEAA@XZ; # jvmaccess::UnoVirtualMachine::CreationException::CreationException() + ??1CreationException@UnoVirtualMachine@jvmaccess@@UEAA@XZ; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() + ??4CreationException@UnoVirtualMachine@jvmaccess@@QEAAAEAV012@AEBV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &) + ??0UnoVirtualMachine@jvmaccess@@QEAA@AEBV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@PEAX@Z; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) + ?getVirtualMachine@UnoVirtualMachine@jvmaccess@@QEBA?AV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@XZ; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const + ?getClassLoader@UnoVirtualMachine@jvmaccess@@QEBAPEAXXZ; # jvmaccess::UnoVirtualMachine::getClassLoader() const +} UDK_3.2; + +UDK_3.4 { # OOo 2.3 + global: + # jvmaccess/classpath.hxx: + ?doLoadClass@ClassPath@jvmaccess@@CAPEAXAEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PEAXAEBVOUString@rtl@@2@Z; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &) + ?doTranslateToUrls@ClassPath@jvmaccess@@CAPEAXAEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PEAXAEBVOUString@rtl@@@Z; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &) +} UDK_3.3; |