diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/arch/arch.pri | 3 | ||||
-rw-r--r-- | src/corelib/arch/macosx/arch.pri | 6 | ||||
-rw-r--r-- | src/corelib/arch/macosx/qatomic32_ppc.s | 169 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_macosx.h | 57 |
4 files changed, 2 insertions, 233 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index 2921f8edc5..e8699a27c6 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -4,7 +4,8 @@ win32:HEADERS += arch/qatomic_windows.h \ win32-g++*:HEADERS += arch/qatomic_i386.h \ arch/qatomic_x86_64.h -mac:HEADERS += arch/qatomic_macosx.h \ +mac:HEADERS += arch/qatomic_i386.h \ + arch/qatomic_x86_64.h \ arch/qatomic_generic.h vxworks:HEADERS += arch/qatomic_vxworks.h diff --git a/src/corelib/arch/macosx/arch.pri b/src/corelib/arch/macosx/arch.pri deleted file mode 100644 index a2b1bf759a..0000000000 --- a/src/corelib/arch/macosx/arch.pri +++ /dev/null @@ -1,6 +0,0 @@ -# -# Mac OS X architecture -# - -# Left blank intentionally since all the current compilers that we support can -# handle in-line assembly. diff --git a/src/corelib/arch/macosx/qatomic32_ppc.s b/src/corelib/arch/macosx/qatomic32_ppc.s deleted file mode 100644 index 72b02280dd..0000000000 --- a/src/corelib/arch/macosx/qatomic32_ppc.s +++ /dev/null @@ -1,169 +0,0 @@ -;/**************************************************************************** -;** -;** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -;** All rights reserved. -;** 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$ -;** -;****************************************************************************/ - .section __TEXT,__text,regular,pure_instructions - .section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32 - .section __TEXT,__text,regular,pure_instructions - .align 2 - .align 2 - .globl _q_atomic_test_and_set_int - .section __TEXT,__text,regular,pure_instructions - .align 2 -_q_atomic_test_and_set_int: - lwarx r6,0,r3 - cmpw r6,r4 - bne- $+20 - stwcx. r5,0,r3 - bne- $-16 - addi r3,0,1 - blr - addi r3,0,0 - blr - - .align 2 - .globl _q_atomic_test_and_set_acquire_int - .section __TEXT,__text,regular,pure_instructions - .align 2 -_q_atomic_test_and_set_acquire_int: - lwarx r6,0,r3 - cmpw r6,r4 - bne- $+20 - stwcx. r5,0,r3 - bne- $-16 - addi r3,0,1 - b $+8 - addi r3,0,0 - eieio - blr - - .align 2 - .globl _q_atomic_test_and_set_release_int - .section __TEXT,__text,regular,pure_instructions - .align 2 -_q_atomic_test_and_set_release_int: - eieio - lwarx r6,0,r3 - cmpw r6,r4 - bne- $+20 - stwcx. r5,0,r3 - bne- $-16 - addi r3,0,1 - blr - addi r3,0,0 - blr - - .align 2 - .globl _q_atomic_test_and_set_ptr - .section __TEXT,__text,regular,pure_instructions - .align 2 -_q_atomic_test_and_set_ptr: - lwarx r6,0,r3 - cmpw r6,r4 - bne- $+20 - stwcx. r5,0,r3 - bne- $-16 - addi r3,0,1 - blr - addi r3,0,0 - blr - - .align 2 - .globl _q_atomic_increment - .section __TEXT,__text,regular,pure_instructions - .align 2 -_q_atomic_increment: - lwarx r4,0,r3 - addi r4,r4,1 - stwcx. r4,0,r3 - bne- $-12 - mr r3,r4 - blr - - .align 2 - .globl _q_atomic_decrement - .section __TEXT,__text,regular,pure_instructions - .align 2 -_q_atomic_decrement: - lwarx r4,0,r3 - subi r4,r4,1 - stwcx. r4,0,r3 - bne- $-12 - mr r3,r4 - blr - - .align 2 - .globl _q_atomic_set_int - .section __TEXT,__text,regular,pure_instructions - .align 2 -_q_atomic_set_int: - lwarx r5,0,r3 - stwcx. r4,0,r3 - bne- $-8 - mr r3,r5 - blr - - .align 2 - .globl _q_atomic_set_ptr - .section __TEXT,__text,regular,pure_instructions - .align 2 -_q_atomic_set_ptr: - lwarx r5,0,r3 - stwcx. r4,0,r3 - bne- $-8 - mr r3,r5 - blr - -.globl q_atomic_test_and_set_int.eh - q_atomic_test_and_set_int.eh = 0 -.globl q_atomic_test_and_set_ptr.eh - q_atomic_test_and_set_ptr.eh = 0 -.globl q_atomic_increment.eh - q_atomic_increment.eh = 0 -.globl q_atomic_decrement.eh - q_atomic_decrement.eh = 0 -.globl q_atomic_set_int.eh - q_atomic_set_int.eh = 0 -.globl q_atomic_set_ptr.eh - q_atomic_set_ptr.eh = 0 -.data -.constructor -.data -.destructor -.align 1 diff --git a/src/corelib/arch/qatomic_macosx.h b/src/corelib/arch/qatomic_macosx.h deleted file mode 100644 index a839aed4bf..0000000000 --- a/src/corelib/arch/qatomic_macosx.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** 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$ -** -****************************************************************************/ - -#ifndef QATOMIC_MACOSX_H -#define QATOMIC_MACOSX_H - -QT_BEGIN_HEADER - -#if defined(__x86_64__) -# include <QtCore/qatomic_x86_64.h> -#elif defined(__i386__) -# include <QtCore/qatomic_i386.h> -#else // !__x86_64 && !__i386__ -# include <QtCore/qatomic_powerpc.h> -#endif // !__x86_64__ && !__i386__ - -QT_END_HEADER - -#endif // QATOMIC_MACOSX_H |