From c4759d19f8428b64b46bfd1e07a5cfda2937e7d1 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Fri, 10 Feb 2012 12:18:41 +0100 Subject: Remove the SH atomic implementation... ... but keep SH-4a, which provides a more efficient implementation. The implementation removed here was very similar to the code removed by commit dc5388e79b71d796c1207681235cf007c39810bd. Support for SH can be provided by qatomic_gcc.h, or re-added in the future if absolutely necessary. Change-Id: Ic38b57c9513fc9c3c99ba7e102780a3939b735b9 Reviewed-by: Thiago Macieira --- src/corelib/arch/sh/qatomic_sh.cpp | 72 -------------------------------------- 1 file changed, 72 deletions(-) delete mode 100644 src/corelib/arch/sh/qatomic_sh.cpp (limited to 'src/corelib/arch/sh/qatomic_sh.cpp') diff --git a/src/corelib/arch/sh/qatomic_sh.cpp b/src/corelib/arch/sh/qatomic_sh.cpp deleted file mode 100644 index 5cd1b593d8..0000000000 --- a/src/corelib/arch/sh/qatomic_sh.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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.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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include -#ifdef _POSIX_PRIORITY_SCHEDULING -# include -#endif -#include - -QT_BEGIN_NAMESPACE - -QT_USE_NAMESPACE - -Q_CORE_EXPORT volatile char qt_atomic_lock = 0; - -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 -- cgit v1.2.3