1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch: Undefine possible architecture defines

Browse Source 
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 <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
This commit is contained in:
Holger Hans Peter Freyther 2012-03-15 17:42:07 +01:00 committed by Qt by Nokia
parent 8e8ef6f5f5
commit d4959fa637
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config.tests/arch/arch.cpp
View File

@ -41,6 +41,19 @@
// NOTE: This file is not meant to be compiled, only preprocessed. // NOTE: This file is not meant to be compiled, only preprocessed.
#include "../../src/corelib/global/qprocessordetection.h" #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) #if defined(Q_PROCESSOR_ALPHA)
alpha alpha
#elif defined(Q_PROCESSOR_ARM) #elif defined(Q_PROCESSOR_ARM)