From 4408d0ccd8b860cdbcc63f7f4dd835cab37c6581 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 27 Feb 2012 15:32:47 +0100 Subject: [PATCH] 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 --- src/corelib/arch/arch.pri | 2 +- src/corelib/arch/{qatomic_x86_64.h => qatomic_x86.h} | 0 src/corelib/thread/qbasicatomic.h | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/corelib/arch/{qatomic_x86_64.h => qatomic_x86.h} (100%) diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index c611087..a178c24 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 similarity index 100% rename from src/corelib/arch/qatomic_x86_64.h rename to src/corelib/arch/qatomic_x86.h diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 01a69db..8bac8d8 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 -#elif defined(Q_PROCESSOR_X86_64) -# include +#elif defined(Q_PROCESSOR_X86) +# include // Fallback compiler dependent implementation #elif defined(Q_COMPILER_ATOMICS) && defined(Q_COMPILER_CONSTEXPR) -- 2.7.4