Port of Qt to VxWorks

This makes Qt work on VxWorks 6.6+ in native (kernel) mode.
 * compiles with the WindRiver GNU toolchain (Linux only)
 * works with QWS (tested with the VNC driver only)
 * tested on PPC hardware and the x86 VxWorks simulator
 * no q3support, no phonon, no webkit
 * no QSharedMemory, no QSystemSemaphore, no QProcess
 * only one QApplication instance (flat address space)
 * filesystem support depends heavily on the quality of the native driver
 * QLibrary is just a dummy to make plugins work at all
 * qmake transparently creates VxWorks munching rules for static ctors
 * made auto-test cope with missing OS features

A special note regarding the Q_FOREACH patch for dcc:
when calling foreach(a,c) with c being a function returning a container,
the compiler would generate 5 references to some labels (.LXXXX), which
are not there (so the linker complains in the end).
Seems like dcc doesn't really like the 'true ? 0 : <function call to get type>'
statement

Reviewed-By: Harald Fernengel

28 files changed, 1334 insertions, 29 deletions

diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri
index 20b9227..dd3141a 100644
--- a/src/corelib/arch/arch.pri
+++ b/src/corelib/arch/arch.pri
@@ -4,6 +4,8 @@ win32:HEADERS += arch/qatomic_windows.h \
 mac:HEADERS += arch/qatomic_macosx.h \
                arch/qatomic_generic.h
 
+vxworks:HEADERS += arch/qatomic_vxworks.h
+
 !wince*:!win32:!mac:HEADERS += arch/qatomic_alpha.h \
                        arch/qatomic_avr32.h \
                        arch/qatomic_ia64.h \
diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h
index 724cf7e..17e4630 100644
--- a/src/corelib/arch/qatomic_arch.h
+++ b/src/corelib/arch/qatomic_arch.h
@@ -46,7 +46,9 @@ QT_BEGIN_HEADER
 
 #include "QtCore/qglobal.h"
 
-#if defined(QT_ARCH_ALPHA)
+#if defined(QT_ARCH_VXWORKS)
+#  include "QtCore/qatomic_vxworks.h"
+#elif defined(QT_ARCH_ALPHA)
 #  include "QtCore/qatomic_alpha.h"
 #elif defined(QT_ARCH_ARM)
 #  include "QtCore/qatomic_arm.h"
