diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-08 17:20:06 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-01-19 23:41:52 +0000 |
commit | 7ffcafd1b5baab0cbb6022ae7b9d4ca1bd76c353 (patch) | |
tree | b0e097ee4147a27d0339bb2d8923ba6a2a9250ae /src/corelib/arch/qatomic_armv7.h | |
parent | 57671bebbcfc06d0ad390dd470f51eb1f8556314 (diff) |
Remove all the atomic code besides MSVC and std::atomic
[ChangeLog][Important Behavior Changes] Starting with Qt 5.7, Qt
requires a C++11 compiler with support for C++11 atomics. This affects
user code too: Qt headers no longer compile with a C++98 compiler. The
minimum compiler versions for this release are:
* Clang 3.4 (found in XCode 5.1)
* GCC 4.7
* Microsoft Visual Studio 2012
Change-Id: Ib056b47dde3341ef9a52ffff13ef1f496ea9363f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Diffstat (limited to 'src/corelib/arch/qatomic_armv7.h')
-rw-r--r-- | src/corelib/arch/qatomic_armv7.h | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/src/corelib/arch/qatomic_armv7.h b/src/corelib/arch/qatomic_armv7.h deleted file mode 100644 index 4ea0551c82..0000000000 --- a/src/corelib/arch/qatomic_armv7.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QATOMIC_ARMV7_H -#define QATOMIC_ARMV7_H - -// use the DMB instruction when compiling for ARMv7, ... -#ifndef Q_CC_RCVT -# define Q_DATA_MEMORY_BARRIER asm volatile("dmb\n":::"memory") -#else -# define Q_DATA_MEMORY_BARRIER do{__asm { dmb } __schedule_barrier();}while(0) -#endif - -// ... but the implementation is otherwise identical to that for ARMv6 -#include "QtCore/qatomic_armv6.h" - -#if 0 -// silence syncqt warnings -QT_BEGIN_NAMESPACE - -QT_END_NAMESPACE - -#pragma qt_sync_skip_header_check -#pragma qt_sync_stop_processing -#endif - -#endif // QATOMIC_ARMV7_H |