From 0d74d4880224428c128bf35e3d163188f232062a Mon Sep 17 00:00:00 2001 From: Iain Date: Thu, 24 Sep 2009 20:29:35 +0200 Subject: Revert to using Q_CORE_EXPORT to export two assembler functions It seems the problem is no longer there (maybe it was related to when we used --no_hide_all?), but anyway, it seems to be fine to use Q_CORE_EXPORT so reverted to that. Reviewed-by: axis --- src/corelib/arch/symbian/qatomic_symbian.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/corelib/arch/symbian/qatomic_symbian.cpp b/src/corelib/arch/symbian/qatomic_symbian.cpp index 1d43fbb..71bd145 100644 --- a/src/corelib/arch/symbian/qatomic_symbian.cpp +++ b/src/corelib/arch/symbian/qatomic_symbian.cpp @@ -86,10 +86,7 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE -// This declspec needs to be explicit. RVCT has a bug which prevents embedded -// assembler functions from being exported (normally all functions are -// exported, and Q_CORE_EXPORT resolves to nothing). -__declspec(dllexport) __asm char q_atomic_swp(volatile char *ptr, char newval) +Q_CORE_EXPORT __asm char q_atomic_swp(volatile char *ptr, char newval) { add r2, pc, #0 bx r2 @@ -100,7 +97,7 @@ __declspec(dllexport) __asm char q_atomic_swp(volatile char *ptr, char newval) thumb } -__declspec(dllexport) __asm int QBasicAtomicInt::fetchAndStoreOrdered(int newValue) +Q_CORE_EXPORT __asm int QBasicAtomicInt::fetchAndStoreOrdered(int newValue) { add r2, pc, #0 bx r2 -- cgit v0.12