diff --git a/src/corelib/arch/qatomic_vxworks.h b/src/corelib/arch/qatomic_vxworks.h
new file mode 100644
index 0000000..573a44d
--- /dev/null
+++ b/src/corelib/arch/qatomic_vxworks.h
@@ -0,0 +1,318 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QATOMIC_VXWORKS_H
+#define QATOMIC_VXWORKS_H
+
+QT_BEGIN_HEADER
+
+#if defined(__ppc)
+#  include <QtCore/qatomic_powerpc.h>
+#else // generic implementation with taskLock()
+
+#if 0
+// we don't want to include the system header here for two function prototypes,
+// because it pulls in a _lot_ of stuff that pollutes the global namespace
+#  include <vxWorksCommon.h>
+#  include <taskLib.h>
+#else
+extern "C" int taskLock();
+extern "C" int taskUnlock();
+#endif
+
+
+
+QT_BEGIN_NAMESPACE
+
+#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE
+
+inline bool QBasicAtomicInt::isReferenceCountingNative()
+{ return false; }
+inline bool QBasicAtomicInt::isReferenceCountingWaitFree()
+{ return false; }
+
+#define Q_ATOMIC_INT_TEST_AND_SET_IS_NOT_NATIVE
+
+inline bool QBasicAtomicInt::isTestAndSetNative()
+{ return false; }
+inline bool QBasicAtomicInt::isTestAndSetWaitFree()
+{ return false; }
+
+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_NOT_NATIVE
+
+inline bool QBasicAtomicInt::isFetchAndStoreNative()
+{ return false; }
+inline bool QBasicAtomicInt::isFetchAndStoreWaitFree()
+{ return false; }
+
+#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_NOT_NATIVE
+
+inline bool QBasicAtomicInt::isFetchAndAddNative()
+{ return false; }
+inline bool QBasicAtomicInt::isFetchAndAddWaitFree()
+{ return false; }
+
+#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_NOT_NATIVE
+
+template <typename T>
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetNative()
+{ return false; }
+template <typename T>
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetWaitFree()
+{ return false; }
+
+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_NOT_NATIVE
+
+template <typename T>
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreNative()
+{ return false; }
+template <typename T>
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreWaitFree()
+{ return false; }
+
+#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_NOT_NATIVE
+
+template <typename T>
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddNative()
+{ return false; }
+template <typename T>
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
+{ return false; }
+
+// Reference counting
+
+inline bool QBasicAtomicInt::ref()
+{
+    taskLock();
+    bool ret = (++_q_value != 0);
+    taskUnlock();
+    return ret;
+}
+
+inline bool QBasicAtomicInt::deref()
+{
+    taskLock();
+    bool ret = (--_q_value != 0);
+    taskUnlock();
+    return ret;
+}
+
+// Test-and-set for integers
+
+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
+{
+    taskLock();
+    if (_q_value == expectedValue) {
+        _q_value = newValue;
+        taskUnlock();
+        return true;
+    }
+    taskUnlock();
+    return false;
+}
+
+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
+{
+    return testAndSetOrdered(expectedValue, newValue);
+}
+
+inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
+{
+    return testAndSetOrdered(expectedValue, newValue);
+}
+
+inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
+{
+    return testAndSetOrdered(expectedValue, newValue);
+}
+
+// Fetch-and-store for integers
+
+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
+{
+    taskLock();
+    int returnValue = _q_value;
+    _q_value = newValue;
+    taskUnlock();
+    return returnValue;
+}
+
+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
+{
+    return fetchAndStoreOrdered(newValue);
+}
+
+inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
+{
+    return fetchAndStoreOrdered(newValue);
+}
+
+inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)
+{
+    return fetchAndStoreOrdered(newValue);
+}
+
+// Fetch-and-add for integers
+
+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
+{
+    taskLock();
+    int originalValue = _q_value;
+    _q_value += valueToAdd;
+    taskUnlock();
+    return originalValue;
+}
+
+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
+{
+    return fetchAndAddOrdered(valueToAdd);
+}
+
+inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
+{
+    return fetchAndAddOrdered(valueToAdd);
+}
+
+inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
+{
+    return fetchAndAddOrdered(valueToAdd);
+}
+
+// Test and set for pointers
+
+template <typename T>
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
+{
+    taskLock();
+    if (_q_value == expectedValue) {
+        _q_value = newValue;
+        taskUnlock();
+        return true;
+    }
+    taskUnlock();
+    return false;
+}
+
+template <typename T>
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
+{
+    return testAndSetOrdered(expectedValue, newValue);
+}
+
+template <typename T>
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)
+{
+    return testAndSetOrdered(expectedValue, newValue);
+}
+
+template <typename T>
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)
+{
+    return testAndSetOrdered(expectedValue, newValue);
+}
+
+// Fetch and store for pointers
+
+template <typename T>
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
+{
+    taskLock();
+    T *returnValue = (_q_value);
+    _q_value = newValue;
+    taskUnlock();
+    return returnValue;
+}
+
+template <typename T>
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
+{
+    return fetchAndStoreOrdered(newValue);
+}
+
+template <typename T>
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
+{
+    return fetchAndStoreOrdered(newValue);
+}
+
+template <typename T>
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
+{
+    return fetchAndStoreOrdered(newValue);
+}
+
+// Fetch and add for pointers
+
+template <typename T>
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
+{
+    taskLock();
+    T *returnValue = (_q_value);
+    _q_value += valueToAdd;
+    taskUnlock();
+    return returnValue;
+}
+
+template <typename T>
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
+{
+    return fetchAndAddOrdered(valueToAdd);
+}
+
+template <typename T>
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
+{
+    return fetchAndAddOrdered(valueToAdd);
+}
+
+template <typename T>
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
+{
+    return fetchAndAddOrdered(valueToAdd);
+}
+
+QT_END_NAMESPACE
+
+#endif // generic implementation with taskLock()
+
+QT_END_HEADER
+
+#endif // QATOMIC_VXWORKS_H
diff --git a/src/corelib/arch/vxworks/arch.pri b/src/corelib/arch/vxworks/arch.pri
new file mode 100644
index 0000000..a768618
--- /dev/null
+++ b/src/corelib/arch/vxworks/arch.pri
@@ -0,0 +1,6 @@
+#
+# VxWorks generic
+#
+*-ppc-* {
+   SOURCES += qatomic_ppc.s
+}
diff --git a/src/corelib/arch/vxworks/qatomic_ppc.s b/src/corelib/arch/vxworks/qatomic_ppc.s
new file mode 100644
index 0000000..03971e8
--- /dev/null
+++ b/src/corelib/arch/vxworks/qatomic_ppc.s
@@ -0,0 +1,415 @@
+
+	.align 2
+	.globl q_atomic_test_and_set_int
+	.globl .q_atomic_test_and_set_int
+q_atomic_test_and_set_int:
+.q_atomic_test_and_set_int:
+	lwarx  6,0,3
+        xor.   6,6,4
+        bne    $+12
+	stwcx. 5,0,3
+	bne-   $-16
+        subfic 3,6,0
+        adde   3,3,6
+	blr
+LT..q_atomic_test_and_set_int:
+	.long 0
+	.byte 0,9,32,64,0,0,3,0
+	.long 0
+	.long LT..q_atomic_test_and_set_int-.q_atomic_test_and_set_int
+	.short 25
+	.byte "q_atomic_test_and_set_int"
+	.align 2
+
+	.align 2
+	.globl q_atomic_test_and_set_acquire_int
+	.globl .q_atomic_test_and_set_acquire_int
+q_atomic_test_and_set_acquire_int:
+.q_atomic_test_and_set_acquire_int:
+	lwarx  6,0,3
+        xor.   6,6,4
+        bne    $+16
+	stwcx. 5,0,3
+	bne-   $-16
+        isync
+        subfic 3,6,0
+        adde   3,3,6
+	blr
+LT..q_atomic_test_and_set_acquire_int:
+	.long 0
+	.byte 0,9,32,64,0,0,3,0
+	.long 0
+	.long LT..q_atomic_test_and_set_acquire_int-.q_atomic_test_and_set_acquire_int
+	.short 33
+	.byte "q_atomic_test_and_set_acquire_int"
+	.align 2
+
+	.align 2
+	.globl q_atomic_test_and_set_release_int
+	.globl .q_atomic_test_and_set_release_int
+q_atomic_test_and_set_release_int:
+.q_atomic_test_and_set_release_int:
+	lwarx  6,0,3
+        xor.   6,6,4
+        bne    $+12
+	stwcx. 5,0,3
+	bne-   $-16
+        subfic 3,6,0
+        adde   3,3,6
+	blr
+LT..q_atomic_test_and_set_release_int:
+	.long 0
+	.byte 0,9,32,64,0,0,3,0
+	.long 0
+	.long LT..q_atomic_test_and_set_release_int-.q_atomic_test_and_set_release_int
+	.short 33
+	.byte "q_atomic_test_and_set_release_int"
+	.align 2
+
+	.align 2
+	.globl q_atomic_test_and_set_ptr
+	.globl .q_atomic_test_and_set_ptr
+q_atomic_test_and_set_ptr:
+.q_atomic_test_and_set_ptr:
+	lwarx  6,0,3
+        xor.   6,6,4
+        bne    $+12
+	stwcx. 5,0,3
+	bne-   $-16
+        subfic 3,6,0
+        adde   3,3,6
+	blr
+LT..q_atomic_test_and_set_ptr:
+	.long 0
+	.byte 0,9,32,64,0,0,3,0
+	.long 0
+	.long LT..q_atomic_test_and_set_ptr-.q_atomic_test_and_set_ptr
+	.short 25
+	.byte "q_atomic_test_and_set_ptr"
+	.align 2
+
+	.align 2
+	.globl q_atomic_test_and_set_acquire_ptr
+	.globl .q_atomic_test_and_set_acquire_ptr
+q_atomic_test_and_set_acquire_ptr:
+.q_atomic_test_and_set_acquire_ptr:
+	lwarx  6,0,3
+        xor.   6,6,4
+        bne    $+16
+	stwcx. 5,0,3
+	bne-   $-16
+        isync
+        subfic 3,6,0
+        adde   3,3,6
+	blr
+LT..q_atomic_test_and_set_acquire_ptr:
+	.long 0
+	.byte 0,9,32,64,0,0,3,0
+	.long 0
+	.long LT..q_atomic_test_and_set_acquire_ptr-.q_atomic_test_and_set_acquire_ptr
+	.short 25
+	.byte "q_atomic_test_and_set_acquire_ptr"
+	.align 2
+
+	.align 2
+	.globl q_atomic_test_and_set_release_ptr
+	.globl .q_atomic_test_and_set_release_ptr
+q_atomic_test_and_set_release_ptr:
+.q_atomic_test_and_set_release_ptr:
+	lwarx  6,0,3
+        xor.   6,6,4
+        bne    $+12
+	stwcx. 5,0,3
+	bne-   $-16
+        subfic 3,6,0
+        adde   3,3,6
+	blr
+LT..q_atomic_test_and_set_release_ptr:
+	.long 0
+	.byte 0,9,32,64,0,0,3,0
+	.long 0
+	.long LT..q_atomic_test_and_set_release_ptr-.q_atomic_test_and_set_release_ptr
+	.short 33
+	.byte "q_atomic_test_and_set_release_ptr"
+	.align 2
+
+	.align 2
+	.globl q_atomic_increment
+	.globl .q_atomic_increment
+q_atomic_increment:
+.q_atomic_increment:
+	lwarx  4,0,3
+	addi   4,4,1
+	stwcx. 4,0,3
+	bne-   $-12
+	mr     3,4
+	blr
+LT..q_atomic_increment:
+	.long 0
+	.byte 0,9,32,64,0,0,1,0
+	.long 0
+	.long LT..q_atomic_increment-.q_atomic_increment
+	.short 18
+	.byte "q_atomic_increment"
+	.align 2
+
+	.align 2
+	.globl q_atomic_decrement
+	.globl .q_atomic_decrement
+q_atomic_decrement:
+.q_atomic_decrement:
+	lwarx  4,0,3
+	subi   4,4,1
+	stwcx. 4,0,3
+	bne-   $-12
+	mr     3,4
+	blr
+LT..q_atomic_decrement:
+	.long 0
+	.byte 0,9,32,64,0,0,1,0
+	.long 0
+	.long LT..q_atomic_decrement-.q_atomic_decrement
+	.short 18
+	.byte "q_atomic_decrement"
+	.align 2
+
+	.align 2
+	.globl q_atomic_set_int
+	.globl .q_atomic_set_int
+q_atomic_set_int:
+.q_atomic_set_int:
+	lwarx  5,0,3
+	stwcx. 4,0,3
+	bne-   $-8
+	mr     3,5
+	blr
+LT..q_atomic_set_int:
+	.long 0
+	.byte 0,9,32,64,0,0,2,0
+	.long 0
+	.long LT..q_atomic_set_int-.q_atomic_set_int
+	.short 16
+	.byte "q_atomic_set_int"
+	.align 2
+
+	.align 2
+	.globl q_atomic_fetch_and_store_acquire_int
+	.globl .q_atomic_fetch_and_store_acquire_int
+q_atomic_fetch_and_store_acquire_int:
+.q_atomic_fetch_and_store_acquire_int:
+	lwarx  5,0,3
+	stwcx. 4,0,3
+	bne-   $-8
+        isync
+	mr     3,5
+	blr
+LT..q_atomic_fetch_and_store_acquire_int:
+	.long 0
+	.byte 0,9,32,64,0,0,2,0
+	.long 0
+	.long LT..q_atomic_fetch_and_store_acquire_int-.q_atomic_fetch_and_store_acquire_int
+	.short 16
+	.byte "q_atomic_fetch_and_store_acquire_int"
+	.align 2
+
+	.align 2
+	.globl q_atomic_fetch_and_store_release_int
+	.globl .q_atomic_fetch_and_store_release_int
+q_atomic_fetch_and_store_release_int:
+.q_atomic_fetch_and_store_release_int:
+	lwarx  5,0,3
+	stwcx. 4,0,3
+	bne-   $-8
+	mr     3,5
+	blr
+LT..q_atomic_fetch_and_store_release_int:
+	.long 0
+	.byte 0,9,32,64,0,0,2,0
+	.long 0
+	.long LT..q_atomic_fetch_and_store_release_int-.q_atomic_fetch_and_store_release_int
+	.short 16
+	.byte "q_atomic_fetch_and_store_release_int"
+	.align 2
+
+        .align 2
+	.globl q_atomic_set_ptr
+	.globl .q_atomic_set_ptr
+q_atomic_set_ptr:
+.q_atomic_set_ptr:
+	lwarx  5,0,3
+	stwcx. 4,0,3
+	bne-   $-8
+	mr     3,5
+	blr
+LT..q_atomic_set_ptr:
+	.long 0
+	.byte 0,9,32,64,0,0,2,0
+	.long 0
+	.long LT..q_atomic_set_ptr-.q_atomic_set_ptr
+	.short 16
+	.byte "q_atomic_set_ptr"
+	.align 2
+
+	.align 2
+	.globl q_atomic_fetch_and_store_acquire_ptr
+	.globl .q_atomic_fetch_and_store_acquire_ptr
+q_atomic_fetch_and_store_acquire_ptr:
+.q_atomic_fetch_and_store_acquire_ptr:
+	lwarx  5,0,3
+	stwcx. 4,0,3
+	bne-   $-8
+        isync
+	mr     3,5
+	blr
+LT..q_atomic_fetch_and_store_acquire_ptr:
+	.long 0
+	.byte 0,9,32,64,0,0,2,0
+	.long 0
+	.long LT..q_atomic_fetch_and_store_acquire_ptr-.q_atomic_fetch_and_store_acquire_ptr
+	.short 16
+	.byte "q_atomic_fetch_and_store_acquire_ptr"
+	.align 2
+
+        .align 2
+	.globl q_atomic_fetch_and_store_release_ptr
+	.globl .q_atomic_fetch_and_store_release_ptr
+q_atomic_fetch_and_store_release_ptr:
+.q_atomic_fetch_and_store_release_ptr:
+	lwarx  5,0,3
+	stwcx. 4,0,3
+	bne-   $-8
+	mr     3,5
+	blr
+LT..q_atomic_fetch_and_store_release_ptr:
+	.long 0
+	.byte 0,9,32,64,0,0,2,0
+	.long 0
+	.long LT..q_atomic_fetch_and_store_release_ptr-.q_atomic_fetch_and_store_release_ptr
+	.short 16
+	.byte "q_atomic_fetch_and_store_release_ptr"
+	.align 2
+
+	.align 2
+	.globl q_atomic_fetch_and_add_int
+	.globl .q_atomic_fetch_and_add_int
+q_atomic_fetch_and_add_int:
+.q_atomic_fetch_and_add_int:
+	lwarx  5,0,3
+	add    6,4,5
+	stwcx. 6,0,3
+	bne-   $-12
+	mr     3,5
+	blr
+LT..q_atomic_fetch_and_add_int:
+	.long 0
+	.byte 0,9,32,64,0,0,1,0
+	.long 0
+	.long LT..q_atomic_fetch_and_add_int-.q_atomic_fetch_and_add_int
+	.short 18
+	.byte "q_atomic_fetch_and_add_int"
+	.align 2
+
+	.align 2
+	.globl q_atomic_fetch_and_add_acquire_int
+	.globl .q_atomic_fetch_and_add_acquire_int
+q_atomic_fetch_and_add_acquire_int:
+.q_atomic_fetch_and_add_acquire_int:
+	lwarx  5,0,3
+	add    6,4,5
+	stwcx. 6,0,3
+	bne-   $-12
+        isync
+	mr     3,5
+	blr
+LT..q_atomic_fetch_and_add_acquire_int:
+	.long 0
+	.byte 0,9,32,64,0,0,1,0
+	.long 0
+	.long LT..q_atomic_fetch_and_add_acquire_int-.q_atomic_fetch_and_add_acquire_int
+	.short 18
+	.byte "q_atomic_fetch_and_add_acquire_int"
+	.align 2
+
+	.align 2
+	.globl q_atomic_fetch_and_add_release_int
+	.globl .q_atomic_fetch_and_add_release_int
+q_atomic_fetch_and_add_release_int:
+.q_atomic_fetch_and_add_release_int:
+	lwarx  5,0,3
+	add    6,4,5
+	stwcx. 6,0,3
+	bne-   $-12
+	mr     3,5
+	blr
+LT..q_atomic_fetch_and_add_release_int:
+	.long 0
+	.byte 0,9,32,64,0,0,1,0
+	.long 0
+	.long LT..q_atomic_fetch_and_add_release_int-.q_atomic_fetch_and_add_release_int
+	.short 34
+	.byte "q_atomic_fetch_and_add_release_int"
+	.align 2
+
+	.align 2
+	.globl q_atomic_fetch_and_add_ptr
+	.globl .q_atomic_fetch_and_add_ptr
+q_atomic_fetch_and_add_ptr:
+.q_atomic_fetch_and_add_ptr:
+	lwarx  5,0,3
+	add    6,4,5
+	stwcx. 6,0,3
+	bne-   $-12
+	mr     3,5
+	blr
+LT..q_atomic_fetch_and_add_ptr:
+	.long 0
+	.byte 0,9,32,64,0,0,1,0
+	.long 0
+	.long LT..q_atomic_fetch_and_add_ptr-.q_atomic_fetch_and_add_ptr
+	.short 26
+	.byte "q_atomic_fetch_and_add_ptr"
+	.align 2
+
+	.align 2
+	.globl q_atomic_fetch_and_add_acquire_ptr
+	.globl .q_atomic_fetch_and_add_acquire_ptr
+q_atomic_fetch_and_add_acquire_ptr:
+.q_atomic_fetch_and_add_acquire_ptr:
+	lwarx  5,0,3
+	add    6,4,5
+	stwcx. 6,0,3
+	bne-   $-12
+        isync
+	mr     3,5
+	blr
+LT..q_atomic_fetch_and_add_acquire_ptr:
+	.long 0
+	.byte 0,9,32,64,0,0,1,0
+	.long 0
+	.long LT..q_atomic_fetch_and_add_acquire_ptr-.q_atomic_fetch_and_add_acquire_ptr
+	.short 34
+	.byte "q_atomic_fetch_and_add_acquire_ptr"
+	.align 2
+
+	.align 2
+	.globl q_atomic_fetch_and_add_release_ptr
+	.globl .q_atomic_fetch_and_add_release_ptr
+q_atomic_fetch_and_add_release_ptr:
+.q_atomic_fetch_and_add_release_ptr:
+	lwarx  5,0,3
+	add    6,4,5
+	stwcx. 6,0,3
+	bne-   $-12
+	mr     3,5
+	blr
+LT..q_atomic_fetch_and_add_release_ptr:
+	.long 0
+	.byte 0,9,32,64,0,0,1,0
+	.long 0
+	.long LT..q_atomic_fetch_and_add_release_ptr-.q_atomic_fetch_and_add_release_ptr
+	.short 34
+	.byte "q_atomic_fetch_and_add_release_ptr"
+	.align 2
+
+_section_.text:
+	.long _section_.text
diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
index ee1ed3a..d0a37de 100644
--- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
+++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
@@ -52,6 +52,8 @@
 #include <qt_windows.h>
 #endif
 
