From d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 15 Mar 2012 17:42:07 +0100 Subject: arch: Undefine possible architecture defines Some compilers define the architecture to one leading to detecting '1' as target architecture. Always undef the architecture name. Compilers: gcc version 4.6.3 (Debian 4.6.3-1) has '#define i386 1' gcc version 4.5.3 (Broadcom stbgcc-4.5.3-1.3) has '#define mips 1' Change-Id: I7af1bb743579be472467c74e6c08638648823ef3 Reviewed-by: Girish Ramakrishnan Reviewed-by: Bradley T. Hughes --- config.tests/arch/arch.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'config.tests/arch') diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp index 0c12565f7c..f942d0adc7 100644 --- a/config.tests/arch/arch.cpp +++ b/config.tests/arch/arch.cpp @@ -41,6 +41,19 @@ // NOTE: This file is not meant to be compiled, only preprocessed. #include "../../src/corelib/global/qprocessordetection.h" +#undef alpha +#undef arm +#undef avr32 +#undef bfin +#undef i386 +#undef x86_64 +#undef ia64 +#undef mips +#undef power +#undef s390 +#undef sh +#undef sparc +#undef unknown #if defined(Q_PROCESSOR_ALPHA) alpha #elif defined(Q_PROCESSOR_ARM) -- cgit v1.2.3