From 7142e689e003413cdeba3daac6496a0e2802ae22 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Fri, 3 Feb 2012 09:47:29 +0100 Subject: Remove src/corelib/arch/ia64/* The out-of-line q_atomic_test_and_set_(int|ptr) functions are no longer declared after commit 1955353149781a064bc053b86be6e221b159d4ee. They appear to have never been used either. Remove them. Change-Id: Ia8dfa1f585f2370091b4fd93aaf98cb10241bf31 Reviewed-by: Thiago Macieira --- src/corelib/arch/ia64/arch.pri | 4 -- src/corelib/arch/ia64/qatomic_ia64.s | 74 ------------------------------------ 2 files changed, 78 deletions(-) delete mode 100644 src/corelib/arch/ia64/arch.pri delete mode 100644 src/corelib/arch/ia64/qatomic_ia64.s (limited to 'src/corelib/arch') diff --git a/src/corelib/arch/ia64/arch.pri b/src/corelib/arch/ia64/arch.pri deleted file mode 100644 index 63afa967a4..0000000000 --- a/src/corelib/arch/ia64/arch.pri +++ /dev/null @@ -1,4 +0,0 @@ -# -# Intel Itanium architecture -# -!*-g++:!*-icc:!hpuxi-acc-*:SOURCES += $$QT_ARCH_CPP/qatomic_ia64.s diff --git a/src/corelib/arch/ia64/qatomic_ia64.s b/src/corelib/arch/ia64/qatomic_ia64.s deleted file mode 100644 index f2da9ba935..0000000000 --- a/src/corelib/arch/ia64/qatomic_ia64.s +++ /dev/null @@ -1,74 +0,0 @@ -;/**************************************************************************** -;** -;** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -;** Contact: http://www.qt-project.org/ -;** -;** This file is part of the QtGui 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$ -;** -;****************************************************************************/ - .pred.safe_across_calls p1-p5,p16-p63 -.text - .align 16 - .global q_atomic_test_and_set_int# - .proc q_atomic_test_and_set_int# -q_atomic_test_and_set_int: - .prologue - .body - mov ar.ccv=r33 - ;; - cmpxchg4.acq r34=[r32],r34,ar.ccv - ;; - cmp4.eq p6, p7 = r33, r34 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - .endp q_atomic_test_and_set_int# - .align 16 - .global q_atomic_test_and_set_ptr# - .proc q_atomic_test_and_set_ptr# -q_atomic_test_and_set_ptr: - .prologue - .body - mov ar.ccv=r33 - ;; - cmpxchg8.acq r34=[r32],r34,ar.ccv - ;; - cmp.eq p6, p7 = r33, r34 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - .endp q_atomic_test_and_set_ptr# -- cgit v1.2.3