+#include "private/qfunctions_p.h"
+
 
 #ifndef QT_NO_CONCURRENT
 
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index f7d6514..99e373f 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -62,6 +62,10 @@
 #  endif
 #endif
 
+#if defined(Q_OS_VXWORKS)
+#  include <envLib.h>
+#endif
+
 #ifdef Q_CC_MWERKS
 #include <CoreServices/CoreServices.h>
 #endif
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 4ceabee..a631c6a 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -251,6 +251,8 @@ namespace QT_NAMESPACE {}
 #  define Q_OS_UNIXWARE
 #elif defined(__INTEGRITY)
 #  define Q_OS_INTEGRITY
+#elif defined(VXWORKS) /* there is no "real" VxWorks define - this has to be set in the mkspec! */
+#  define Q_OS_VXWORKS
 #elif defined(__MAKEDEPEND__)
 #else
 #  error "Qt has not been ported to this OS - talk to qt-bugs@trolltech.com"
@@ -611,6 +613,13 @@ namespace QT_NAMESPACE {}
 #  elif defined(__ghs)
 #    define Q_CC_GHS
 
+#  elif defined(__DCC__)
+#    define Q_CC_DIAB
+#    undef Q_NO_BOOL_TYPE
+#    if !defined(__bool)
+#      define Q_NO_BOOL_TYPE
+#    endif
+
 /* The UnixWare 7 UDK compiler is based on EDG and does define __EDG__ */
 #  elif defined(__USLC__) && defined(__SCO_VERSION__)
 #    define Q_CC_USLC
