diff options
| -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) |