diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2010-04-06 12:50:00 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2010-04-06 16:54:21 +0200 |
| commit | a3293de6a2de438fada6f844d13efec2bf8e42c7 (patch) | |
| tree | 7843a4962c6b9ec16e084f291298fcd889eb9bdd /crawl-ref/source/platform.h | |
| parent | 7966235f823700d9d2284c5feed8bb478dfc7f32 (diff) | |
| download | crawl-ref-a3293de6a2de438fada6f844d13efec2bf8e42c7.tar.gz crawl-ref-a3293de6a2de438fada6f844d13efec2bf8e42c7.zip | |
Gut away broken endianness/word length detection.
It caused build failures on half of Debian's release architectures WHILE
BEING TOTALLY UNUSED!!! And it was buggy, too -- for example, ARM is big
endian while it was recognized as little endian (le versions of ARM are
usually called ARMEL).
A non-enumerated CPU (like hppa or s390) or OS (kfreebsd) also caused build
failures for no good reason.
If we'll need to known endianness in the future, please, check for it
directly rather than maintaining a big and incomplete list of architectures.
Diffstat (limited to 'crawl-ref/source/platform.h')
| -rw-r--r-- | crawl-ref/source/platform.h | 50 |
1 files changed, 8 insertions, 42 deletions
diff --git a/crawl-ref/source/platform.h b/crawl-ref/source/platform.h index 635d94f6e2..4fdec579e8 100644 --- a/crawl-ref/source/platform.h +++ b/crawl-ref/source/platform.h @@ -53,11 +53,6 @@ * TARGET_COMPILER_ICC * Intel C++ Compiler * - * TARGET_BIG_ENDIAN - * Running on a big endian byte order architecture. - * TARGET_LITTLE_ENDIAN - * Running on a little endian byte order architecture. - * */ #ifndef __included_cc_platform_detect_h @@ -81,7 +76,6 @@ #if defined (__arm__) #define PROCESSOR_DETECTED #define TARGET_CPU_ARM -#define TARGET_LITTLE_ENDIAN #endif #endif @@ -90,7 +84,6 @@ #if defined (__alpha) || defined (__alpha__) #define PROCESSOR_DETECTED #define TARGET_CPU_ALPHA -#define TARGET_LITTLE_ENDIAN /* How should bi-endianness be handled? */ #endif #endif @@ -99,7 +92,6 @@ #if defined (__sparc) || defined (__sparc__) #define PROCESSOR_DETECTED #define TARGET_CPU_SPARC -#define TARGET_BIG_ENDIAN #endif #endif @@ -108,11 +100,9 @@ #if defined (__MIPSEL__) #define PROCESSOR_DETECTED #define TARGET_CPU_MIPS -#define TARGET_LIDDLE_ENDIAN #elif defined (__mips__) #define PROCESSOR_DETECTED #define TARGET_CPU_MIPS -#define TARGET_BIG_ENDIAN #endif #endif @@ -120,11 +110,6 @@ #if !defined (PROCESSOR_DETECTED) #if defined (_ARCH_PPC) || defined (__ppc__) || defined (__ppc64__) || defined (__PPC) || defined (powerpc) || defined (__PPC__) || defined (__powerpc64__) || defined (__powerpc64) #define PROCESSOR_DETECTED -#if defined (__ppc64__) || defined (__powerpc64__) || defined (__powerpc64) -#define TARGET_CPU_PPC 64 -#else -#define TARGET_CPU_PPC 32 -#endif #define TARGET_BIG_ENDIAN #endif #endif @@ -135,7 +120,6 @@ #define PROCESSOR_DETECTED #define TARGET_CPU_X64 #define TARGET_CPU_X86_64 -#define TARGET_LITTLE_ENDIAN #endif #endif @@ -144,7 +128,6 @@ #if defined (__i386__) || defined (__i386) || defined (i386) || defined (_X86_) || defined (_M_IX86) #define PROCESSOR_DETECTED #define TARGET_CPU_X86 -#define TARGET_LITTLE_ENDIAN #endif #endif @@ -275,34 +258,17 @@ #endif #endif -#if defined (_LP64) || defined (__LP64__) || defined (_M_X64) || defined(_M_IA64) -#define TARGET_CPU_BITS 64 -#else -#define TARGET_CPU_BITS 32 -#endif +//#if !defined (PROCESSOR_DETECTED) +//#error "Could not detect target CPU." +//#endif -#if defined (TARGET_CPU_PPC) -#if TARGET_CPU_PPC == 32 -#define TARGET_CPU_BITS 32 -#elif TARGET_CPU_PPC == 64 -#define TARGET_CPU_BITS 64 -#endif -#endif - -#if !defined (PROCESSOR_DETECTED) -#error "Could not detect target CPU." -#endif - -#if !defined (COMPILER_DETECTED) -#error "Could not detect target compiler." -#endif +//#if !defined (COMPILER_DETECTED) +//#error "Could not detect target compiler." +//#endif #if !defined (OS_DETECTED) -#error "Could not detect target OS." -#endif - -#if !defined (TARGET_CPU_BITS) -#error "Could not detect 32-bit/64-bit architecture." +#define TARGET_OS_UNKNOWN +//#error "Could not detect target OS." #endif /* ICC on Windows uses VC includes, etc */ |