@@ -642,6 +651,11 @@ namespace QT_NAMESPACE {}
 #    endif
 #  endif
 
+/* VxWorks' DIAB toolchain has an additional EDG type C++ compiler
+   (see __DCC__ above). This one is for C mode files (__EDG is not defined) */
+#elif defined(_DIAB_TOOL)
+#  define Q_CC_DIAB
+
 /* Never tested! */
 #elif defined(__HIGHC__)
 #  define Q_CC_HIGHC
@@ -1110,6 +1124,15 @@ class QDataStream;
 #  define QT_NO_COP
 #endif
 
+#if defined(Q_OS_VXWORKS)
+#  define QT_NO_CRASHHANDLER     // no popen
+#  define QT_NO_PROCESS          // no exec*, no fork
+#  define QT_NO_LPR
+#  define QT_NO_SHAREDMEMORY     // only POSIX, no SysV and in the end...
+#  define QT_NO_SYSTEMSEMAPHORE  // not needed at all in a flat address space
+#  define QT_NO_QWS_MULTIPROCESS // no processes
+#endif
+
 # include <QtCore/qfeatures.h>
 
 #define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE))
@@ -1552,7 +1575,7 @@ Q_CORE_EXPORT void qt_check_pointer(const char *, int);
 #  define Q_CHECK_PTR(p)
 #endif
 
-#if (defined(Q_CC_GNU) && !defined(Q_OS_SOLARIS)) || defined(Q_CC_HPACC)
+#if (defined(Q_CC_GNU) && !defined(Q_OS_SOLARIS)) || defined(Q_CC_HPACC) || defined(Q_CC_DIAB)
 #  define Q_FUNC_INFO __PRETTY_FUNCTION__
 #elif defined(_MSC_VER)
     /* MSVC 2002 doesn't have __FUNCSIG__ nor can it handle QT_STRINGIFY. */
@@ -2142,6 +2165,17 @@ inline const QForeachContainer<T> *qForeachContainer(const QForeachContainerBase
              qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->brk;           \
              --qForeachContainer(&_container_, true ? 0 : qForeachPointer(container))->brk)
 
+#elif defined(Q_CC_DIAB)
+// VxWorks DIAB generates unresolvable symbols, if container is a function call
+#  define Q_FOREACH(variable,container)                                                             \
+    if(0){}else                                                                                     \
+    for (const QForeachContainerBase &_container_ = qForeachContainerNew(container);                \
+         qForeachContainer(&_container_, (__typeof__(container) *) 0)->condition();       \
+         ++qForeachContainer(&_container_, (__typeof__(container) *) 0)->i)               \
+        for (variable = *qForeachContainer(&_container_, (__typeof__(container) *) 0)->i; \
+             qForeachContainer(&_container_, (__typeof__(container) *) 0)->brk;           \
+             --qForeachContainer(&_container_, (__typeof__(container) *) 0)->brk)
+
 #else
 #  define Q_FOREACH(variable, container) \
     for (const QForeachContainerBase &_container_ = qForeachContainerNew(container); \
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 47e3db0..c0b6820 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -413,7 +413,7 @@ bool QFSFileEngine::mkdir(const QString &name, bool createParentDirectories) con
                 if (QT_STAT(chunk, &st) != -1) {
                     if ((st.st_mode & S_IFMT) != S_IFDIR)
                         return false;
-                } else if (::mkdir(chunk, 0777) != 0) {
+                } else if (QT_MKDIR(chunk, 0777) != 0) {
                         return false;
                 }
             }
