diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-02-27 15:32:47 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-28 01:51:38 +0200 |
| commit | 4408d0ccd8b860cdbcc63f7f4dd835cab37c6581 (patch) | |
| tree | 5e9c7a611e5923303db2844888de64f1f917a898 /src | |
| parent | d4c8509a8379e65edcb2854ce7c527ed048e2ab1 (diff) | |
Rename qatomic_x86_64.h to qatomic_x86.h
This is the first step in merging the i386 and x86-64
architectures. The next commit will bring i386 support into
qatomic_x86.h.
Change-Id: I24105ea70f3fc29b3fb779a70053f99117440573
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/arch/arch.pri | 2 | ||||
| -rw-r--r-- | src/corelib/arch/qatomic_x86.h (renamed from src/corelib/arch/qatomic_x86_64.h) | 0 | ||||
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index c611087043..a178c24366 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -16,7 +16,7 @@ HEADERS += \ arch/qatomic_s390.h \ arch/qatomic_sh4a.h \ arch/qatomic_sparc.h \ - arch/qatomic_x86_64.h \ + arch/qatomic_x86.h \ arch/qatomic_gcc.h \ arch/qatomic_cxx11.h diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86.h index 58505e2aa9..58505e2aa9 100644 --- a/src/corelib/arch/qatomic_x86_64.h +++ b/src/corelib/arch/qatomic_x86.h diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 01a69dbd8b..8bac8d8a5f 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -82,8 +82,8 @@ # include "QtCore/qatomic_sparc.h" #elif defined(Q_PROCESSOR_X86_32) # include <QtCore/qatomic_i386.h> -#elif defined(Q_PROCESSOR_X86_64) -# include <QtCore/qatomic_x86_64.h> +#elif defined(Q_PROCESSOR_X86) +# include <QtCore/qatomic_x86.h> // Fallback compiler dependent implementation #elif defined(Q_COMPILER_ATOMICS) && defined(Q_COMPILER_CONSTEXPR) |