diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-04-26 09:21:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-04-26 12:43:59 +0200 |
| commit | 8d775b92594b70a3f626006148365582c06f813f (patch) | |
| tree | e49a5a875bd1fcf926dc92ea07f12350eab82601 | |
| parent | 7437b842c420a43b85156f34146f27fc6b34c729 (diff) | |
Use Windows dllmgr-x64 also for aarch64
At least, CppunitTest_basic_macros CPPUNIT_TEST_NAME=Coverage::Coverage_Iterator
(which exercises it in basic/qa/basic_coverage/test_declare_from_dll.bas)
succeeds.
Change-Id: Ife90d5b84d5fb7bb4948cfeaf48180a6929a1dff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166695
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Tested-by: Jenkins
| -rw-r--r-- | basic/Library_sb.mk | 2 | ||||
| -rw-r--r-- | basic/source/runtime/dllmgr-none.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/dllmgr.hxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index be0cbaeef005..dae083a34864 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -150,7 +150,7 @@ $(eval $(call gb_Library_add_asmobjects,sb,\ basic/source/runtime/wnt-x86 \ )) else -ifeq ($(OS)$(CPUNAME),WNTX86_64) +ifeq ($(OS)$(filter-out AARCH64 X86_64,$(CPUNAME)),WNT) $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/runtime/dllmgr-x64 \ )) diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx index 4c7f700a9eef..2a03e2ae7855 100644 --- a/basic/source/runtime/dllmgr-none.cxx +++ b/basic/source/runtime/dllmgr-none.cxx @@ -106,7 +106,7 @@ void SbiDllMgr::FreeDll(SAL_UNUSED_PARAMETER OUString const &) {} SbiDllMgr::SbiDllMgr() = default; -#if defined(_WIN32) && !defined(_ARM64_) +#if defined(_WIN32) SbiDllMgr::~SbiDllMgr() = default; #endif diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx index a280e89b64db..fe76cfb681b6 100644 --- a/basic/source/runtime/dllmgr.hxx +++ b/basic/source/runtime/dllmgr.hxx @@ -33,7 +33,7 @@ public: SbiDllMgr(); -#if defined(_WIN32) && !defined(_ARM64_) +#if defined(_WIN32) ~SbiDllMgr(); #endif @@ -44,7 +44,7 @@ public: void FreeDll(OUString const & library); private: -#if defined(_WIN32) && !defined(_ARM64_) +#if defined(_WIN32) struct Impl; std::unique_ptr< Impl > impl_; |