@@ -424,7 +424,7 @@ bool QFSFileEngine::mkdir(const QString &name, bool createParentDirectories) con
     if (dirName[dirName.length() - 1] == QLatin1Char('/'))
         dirName = dirName.left(dirName.length() - 1);
 #endif
-    return (::mkdir(QFile::encodeName(dirName), 0777) == 0);
+    return (QT_MKDIR(QFile::encodeName(dirName), 0777) == 0);
 }
 
 bool QFSFileEngine::rmdir(const QString &name, bool recurseParentDirectories) const
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 16927ea..42c57a4 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -62,6 +62,15 @@
 
 //#define DEBUG_RESOURCE_MATCH
 
+#if defined(Q_OS_VXWORKS)
+#  if defined(m_data)
+#    undef m_data
+#  endif
+#  if defined(m_len)
+#    undef m_len
+#  endif
+#endif
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 7de5030..e1a3b26 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -74,6 +74,10 @@
 #endif // Q_OS_WIN
 #endif // QT_NO_QOBJECT
 
+#ifdef Q_OS_VXWORKS
+#  include <ioLib.h>
+#endif
+
 #include <stdlib.h>
 
 #ifndef CSIDL_COMMON_APPDATA
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index b520bee..e92e729 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -73,7 +73,10 @@
 
 #if defined(Q_OS_WINCE)
 #  include <types.h>
-#  include "qfunctions_wince.h"
+#endif
+
+#if defined(Q_OS_VXWORKS)
+#  include <taskLib.h>
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -133,6 +136,8 @@ static int _gettemp(char *path, int *doopen, int domkdir, int slen)
     }
 #if defined(Q_OS_WIN) && defined(_MSC_VER) && _MSC_VER >= 1400
     pid = _getpid();
+#elif defined(Q_OS_VXWORKS)
+    pid = (pid_t) taskIdCurrent;
 #else
     pid = getpid();
 #endif
@@ -234,7 +239,7 @@ static int _gettemp(char *path, int *doopen, int domkdir, int slen)
 #ifdef Q_OS_WIN
             if (QT_MKDIR(path) == 0)
 #else
-            if (mkdir(path, 0700) == 0)
+            if (QT_MKDIR(path, 0700) == 0)
 #endif
                 return 1;
             if (errno != EEXIST)
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index 8759578..7177293 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -112,3 +112,10 @@ unix {
    contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
 }
 
+vxworks {
+	SOURCES += \
+		kernel/qfunctions_vxworks.cpp
+	HEADERS += \
+		kernel/qfunctions_vxworks.h
+}
+
diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp
index 28c1d9c..0bc03cd 100644
--- a/src/corelib/kernel/qcore_unix.cpp
+++ b/src/corelib/kernel/qcore_unix.cpp
@@ -41,8 +41,13 @@
 
 #include "qcore_unix_p.h"
 
-#include <sys/select.h>
-#include <sys/time.h>
+#ifndef Q_OS_VXWORKS
+#  include <sys/select.h>
+#  include <sys/time.h>
+#else
+#  include <selectLib.h>
+#endif
+
 #include <stdlib.h>
 
 #include "qeventdispatcher_unix_p.h" // for the timeval operators
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index bffd670..fb0e6a5 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -67,6 +67,10 @@
 #include <errno.h>
 #include <fcntl.h>
 
+#if defined(Q_OS_VXWORKS)
+#  include <ioLib.h>
+#endif
+
 struct sockaddr;
 
 #if defined(Q_OS_LINUX) && defined(__GLIBC__) && (__GLIBC__ * 0x100 + __GLIBC_MINOR__) >= 0x0204
@@ -129,6 +133,7 @@ static inline int qt_safe_open(const char *pathname, int flags, mode_t mode = 07
 #undef QT_OPEN
 #define QT_OPEN         qt_safe_open
 
+#ifndef Q_OS_VXWORKS // no POSIX pipes in VxWorks
 // don't call ::pipe
 // call qt_safe_pipe
 static inline int qt_safe_pipe(int pipefd[2], int flags = 0)
@@ -164,6 +169,8 @@ static inline int qt_safe_pipe(int pipefd[2], int flags = 0)
     return 0;
 }
 
+#endif // Q_OS_VXWORKS
+
 // don't call dup or fcntl(F_DUPFD)
 static inline int qt_safe_dup(int oldfd, int atleast = 0, int flags = FD_CLOEXEC)
 {
@@ -238,6 +245,8 @@ static inline int qt_safe_close(int fd)
 #undef QT_CLOSE
 #define QT_CLOSE qt_safe_close
 
+#ifndef Q_OS_VXWORKS // no processes in VxWorks
+
 static inline int qt_safe_execve(const char *filename, char *const argv[],
                                  char *const envp[])
 {
@@ -267,6 +276,8 @@ static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options)
     return ret;
 }
 
+#endif // Q_OS_VXWORKS
+
 bool qt_gettime_is_monotonic();
 timeval qt_gettime();
 Q_CORE_EXPORT int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept,
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 706dc54..d0a4943 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -61,6 +61,7 @@
 #include <private/qthread_p.h>
 #include <qlibraryinfo.h>
 #include <private/qfactoryloader_p.h>
+#include <private/qfunctions_p.h>
 
 #ifdef Q_OS_UNIX
 #  if !defined(QT_NO_GLIB)
@@ -83,6 +84,10 @@
 #  include <locale.h>
 #endif
 
+#ifdef Q_OS_VXWORKS
+#  include <taskLib.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 #if defined(Q_WS_WIN) || defined(Q_WS_MAC)
@@ -1821,8 +1826,9 @@ qint64 QCoreApplication::applicationPid()
 {
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
     return GetCurrentProcessId();
+#elif defined(Q_OS_VXWORKS)
+    return (pid_t) taskIdCurrent;
 #else
-    // UNIX
     return getpid();
 #endif
 }
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 2943c6d..51c7b9c 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -55,6 +55,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+// VxWorks doesn't correctly set the _POSIX_... options
+#if defined(Q_OS_VXWORKS)
+#  if defined(_POSIX_MONOTONIC_CLOCK) && (_POSIX_MONOTONIC_CLOCK <= 0)
+#    undef _POSIX_MONOTONIC_CLOCK
+#    define _POSIX_MONOTONIC_CLOCK 1
+#  endif
+#  include <pipeDrv.h>
+#  include <selectLib.h>
+#endif
+
 #if (_POSIX_MONOTONIC_CLOCK-0 <= 0) || defined(QT_BOOTSTRAPPED)
 #  include <sys/times.h>
 #endif
