From 7b82034600f9b20aa6b5b85ba908e0bb724948c4 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Fri, 3 Feb 2012 09:30:38 +0100 Subject: Remove src/corelib/arch/mips/* Commit 99fb1bea49c4de5cf3143af59f8c96a92980e58f removed the use of the old, out-of-line q_atomic_* implementation. Remove these functions from the library. Change-Id: I0b239bf779e0545cb5558862e3a40f6e95fdcbd9 Reviewed-by: Thiago Macieira --- src/corelib/arch/mips/arch.pri | 8 -- src/corelib/arch/mips/qatomic_mips32.s | 150 --------------------------------- src/corelib/arch/mips/qatomic_mips64.s | 138 ------------------------------ 3 files changed, 296 deletions(-) delete mode 100644 src/corelib/arch/mips/arch.pri delete mode 100644 src/corelib/arch/mips/qatomic_mips32.s delete mode 100644 src/corelib/arch/mips/qatomic_mips64.s (limited to 'src/corelib/arch') diff --git a/src/corelib/arch/mips/arch.pri b/src/corelib/arch/mips/arch.pri deleted file mode 100644 index 296c845ab3..0000000000 --- a/src/corelib/arch/mips/arch.pri +++ /dev/null @@ -1,8 +0,0 @@ -# -# MIPS 3/4 architecture -# - -# note: even though we use inline assembler with gcc, we always -# include the compiled version to keep binary compatibility -*-64:SOURCES += $$QT_ARCH_CPP/qatomic_mips64.s -else:SOURCES += $$QT_ARCH_CPP/qatomic_mips32.s diff --git a/src/corelib/arch/mips/qatomic_mips32.s b/src/corelib/arch/mips/qatomic_mips32.s deleted file mode 100644 index cc41c28da5..0000000000 --- a/src/corelib/arch/mips/qatomic_mips32.s +++ /dev/null @@ -1,150 +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$ -;** -;****************************************************************************/ - .set nobopt - .set noreorder - .option pic2 - .text - - .globl q_atomic_test_and_set_int - .ent q_atomic_test_and_set_int - .set mips2 -q_atomic_test_and_set_int: -1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: jr $31 - move $2,$0 - .set mips0 - .end q_atomic_test_and_set_int - - .globl q_atomic_test_and_set_acquire_int - .ent q_atomic_test_and_set_acquire_int - .set mips2 -q_atomic_test_and_set_acquire_int: -1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: sync - jr $31 - move $2,$0 - .set mips0 - .end q_atomic_test_and_set_acquire_int - - .globl q_atomic_test_and_set_release_int - .ent q_atomic_test_and_set_release_int - .set mips2 -q_atomic_test_and_set_release_int: - sync -1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: jr $31 - move $2,$0 - .set mips0 - .end q_atomic_test_and_set_release_int - - .globl q_atomic_test_and_set_ptr - .ent q_atomic_test_and_set_ptr - .set mips2 -q_atomic_test_and_set_ptr: -1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: jr $31 - move $2,$0 - .set mips0 - .end q_atomic_test_and_set_ptr - - .globl q_atomic_test_and_set_acquire_ptr - .ent q_atomic_test_and_set_acquire_ptr - .set mips2 -q_atomic_test_and_set_acquire_ptr: -1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: sync - jr $31 - move $2,$0 - .set mips0 - .end q_atomic_test_and_set_acquire_ptr - - .globl q_atomic_test_and_set_release_ptr - .ent q_atomic_test_and_set_release_ptr - .set mips2 -q_atomic_test_and_set_release_ptr: - sync -1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: jr $31 - move $2,$0 - .set mips0 - .end q_atomic_test_and_set_release_ptr diff --git a/src/corelib/arch/mips/qatomic_mips64.s b/src/corelib/arch/mips/qatomic_mips64.s deleted file mode 100644 index cd6a2521e6..0000000000 --- a/src/corelib/arch/mips/qatomic_mips64.s +++ /dev/null @@ -1,138 +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$ -;** -;****************************************************************************/ - .set nobopt - .set noreorder - .option pic2 - .text - - .globl q_atomic_test_and_set_int - .ent q_atomic_test_and_set_int -q_atomic_test_and_set_int: -1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: jr $31 - move $2,$0 - .end q_atomic_test_and_set_int - - .globl q_atomic_test_and_set_acquire_int - .ent q_atomic_test_and_set_acquire_int -q_atomic_test_and_set_acquire_int: -1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: sync - jr $31 - move $2,$0 - .end q_atomic_test_and_set_acquire_int - - .globl q_atomic_test_and_set_release_int - .ent q_atomic_test_and_set_release_int -q_atomic_test_and_set_release_int: - sync -1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: jr $31 - move $2,$0 - .end q_atomic_test_and_set_release_int - - .globl q_atomic_test_and_set_ptr - .ent q_atomic_test_and_set_ptr -q_atomic_test_and_set_ptr: -1: lld $8,0($4) - bne $8,$5,2f - move $2,$6 - scd $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: jr $31 - move $2,$0 - .end q_atomic_test_and_set_ptr - - .globl q_atomic_test_and_set_acquire_ptr - .ent q_atomic_test_and_set_acquire_ptr -q_atomic_test_and_set_acquire_ptr: -1: lld $8,0($4) - bne $8,$5,2f - move $2,$6 - scd $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: sync - jr $31 - move $2,$0 - .end q_atomic_test_and_set_acquire_ptr - - .globl q_atomic_test_and_set_release_ptr - .ent q_atomic_test_and_set_release_ptr -q_atomic_test_and_set_release_ptr: - sync -1: lld $8,0($4) - bne $8,$5,2f - move $2,$6 - scd $2,0($4) - beqz $2,1b - nop - jr $31 - nop -2: jr $31 - move $2,$0 - .end q_atomic_test_and_set_release_ptr -- cgit v1.2.3