qt4: add aarch64 support
Add aarch64 support for qt4 packages. Most of the patches are derived from debian: http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/tree/debian/patches Add arch check to set right QT_ARCH. Disable webkit temporarily for qt4 and qt4-embedded that they fail to build: | runtime/JSValueInlineMethods.h: In constructor 'JSC::JSValue::JSValue(const JSC::JSCell*)': | runtime/JSValueInlineMethods.h:242:78: error: cast from 'JSC::JSCell*' to 'int32_t {aka int}' loses precision [-fpermissive] It has been fix by Qt5, but didn't backport to Qt4. There is an still open defect for it: https://bugreports.qt-project.org/browse/QTBUG-35442 (From OE-Core rev: 886e0d43f2a543a13ac8e3f1cb570ecae90339e0) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5b3107af9e
commit
fbfabde9d5
|
@ -22,6 +22,10 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
|
|||
file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
|
||||
file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
|
||||
file://0028-Don-t-crash-on-broken-GIF-images.patch \
|
||||
file://0029-aarch64_arm64_fix_arch_detection.patch \
|
||||
file://0030-aarch64_arm64_qatomic_support.patch \
|
||||
file://0031-aarch64_arm64_mkspecs.patch \
|
||||
file://0032-aarch64_add_header.patch \
|
||||
file://g++.conf \
|
||||
file://linux.conf \
|
||||
"
|
||||
|
@ -36,6 +40,9 @@ S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
|
|||
# https://bugreports.qt-project.org/browse/QTBUG-39224
|
||||
QT_CONFIG_FLAGS_append_mips64 = "${@bb.utils.contains("TUNE_FEATURES", "n32", " -no-webkit", "" ,d)}"
|
||||
|
||||
# disable webkit for aarch64 temporarily that fails to compile
|
||||
QT_CONFIG_FLAGS_append_aarch64 = " -no-webkit"
|
||||
|
||||
FILES_${QT_BASE_NAME}-tools_append = " ${bindir}/qml ${bindir}/qmlplugindump"
|
||||
FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump"
|
||||
|
||||
|
|
|
@ -0,0 +1,53 @@
|
|||
From 800abbba658203fc8e746e3fc780a297cd4110cf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
|
||||
<perezmeyer@gmail.com>
|
||||
Date: Wed, 20 Aug 2014 17:52:49 -0300
|
||||
Subject: [PATCH] Fix AArch64/arm64 detection.
|
||||
|
||||
The detection needs to go before arm, else the system will detect AArch64/arm64
|
||||
as arm.
|
||||
|
||||
This patch comes from Wookey, he has agreed to put it under BSD or Expat
|
||||
to allow it's inclusion in here:
|
||||
<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255>
|
||||
|
||||
Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797
|
||||
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
---
|
||||
configure | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index a9ba7c8..eb88b72 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
|
||||
fi
|
||||
CFG_HOST_ARCH=s390
|
||||
;;
|
||||
- *:*:arm*)
|
||||
+ *:*:aarch64*|*:*:arm64*)
|
||||
if [ "$OPT_VERBOSE" = "yes" ]; then
|
||||
- echo " ARM (arm)"
|
||||
+ echo " AArch64 (aarch64)"
|
||||
fi
|
||||
- CFG_HOST_ARCH=arm
|
||||
+ CFG_HOST_ARCH=aarch64
|
||||
;;
|
||||
- *:*:aarch64*)
|
||||
+ *:*:arm*)
|
||||
if [ "$OPT_VERBOSE" = "yes" ]; then
|
||||
- echo " AArch64 (aarch64)"
|
||||
+ echo " ARM (arm)"
|
||||
fi
|
||||
- CFG_HOST_ARCH=aarch64
|
||||
+ CFG_HOST_ARCH=arm
|
||||
;;
|
||||
Linux:*:sparc*)
|
||||
if [ "$OPT_VERBOSE" = "yes" ]; then
|
||||
--
|
||||
2.1.0
|
|
@ -0,0 +1,491 @@
|
|||
From 294010b562c9846bb2bc4ee9c63ff78adc7c1f4f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
|
||||
<perezmeyer@gmail.com>
|
||||
Date: Sat, 15 Mar 2014 15:40:49 -0300
|
||||
Subject: [PATCH] Add qatomic support for AArch64 (aka arm64).
|
||||
|
||||
Patch by Mark Salter <msalter@redhat.com>
|
||||
licensed under BSD:
|
||||
|
||||
<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#195>
|
||||
|
||||
This patch is known to not be the most correct way
|
||||
to implement them, as it seems to be possible to do it in a faster way,
|
||||
but should work non the less until we can provide something better.
|
||||
|
||||
Change-Id: Ib392b27dc54691fd4c2ea9896240ad71fb8128cc
|
||||
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
|
||||
---
|
||||
src/corelib/arch/aarch64/arch.pri | 4 +
|
||||
src/corelib/arch/aarch64/qatomic_aarch64.cpp | 70 ++++++
|
||||
src/corelib/arch/arch.pri | 4 +-
|
||||
src/corelib/arch/qatomic_aarch64.h | 335 +++++++++++++++++++++++++++
|
||||
src/corelib/arch/qatomic_arch.h | 2 +
|
||||
5 files changed, 414 insertions(+), 1 deletion(-)
|
||||
create mode 100644 src/corelib/arch/aarch64/arch.pri
|
||||
create mode 100644 src/corelib/arch/aarch64/qatomic_aarch64.cpp
|
||||
create mode 100644 src/corelib/arch/qatomic_aarch64.h
|
||||
|
||||
diff --git a/src/corelib/arch/aarch64/arch.pri b/src/corelib/arch/aarch64/arch.pri
|
||||
new file mode 100644
|
||||
index 0000000..63523d9
|
||||
--- /dev/null
|
||||
+++ b/src/corelib/arch/aarch64/arch.pri
|
||||
@@ -0,0 +1,4 @@
|
||||
+#
|
||||
+# AArch64 architecture
|
||||
+#
|
||||
+SOURCES += $$QT_ARCH_CPP/qatomic_aarch64.cpp
|
||||
diff --git a/src/corelib/arch/aarch64/qatomic_aarch64.cpp b/src/corelib/arch/aarch64/qatomic_aarch64.cpp
|
||||
new file mode 100644
|
||||
index 0000000..fc851b9
|
||||
--- /dev/null
|
||||
+++ b/src/corelib/arch/aarch64/qatomic_aarch64.cpp
|
||||
@@ -0,0 +1,70 @@
|
||||
+/****************************************************************************
|
||||
+**
|
||||
+** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
+** Contact: http://www.qt-project.org/legal
|
||||
+**
|
||||
+** This file is part of the QtCore module of the Qt Toolkit.
|
||||
+**
|
||||
+** $QT_BEGIN_LICENSE:LGPL$
|
||||
+** Commercial License Usage
|
||||
+** Licensees holding valid commercial Qt licenses may use this file in
|
||||
+** accordance with the commercial license agreement provided with the
|
||||
+** Software or, alternatively, in accordance with the terms contained in
|
||||
+** a written agreement between you and Digia. For licensing terms and
|
||||
+** conditions see http://qt.digia.com/licensing. For further information
|
||||
+** use the contact form at http://qt.digia.com/contact-us.
|
||||
+**
|
||||
+** 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, Digia gives you certain additional
|
||||
+** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
+** version 1.1, 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.
|
||||
+**
|
||||
+**
|
||||
+** $QT_END_LICENSE$
|
||||
+**
|
||||
+****************************************************************************/
|
||||
+
|
||||
+#include <QtCore/qglobal.h>
|
||||
+
|
||||
+#include <unistd.h>
|
||||
+#ifdef _POSIX_PRIORITY_SCHEDULING
|
||||
+# include <sched.h>
|
||||
+#endif
|
||||
+#include <time.h>
|
||||
+
|
||||
+QT_BEGIN_NAMESPACE
|
||||
+
|
||||
+QT_USE_NAMESPACE
|
||||
+
|
||||
+Q_CORE_EXPORT void qt_atomic_yield(int *count)
|
||||
+{
|
||||
+#ifdef _POSIX_PRIORITY_SCHEDULING
|
||||
+ if ((*count)++ < 50) {
|
||||
+ sched_yield();
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
+ struct timespec tm;
|
||||
+ tm.tv_sec = 0;
|
||||
+ tm.tv_nsec = 2000001;
|
||||
+ nanosleep(&tm, NULL);
|
||||
+ *count = 0;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+QT_END_NAMESPACE
|
||||
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri
|
||||
index cd23e5e..f50fca7 100644
|
||||
--- a/src/corelib/arch/arch.pri
|
||||
+++ b/src/corelib/arch/arch.pri
|
||||
@@ -31,7 +31,9 @@ integrity:HEADERS += arch/qatomic_integrity.h
|
||||
arch/qatomic_s390.h \
|
||||
arch/qatomic_x86_64.h \
|
||||
arch/qatomic_sh.h \
|
||||
- arch/qatomic_sh4a.h
|
||||
+ arch/qatomic_sh4a.h \
|
||||
+ arch/qatomic_aarch64.h \
|
||||
+
|
||||
|
||||
QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH
|
||||
DEPENDPATH += $$QT_ARCH_CPP
|
||||
diff --git a/src/corelib/arch/qatomic_aarch64.h b/src/corelib/arch/qatomic_aarch64.h
|
||||
new file mode 100644
|
||||
index 0000000..de61ca8
|
||||
--- /dev/null
|
||||
+++ b/src/corelib/arch/qatomic_aarch64.h
|
||||
@@ -0,0 +1,335 @@
|
||||
+/****************************************************************************
|
||||
+**
|
||||
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
+** Contact: http://www.qt-project.org/legal
|
||||
+**
|
||||
+** This file is part of the QtCore module of the Qt Toolkit.
|
||||
+**
|
||||
+** $QT_BEGIN_LICENSE:LGPL$
|
||||
+** Commercial License Usage
|
||||
+** Licensees holding valid commercial Qt licenses may use this file in
|
||||
+** accordance with the commercial license agreement provided with the
|
||||
+** Software or, alternatively, in accordance with the terms contained in
|
||||
+** a written agreement between you and Digia. For licensing terms and
|
||||
+** conditions see http://qt.digia.com/licensing. For further information
|
||||
+** use the contact form at http://qt.digia.com/contact-us.
|
||||
+**
|
||||
+** 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, Digia gives you certain additional
|
||||
+** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
+** version 1.1, 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.
|
||||
+**
|
||||
+**
|
||||
+** $QT_END_LICENSE$
|
||||
+**
|
||||
+****************************************************************************/
|
||||
+
|
||||
+#ifndef QATOMIC_AARCH64_H
|
||||
+#define QATOMIC_AARCH64_H
|
||||
+
|
||||
+QT_BEGIN_HEADER
|
||||
+
|
||||
+QT_BEGIN_NAMESPACE
|
||||
+
|
||||
+#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
|
||||
+
|
||||
+inline bool QBasicAtomicInt::isReferenceCountingNative()
|
||||
+{ return true; }
|
||||
+inline bool QBasicAtomicInt::isReferenceCountingWaitFree()
|
||||
+{ return false; }
|
||||
+
|
||||
+#define Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE
|
||||
+
|
||||
+inline bool QBasicAtomicInt::isTestAndSetNative()
|
||||
+{ return true; }
|
||||
+inline bool QBasicAtomicInt::isTestAndSetWaitFree()
|
||||
+{ return false; }
|
||||
+
|
||||
+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE
|
||||
+
|
||||
+inline bool QBasicAtomicInt::isFetchAndStoreNative()
|
||||
+{ return true; }
|
||||
+inline bool QBasicAtomicInt::isFetchAndStoreWaitFree()
|
||||
+{ return false; }
|
||||
+
|
||||
+#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE
|
||||
+
|
||||
+inline bool QBasicAtomicInt::isFetchAndAddNative()
|
||||
+{ return true; }
|
||||
+inline bool QBasicAtomicInt::isFetchAndAddWaitFree()
|
||||
+{ return false; }
|
||||
+
|
||||
+#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetNative()
|
||||
+{ return true; }
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetWaitFree()
|
||||
+{ return false; }
|
||||
+
|
||||
+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreNative()
|
||||
+{ return true; }
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreWaitFree()
|
||||
+{ return false; }
|
||||
+
|
||||
+#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddNative()
|
||||
+{ return true; }
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
|
||||
+{ return false; }
|
||||
+
|
||||
+#ifndef Q_DATA_MEMORY_BARRIER
|
||||
+# define Q_DATA_MEMORY_BARRIER asm volatile("dmb sy\n":::"memory")
|
||||
+#endif
|
||||
+#ifndef Q_COMPILER_MEMORY_BARRIER
|
||||
+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory")
|
||||
+#endif
|
||||
+
|
||||
+inline bool QBasicAtomicInt::ref()
|
||||
+{
|
||||
+ int newValue;
|
||||
+
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ newValue = __atomic_add_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+
|
||||
+ return newValue != 0;
|
||||
+}
|
||||
+
|
||||
+inline bool QBasicAtomicInt::deref()
|
||||
+{
|
||||
+ int newValue;
|
||||
+
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ newValue = __atomic_sub_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+
|
||||
+ return newValue != 0;
|
||||
+}
|
||||
+
|
||||
+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
|
||||
+{
|
||||
+ bool val;
|
||||
+
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
|
||||
+ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return val;
|
||||
+}
|
||||
+
|
||||
+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
|
||||
+{
|
||||
+ int val;
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return val;
|
||||
+}
|
||||
+
|
||||
+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
|
||||
+{
|
||||
+ int val;
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return val;
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
|
||||
+{
|
||||
+ bool val;
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
|
||||
+ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return val;
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
|
||||
+{
|
||||
+ T *val;
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return val;
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
|
||||
+{
|
||||
+ T *val;
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return val;
|
||||
+}
|
||||
+
|
||||
+inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
|
||||
+{
|
||||
+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return testAndSetRelaxed(expectedValue, newValue);
|
||||
+}
|
||||
+
|
||||
+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
|
||||
+{
|
||||
+ int returnValue = fetchAndStoreRelaxed(newValue);
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return fetchAndStoreRelaxed(newValue);
|
||||
+}
|
||||
+
|
||||
+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ int returnValue = fetchAndStoreRelaxed(newValue);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
|
||||
+{
|
||||
+ int returnValue = fetchAndAddRelaxed(valueToAdd);
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return fetchAndAddRelaxed(valueToAdd);
|
||||
+}
|
||||
+
|
||||
+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ int returnValue = fetchAndAddRelaxed(valueToAdd);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)
|
||||
+{
|
||||
+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return testAndSetRelaxed(expectedValue, newValue);
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ bool returnValue = testAndSetAcquire(expectedValue, newValue);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
|
||||
+{
|
||||
+ T *returnValue = fetchAndStoreRelaxed(newValue);
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return fetchAndStoreRelaxed(newValue);
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ T *returnValue = fetchAndStoreRelaxed(newValue);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
|
||||
+{
|
||||
+ T *returnValue = fetchAndAddRelaxed(valueToAdd);
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ return fetchAndAddRelaxed(valueToAdd);
|
||||
+}
|
||||
+
|
||||
+template <typename T>
|
||||
+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
|
||||
+{
|
||||
+ Q_DATA_MEMORY_BARRIER;
|
||||
+ T *returnValue = fetchAndAddRelaxed(valueToAdd);
|
||||
+ Q_COMPILER_MEMORY_BARRIER;
|
||||
+ return returnValue;
|
||||
+}
|
||||
+
|
||||
+#undef Q_DATA_MEMORY_BARRIER
|
||||
+#undef Q_COMPILER_MEMORY_BARRIER
|
||||
+
|
||||
+QT_END_NAMESPACE
|
||||
+
|
||||
+QT_END_HEADER
|
||||
+
|
||||
+#endif // QATOMIC_AARCH64_H
|
||||
diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h
|
||||
index 141726c..3e96926 100644
|
||||
--- a/src/corelib/arch/qatomic_arch.h
|
||||
+++ b/src/corelib/arch/qatomic_arch.h
|
||||
@@ -94,6 +94,8 @@ QT_BEGIN_HEADER
|
||||
# include "QtCore/qatomic_sh4a.h"
|
||||
#elif defined(QT_ARCH_NACL)
|
||||
# include "QtCore/qatomic_generic.h"
|
||||
+#elif defined(QT_ARCH_AARCH64)
|
||||
+# include "QtCore/qatomic_aarch64.h"
|
||||
#else
|
||||
# error "Qt has not been ported to this architecture"
|
||||
#endif
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -0,0 +1,124 @@
|
|||
From 7090fc80ff630712a90de92403190f647dd38a39 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
|
||||
<perezmeyer@gmail.com>
|
||||
Date: Sat, 15 Mar 2014 15:35:00 -0300
|
||||
Subject: [PATCH] mkspecs for AArch64 (aka arm64).
|
||||
|
||||
Patch by Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
|
||||
licensed under either Public Domain or BSD:
|
||||
|
||||
<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#179>
|
||||
|
||||
Change-Id: I21f17953234cfb176bac023e52ecdc927fc5c1a9
|
||||
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
|
||||
---
|
||||
configure | 3 +++
|
||||
mkspecs/linux-g++-aarch64/qmake.conf | 27 ++++++++++++++++++++
|
||||
mkspecs/linux-g++-aarch64/qplatformdefs.h | 42 +++++++++++++++++++++++++++++++
|
||||
3 files changed, 72 insertions(+)
|
||||
create mode 100644 mkspecs/linux-g++-aarch64/qmake.conf
|
||||
create mode 100644 mkspecs/linux-g++-aarch64/qplatformdefs.h
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index a9ba7c8..e57d053 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2808,6 +2808,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then
|
||||
*86_64)
|
||||
PLATFORM=qws/linux-x86_64-g++
|
||||
;;
|
||||
+ aarch64)
|
||||
+ PLATFORM=linux-aarch64-g++
|
||||
+ ;;
|
||||
*)
|
||||
PLATFORM=qws/linux-generic-g++
|
||||
;;
|
||||
diff --git a/mkspecs/linux-g++-aarch64/qmake.conf b/mkspecs/linux-g++-aarch64/qmake.conf
|
||||
new file mode 100644
|
||||
index 0000000..ebc0a92
|
||||
--- /dev/null
|
||||
+++ b/mkspecs/linux-g++-aarch64/qmake.conf
|
||||
@@ -0,0 +1,27 @@
|
||||
+#
|
||||
+# qmake configuration for linux-g++
|
||||
+#
|
||||
+# Written for GNU/Linux platforms that have both lib and lib64 directories,
|
||||
+# like the AMD Opteron.
|
||||
+#
|
||||
+
|
||||
+MAKEFILE_GENERATOR = UNIX
|
||||
+TARGET_PLATFORM = unix
|
||||
+TEMPLATE = app
|
||||
+CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
|
||||
+QT += core gui
|
||||
+QMAKE_INCREMENTAL_STYLE = sublib
|
||||
+
|
||||
+QMAKE_CFLAGS =
|
||||
+QMAKE_LFLAGS =
|
||||
+
|
||||
+QMAKE_CFLAGS_RELEASE += -O2
|
||||
+
|
||||
+include(../common/linux.conf)
|
||||
+include(../common/gcc-base-unix.conf)
|
||||
+include(../common/g++-unix.conf)
|
||||
+
|
||||
+QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
|
||||
+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
|
||||
+
|
||||
+load(qt_config)
|
||||
diff --git a/mkspecs/linux-g++-aarch64/qplatformdefs.h b/mkspecs/linux-g++-aarch64/qplatformdefs.h
|
||||
new file mode 100644
|
||||
index 0000000..562128b
|
||||
--- /dev/null
|
||||
+++ b/mkspecs/linux-g++-aarch64/qplatformdefs.h
|
||||
@@ -0,0 +1,42 @@
|
||||
+/****************************************************************************
|
||||
+**
|
||||
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
+** Contact: http://www.qt-project.org/legal
|
||||
+**
|
||||
+** This file is part of the qmake spec of the Qt Toolkit.
|
||||
+**
|
||||
+** $QT_BEGIN_LICENSE:LGPL$
|
||||
+** Commercial License Usage
|
||||
+** Licensees holding valid commercial Qt licenses may use this file in
|
||||
+** accordance with the commercial license agreement provided with the
|
||||
+** Software or, alternatively, in accordance with the terms contained in
|
||||
+** a written agreement between you and Digia. For licensing terms and
|
||||
+** conditions see http://qt.digia.com/licensing. For further information
|
||||
+** use the contact form at http://qt.digia.com/contact-us.
|
||||
+**
|
||||
+** 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, Digia gives you certain additional
|
||||
+** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
+** version 1.1, 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.
|
||||
+**
|
||||
+**
|
||||
+** $QT_END_LICENSE$
|
||||
+**
|
||||
+****************************************************************************/
|
||||
+
|
||||
+#include "../linux-g++/qplatformdefs.h"
|
||||
--
|
||||
2.1.0
|
||||
|
File diff suppressed because one or more lines are too long
|
@ -18,6 +18,10 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
|
|||
file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \
|
||||
file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
|
||||
file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \
|
||||
file://0029-aarch64_arm64_fix_arch_detection.patch \
|
||||
file://0030-aarch64_arm64_qatomic_support.patch \
|
||||
file://0031-aarch64_arm64_mkspecs.patch \
|
||||
file://0032-aarch64_add_header.patch \
|
||||
file://g++.conf \
|
||||
file://linux.conf \
|
||||
"
|
||||
|
|
|
@ -4,6 +4,7 @@ ARM_INSTRUCTION_SET = "arm"
|
|||
|
||||
set_arch() {
|
||||
case ${TARGET_ARCH} in
|
||||
aarch64) QT_ARCH=aarch64 ;;
|
||||
arm*) QT_ARCH=arm ;;
|
||||
i*86*) QT_ARCH=i386 ;;
|
||||
mips*) QT_ARCH=mips ;;
|
||||
|
|
Loading…
Reference in New Issue