@@ -77,7 +87,7 @@ static void signalHandler(int sig)
 }
 
 
-#ifdef Q_OS_INTEGRITY
+#if defined(Q_OS_INTEGRITY) || defined(Q_OS_VXWORKS)
 static void initThreadPipeFD(int fd)
 {
     int ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
@@ -98,20 +108,47 @@ QEventDispatcherUNIXPrivate::QEventDispatcherUNIXPrivate()
 {
     extern Qt::HANDLE qt_application_thread_id;
     mainThread = (QThread::currentThreadId() == qt_application_thread_id);
+    bool pipefail = false;
 
     // initialize the common parts of the event loop
-#ifdef Q_OS_INTEGRITY
+#if defined(Q_OS_INTEGRITY)
     // INTEGRITY doesn't like a "select" on pipes, so use socketpair instead
-    if (socketpair(AF_INET, SOCK_STREAM, PF_INET, thread_pipe) == -1)
+    if (socketpair(AF_INET, SOCK_STREAM, PF_INET, thread_pipe) == -1) {
         perror("QEventDispatcherUNIXPrivate(): Unable to create socket pair");
-
-    initThreadPipeFD(thread_pipe[0]);
-    initThreadPipeFD(thread_pipe[1]);
+        pipefail = true;
+    } else {
+        initThreadPipeFD(thread_pipe[0]);
+        initThreadPipeFD(thread_pipe[1]);
+    }
+#elif defined(Q_OS_VXWORKS)
+    char name[20];
+    qsnprintf(name, sizeof(name), "/pipe/qt_%08x", int(taskIdCurrent));
+
+    // make sure there is no pipe with this name
+    pipeDevDelete(name, true);
+    // create the pipe
+    if (pipeDevCreate(name, 128 /*maxMsg*/, 1 /*maxLength*/) != OK) {
+        perror("QEventDispatcherUNIXPrivate(): Unable to create thread pipe device");
+        pipefail = true;
+    } else {
+        if ((thread_pipe[0] = open(name, O_RDWR, 0)) < 0) {
+            perror("QEventDispatcherUNIXPrivate(): Unable to create thread pipe");
+            pipefail = true;
+        } else {
+            initThreadPipeFD(thread_pipe[0]);
+            thread_pipe[1] = thread_pipe[0];
+        }
+    }
 #else
-    if (qt_safe_pipe(thread_pipe, O_NONBLOCK) == -1)
+    if (qt_safe_pipe(thread_pipe, O_NONBLOCK) == -1) {
         perror("QEventDispatcherUNIXPrivate(): Unable to create thread pipe");
+        pipefail = true;
+    }
 #endif
 
+    if (pipefail)
+        qFatal("QEventDispatcherUNIXPrivate(): Can not continue without a thread pipe");
+
     sn_highest = -1;
 
     interrupt = false;
@@ -119,9 +156,18 @@ QEventDispatcherUNIXPrivate::QEventDispatcherUNIXPrivate()
 
 QEventDispatcherUNIXPrivate::~QEventDispatcherUNIXPrivate()
 {
+#if defined(Q_OS_VXWORKS)
+    close(thread_pipe[0]);
+
+    char name[20];
+    qsnprintf(name, sizeof(name), "/pipe/qt_%08x", int(taskIdCurrent));
+
+    pipeDevDelete(name, true);
+#else
     // cleanup the common parts of the event loop
     close(thread_pipe[0]);
     close(thread_pipe[1]);
+#endif
 
     // cleanup timers
     qDeleteAll(timerList);
@@ -226,9 +272,15 @@ int QEventDispatcherUNIXPrivate::doSelect(QEventLoop::ProcessEventsFlags flags,
     // select doesn't immediately return next time
     int nevents = 0;
     if (nsel > 0 && FD_ISSET(thread_pipe[0], &sn_vec[0].select_fds)) {
+#if defined(Q_OS_VXWORKS)
+        char c[16];
+        ::read(thread_pipe[0], c, sizeof(c));
+        ::ioctl(thread_pipe[0], FIOFLUSH, 0);
+#else
         char c[16];
         while (::read(thread_pipe[0], c, sizeof(c)) > 0)
             ;
+#endif
         if (!wakeUps.testAndSetRelease(1, 0)) {
             // hopefully, this is dead code
             qWarning("QEventDispatcherUNIX: internal error, wakeUps.testAndSetRelease(1, 0) failed!");
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h
index 61d94c9..30d566d 100644
--- a/src/corelib/kernel/qeventdispatcher_unix_p.h
+++ b/src/corelib/kernel/qeventdispatcher_unix_p.h
@@ -59,9 +59,13 @@
 #include "private/qpodlist_p.h"
 
 #include <sys/types.h>
-#include <sys/time.h>
-#if !defined(Q_OS_HPUX) || defined(__ia64)
-#include <sys/select.h>
+#if defined(Q_OS_VXWORKS)
+#  include <sys/times.h>
+#else
+#  include <sys/time.h>
+#  if !defined(Q_OS_HPUX) || defined(__ia64)
+#    include <sys/select.h>
+#  endif
 #endif
 #include <unistd.h>
 
diff --git a/src/corelib/kernel/qfunctions_p.h b/src/corelib/kernel/qfunctions_p.h
index a7f2f9d..ad44a15 100644
--- a/src/corelib/kernel/qfunctions_p.h
+++ b/src/corelib/kernel/qfunctions_p.h
@@ -57,6 +57,8 @@
 
 #if defined(Q_OS_WINCE)
 #  include "QtCore/qfunctions_wince.h"
+#elif defined(Q_OS_VXWORKS)
+#  include "QtCore/qfunctions_vxworks.h"
 #endif
 
 #ifdef Q_CC_RVCT
diff --git a/src/corelib/kernel/qfunctions_vxworks.cpp b/src/corelib/kernel/qfunctions_vxworks.cpp
new file mode 100644
index 0000000..6d5e7cc
--- /dev/null
+++ b/src/corelib/kernel/qfunctions_vxworks.cpp
@@ -0,0 +1,202 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qglobal.h"
+
+#ifdef Q_OS_VXWORKS
+
+#include "qplatformdefs.h"
+#include "qfunctions_vxworks.h"
+
+#include <vmLib.h>
+#include <selectLib.h>
+#include <ioLib.h>
+
+QT_USE_NAMESPACE
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// no lfind() - used by the TIF image format
+void *lfind(const void* key, const void* base, size_t* elements, size_t size,
+            int (*compare)(const void*, const void*))
+{
+    const char* current = (char*) base;
+    const char* const end = (char*) (current + (*elements) * size);
+    while (current != end) {
+        if (compare(current, key) == 0)
+            return (void*)current;
+        current += size;
+    }
+    return 0;
+}
+
+
+// no rand_r(), but rand()
+// NOTE: this implementation is wrong for multi threaded applications,
+// but there is no way to get it right on VxWorks (in kernel mode)
+int rand_r(unsigned int * /*seedp*/)
+{
+    return rand();
+}
+
+// no usleep() support
+int usleep(unsigned int usec)
+{
+    div_t dt = div(usec, 1000000);
+    struct timespec ts = { dt.quot, dt.rem * 1000 };
+
+    return nanosleep(&ts, 0);
+}
+
+
+// gettimeofday() is declared, but is missing from the library
+// It IS however defined in the Curtis-Wright X11 libraries, so
+// we have to make the symbol 'weak'
+#if defined(Q_CC_DIAB)
+#  pragma weak gettimeofday
+#endif
+int gettimeofday(struct timeval *tv, void /*struct timezone*/ *)
+{
+    // the compiler will optimize this and will only use one code path
+    if (sizeof(struct timeval) == sizeof(struct timespec)) {
+        int res = clock_gettime(CLOCK_REALTIME, (struct timespec *) tv);
+        if (!res)
+            tv->tv_usec /= 1000;
+        return res;
+    } else {
+        struct timespec ts;
+
+        int res = clock_gettime(CLOCK_REALTIME, &ts);
+        if (!res) {
+            tv->tv_sec = ts.tv_sec;
+            tv->tv_usec = ts.tv_nsec / 1000;
+        }
+        return res;
+    }
+}
+
+// neither getpagesize() or sysconf(_SC_PAGESIZE) are available
+int getpagesize()
+{
+    return vmPageSizeGet();
+}
+
+// symlinks are not supported (lstat is now just a call to stat - see qplatformdefs.h)
+int symlink(const char *, const char *)
+{
+    errno = EIO;
+    return -1;
+}
+
+ssize_t readlink(const char *, char *, size_t)
+{
+    errno = EIO;
+    return -1;
+}
+
+// there's no truncate(), but ftruncate() support...
+int truncate(const char *path, off_t length)
+{
+    int fd = open(path, O_WRONLY, 00777);
+    if (fd >= 0) {
+        int res = ftruncate(fd, length);
+        int en = errno;
+        close(fd);
+        errno = en;
+        return res;
+    }
+    // errno is already set by open
+    return -1;
+}
+
+
+
+// VxWorks doesn't know about passwd & friends.
+// in order to avoid patching the unix fs path everywhere
+// we introduce some dummy functions that simulate a single
+// 'root' user on the system.
+
+uid_t getuid()
+{
+    return 0;
+}
+
+gid_t getgid()
+{
+    return 0;
+}
+
+uid_t geteuid()
+{
+    return 0;
+}
+
+struct passwd *getpwuid(uid_t uid)
+{
+    static struct passwd pwbuf = { "root", 0, 0, 0, 0, 0, 0 };
+
+    if (uid == 0) {
+        return &pwbuf;
+    } else {
+        errno = ENOENT;
+        return 0;
+    }
+}
+
+struct group *getgrgid(gid_t gid)
+{
+    static struct group grbuf = { "root", 0, 0, 0 };
+
+    if (gid == 0) {
+        return &grbuf;
+    } else {
+        errno = ENOENT;
+        return 0;
+    }
+}
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // Q_OS_VXWORKS
diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h
new file mode 100644
index 0000000..cc98948
--- /dev/null
+++ b/src/corelib/kernel/qfunctions_vxworks.h
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QFUNCTIONS_VXWORKS_H
+#define QFUNCTIONS_VXWORKS_H
+#ifdef Q_OS_VXWORKS
+
+#include <unistd.h>
+#include <pthread.h>
+#include <dirent.h>
+#include <signal.h>
+#include <string.h>
+#include <strings.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/times.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
+
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
+#ifdef QT_BUILD_CORE_LIB
+QT_MODULE(Core)
+#endif
+
+QT_END_NAMESPACE
+QT_END_HEADER
+
+
+#ifndef RTLD_LOCAL
+#define RTLD_LOCAL  0
+#endif
+
+#ifndef NSIG
+#define NSIG _NSIGS
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// isascii is missing (sometimes!!)
+#ifndef isascii
+inline int isascii(int c)  { return (c & 0x7f); }
+#endif
+
+// no lfind() - used by the TIF image format
+void *lfind(const void* key, const void* base, size_t* elements, size_t size,
+            int (*compare)(const void*, const void*));
+
+// no rand_r(), but rand()
+// NOTE: this implementation is wrong for multi threaded applications,
+// but there is no way to get it right on VxWorks (in kernel mode)
+int rand_r(unsigned int * /*seedp*/);
+
+// no usleep() support
+int usleep(unsigned int);
+
+// gettimeofday() is declared, but is missing from the library.
+// It IS however defined in the Curtis-Wright X11 libraries, so
+// we have to make the symbol 'weak'
+int gettimeofday(struct timeval *tv, void /*struct timezone*/ *) __attribute__((weak));
+
+// neither getpagesize() or sysconf(_SC_PAGESIZE) are available
+int getpagesize();
+
+// symlinks are not supported (lstat is now just a call to stat - see qplatformdefs.h)
+int symlink(const char *, const char *);
+ssize_t readlink(const char *, char *, size_t);
+
+// there's no truncate(), but ftruncate() support...
+int truncate(const char *path, off_t length);
+
+// VxWorks doesn't know about passwd & friends.
+// in order to avoid patching the unix fs path everywhere
+// we introduce some dummy functions that simulate a single
+// 'root' user on the system.
+
+uid_t getuid();
+gid_t getgid();
+uid_t geteuid();
+
+struct passwd {
+    char   *pw_name;       /* user name */
+    char   *pw_passwd;     /* user password */
+    uid_t   pw_uid;        /* user ID */
+    gid_t   pw_gid;        /* group ID */
+    char   *pw_gecos;      /* real name */
+    char   *pw_dir;        /* home directory */
+    char   *pw_shell;      /* shell program */
+};
+
+struct group {
+    char   *gr_name;       /* group name */
+    char   *gr_passwd;     /* group password */
+    gid_t   gr_gid;        /* group ID */
+    char  **gr_mem;        /* group members */
+};
+
+struct passwd *getpwuid(uid_t uid);
+struct group *getgrgid(gid_t gid);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // Q_OS_VXWORKS
+#endif // QFUNCTIONS_VXWORKS_H
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
index 6b9e1ad..cc70589 100644
--- a/src/corelib/plugin/qlibrary_unix.cpp
+++ b/src/corelib/plugin/qlibrary_unix.cpp
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !defined(QT_HPUX_LD)
+#if !defined(QT_HPUX_LD) && !defined(Q_OS_VXWORKS)
 QT_BEGIN_INCLUDE_NAMESPACE
 #include <dlfcn.h>
 QT_END_INCLUDE_NAMESPACE
@@ -66,7 +66,9 @@ QT_END_INCLUDE_NAMESPACE
 
 static QString qdlerror()
 {
-#if !defined(QT_HPUX_LD)
+#if defined(Q_OS_VXWORKS)
+    const char *err = "VxWorks does not support dynamic libraries.";
+#elif !defined(QT_HPUX_LD)
     const char *err = dlerror();
 #else
     const char *err = strerror(errno);
@@ -76,6 +78,8 @@ static QString qdlerror()
 
 bool QLibraryPrivate::load_sys()
 {
+    QString attempt;
+#if !defined(Q_OS_VXWORKS)
     QFileInfo fi(fileName);
     QString path = fi.path();
     QString name = fi.fileName();
@@ -163,7 +167,6 @@ bool QLibraryPrivate::load_sys()
     }
 #endif
 #endif // QT_HPUX_LD
-    QString attempt;
     bool retry = true;
     for(int prefix = 0; retry && !pHnd && prefix < prefixes.size(); prefix++) {
         for(int suffix = 0; retry && !pHnd && suffix < suffixes.size(); suffix++) {
@@ -204,7 +207,8 @@ bool QLibraryPrivate::load_sys()
             attempt = str;
         }
     }
-# endif
+#endif
+#endif // Q_OS_VXWORKS
     if (!pHnd) {
         errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName).arg(qdlerror());
     }
@@ -217,14 +221,16 @@ bool QLibraryPrivate::load_sys()
 
 bool QLibraryPrivate::unload_sys()
 {
-#if defined(QT_HPUX_LD)
+#if !defined(Q_OS_VXWORKS)
+#  if defined(QT_HPUX_LD)
     if (shl_unload((shl_t)pHnd)) {
-#else
+#  else
     if (dlclose(pHnd)) {
-#endif
+#  endif
         errorString = QLibrary::tr("Cannot unload library %1: %2").arg(fileName).arg(qdlerror());
         return false;
     }
+#endif
     errorString.clear();
     return true;
 }
@@ -249,6 +255,8 @@ void* QLibraryPrivate::resolve_sys(const char* symbol)
     void* address = 0;
     if (shl_findsym((shl_t*)&pHnd, symbol, TYPE_UNDEFINED, &address) < 0)
         address = 0;
+#elif defined(Q_OS_VXWORKS)
+    void *address = 0;
 #else
     void* address = dlsym(pHnd, symbol);
 #endif
diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp
index 43ba668..02c7c6f 100644
--- a/src/corelib/thread/qmutex_unix.cpp
+++ b/src/corelib/thread/qmutex_unix.cpp
@@ -49,6 +49,10 @@
 
 #include <errno.h>
 
+#if defined(Q_OS_VXWORKS) && defined(wakeup)
+#undef wakeup
+#endif
+
 QT_BEGIN_NAMESPACE
 
 static void report_error(int code, const char *where, const char *what)
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 19b5104..efe37ad 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -61,6 +61,13 @@
 #ifdef Q_OS_BSD4
 #include <sys/sysctl.h>
 #endif
+#ifdef Q_OS_VXWORKS
+#  if (_WRS_VXWORKS_MAJOR > 6) || ((_WRS_VXWORKS_MAJOR == 6) && (_WRS_VXWORKS_MINOR >= 6))
+#    include <vxCpuLib.h>
+#    include <cpuset.h>
+#    define QT_VXWORKS_HAS_CPUSET
+#  endif
+#endif
 
 #if defined(Q_OS_MAC)
 # ifdef qDebug
@@ -85,6 +92,13 @@ static pthread_key_t current_thread_data_key;
 
 static void destroy_current_thread_data(void *p)
 {
+#if defined(Q_OS_VXWORKS)
+    // Calling setspecific(..., 0) sets the value to 0 for ALL threads.
+    // The 'set to 1' workaround adds a bit of an overhead though,
+    // since this function is called twice now.
+    if (p == (void *)1)
+        return;
+#endif
     // POSIX says the value in our key is set to zero before calling
     // this destructor function, so we need to set it back to the
     // right value...
@@ -93,7 +107,12 @@ static void destroy_current_thread_data(void *p)
     // ... but we must reset it to zero before returning so we aren't
     // called again (POSIX allows implementations to call destructor
     // functions repeatedly until all values are zero)
-    pthread_setspecific(current_thread_data_key, 0);
+    pthread_setspecific(current_thread_data_key,
+#if defined(Q_OS_VXWORKS)
+                                                 (void *)1);
+#else
+                                                 0);
+#endif
 }
 
 static void create_current_thread_data_key()
@@ -267,7 +286,25 @@ int QThread::idealThreadCount()
     // IRIX
     cores = (int)sysconf(_SC_NPROC_ONLN);
 #elif defined(Q_OS_INTEGRITY)
-    // ### TODO - how to get the amound of CPUs on INTEGRITY?
+    // as of aug 2008 Integrity only supports one single core CPU
+    cores = 1;
+#elif defined(Q_OS_VXWORKS)
+    // VxWorks
+#  if defined(QT_VXWORKS_HAS_CPUSET)
+    cpuset_t cpus = vxCpuEnabledGet();
+    cores = 0;
+
+    // 128 cores should be enough for everyone ;)
+    for (int i = 0; i < 128 && !CPUSET_ISZERO(cpus); ++i) {
+        if (CPUSET_ISSET(cpus, i)) {
+            CPUSET_CLR(cpus, i);
+            cores++;
+        }
+    }
+#  else
+    // as of aug 2008 VxWorks < 6.6 only supports one single core CPU
+    cores = 1;
+#  endif
 #else
     // the rest: Linux, Solaris, AIX, Tru64
     cores = (int)sysconf(_SC_NPROCESSORS_ONLN);
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 85e49c7..8608fe4 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -2640,6 +2640,8 @@ static QString timeZone()
 # else
     return QString::fromLocal8Bit(_tzname[1]);
 # endif
+#elif defined(Q_OS_VXWORKS)
+    return QString();
 #else
     tzset();
     return QString::fromLocal8Bit(tzname[1]);
@@ -4938,6 +4940,9 @@ static inline void Storeinc(ULong *&a, const ULong &b, const ULong &c)
 #define Bletch 0x10
 #define Bndry_mask  0xfffff
 #define Bndry_mask1 0xfffff
+#if defined(LSB) && defined(Q_OS_VXWORKS)
+#undef LSB
+#endif
 #define LSB 1
 #define Sign_bit 0x80000000
 #define Log2P 1
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 3527308..c1d48ec 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -688,6 +688,10 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
         {tools/regexp}{Regular Expression Example}
 */
 
+#if defined(Q_OS_VXWORKS) && defined(EOS)
+#  undef EOS
+#endif
+
 const int NumBadChars = 64;
 #define BadChar(ch) ((ch).unicode() % NumBadChars)
 
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 08c94ac..44fbb62 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -109,4 +109,4 @@ SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \
            tools/qharfbuzz.cpp
 HEADERS += tools/qharfbuzz_p.h
 
-!macx-icc:unix:LIBS += -lm
+!macx-icc:!vxworks:unix:LIBS += -lm
diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h
index f1614ea..7a4d2a8 100644
--- a/src/corelib/xml/qxmlstream_p.h
+++ b/src/corelib/xml/qxmlstream_p.h
@@ -54,6 +54,10 @@
 #ifndef QXMLSTREAM_P_H
 #define QXMLSTREAM_P_H
 
+#if defined(Q_OS_VXWORKS) && defined(ERROR)
+#  undef ERROR
+#endif
+
 class QXmlStreamReader_Table
 {
 public: