summaryrefslogtreecommitdiffstats
path: root/src/corelib/arch
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-02-27 15:32:47 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-28 01:51:38 +0200
commit4408d0ccd8b860cdbcc63f7f4dd835cab37c6581 (patch)
tree5e9c7a611e5923303db2844888de64f1f917a898 /src/corelib/arch
parentd4c8509a8379e65edcb2854ce7c527ed048e2ab1 (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/corelib/arch')
-rw-r--r--src/corelib/arch/arch.pri2
-rw-r--r--src/corelib/arch/qatomic_x86.h (renamed from src/corelib/arch/qatomic_x86_64.h)0
2 files changed, 1 insertions, 1 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