summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-05-17 16:14:25 +0200
committerMichal Klocek <michal.klocek@qt.io>2017-05-17 16:03:46 +0000
commit55b54951b80cd8fa4363b3c9d492be74c0d2d5da (patch)
treec805cb4c048d035f921f6fca8495fe6526dbed15
parent59df7bd0a92acf6cb9ef2eac551b7a0913e2cd1f (diff)
Fix typos in symbol names
The symbol name for delete operators did not match the actual function definitions, however linker had no problem with that and simply skipping the symbol version export. Due to lazy binging in PLT this also got unnoticed when testing with test app, where delete was called on exit. Task-number: QTBUG-60565 Change-Id: I2be2f394a0097f1d06cf9ecda33ae5b22f83a77c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/api/qtbug-60565.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/api/qtbug-60565.cpp b/src/core/api/qtbug-60565.cpp
index 70e53023..21b545cc 100644
--- a/src/core/api/qtbug-60565.cpp
+++ b/src/core/api/qtbug-60565.cpp
@@ -54,7 +54,7 @@ __asm__(".symver __ShimCppNew, _Znw" SIZE_T_MANGLING "@Qt_5");
void* __ShimCppNew(size_t size)
SHIM_ALIAS_SYMBOL(ShimCppNew);
-__asm__(".symver __ShimDelete, _ZdlPv@Qt_5");
+__asm__(".symver __ShimCppDelete, _ZdlPv@Qt_5");
void __ShimCppDelete(void* address)
SHIM_ALIAS_SYMBOL(ShimCppDelete);
@@ -74,11 +74,11 @@ __asm__(".symver __ShimCppNewArrayNoThrow, _Zna" SIZE_T_MANGLING "RKSt9nothrow_t
void __ShimCppNewArrayNoThrow(size_t size, const std::nothrow_t&) noexcept
SHIM_ALIAS_SYMBOL(ShimCppNewArray);
-__asm__(".symver __ShimCppDeleteNoThrow, _ZdaPvRKSt9nothrow_t@Qt_5");
+__asm__(".symver __ShimCppDeleteNoThrow, _ZdlPvRKSt9nothrow_t@Qt_5");
void __ShimCppDeleteNoThrow(void* address, const std::nothrow_t&) noexcept
SHIM_ALIAS_SYMBOL(ShimCppDelete);
-__asm__(".symver __ShimCppDeleteArrayNoThrow, _ZdaPvRSt9nothrow_t@Qt_5");
+__asm__(".symver __ShimCppDeleteArrayNoThrow, _ZdaPvRKSt9nothrow_t@Qt_5");
void __ShimCppDeleteArrayNoThrow(void* address, const std::nothrow_t&) noexcept
SHIM_ALIAS_SYMBOL(ShimCppDeleteArray);