summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIain <qt-info@nokia.com>2009-09-24 18:29:35 (GMT)
committerIain <qt-info@nokia.com>2009-09-24 18:29:35 (GMT)
commit0d74d4880224428c128bf35e3d163188f232062a (patch)
tree58f55c02a75f420e1505650b97b3c392b3699e82 /src
parentaabd12223bda6260756ab19430082477d5669c0a (diff)
downloadQt-0d74d4880224428c128bf35e3d163188f232062a.zip
Qt-0d74d4880224428c128bf35e3d163188f232062a.tar.gz
Qt-0d74d4880224428c128bf35e3d163188f232062a.tar.bz2
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
Diffstat (limited to 'src')
-rw-r--r--src/corelib/arch/symbian/qatomic_symbian.cpp7
1 files 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