diff options
author | wchang0222%aol.com <devnull@localhost> | 2004-10-18 22:46:30 +0000 |
---|---|---|
committer | wchang0222%aol.com <devnull@localhost> | 2004-10-18 22:46:30 +0000 |
commit | a23363aeff2e6461035fbf16623deea373ee5114 (patch) | |
tree | 8c78227746114e07f7b94d24fb0ae2218adb2bcd | |
parent | cd9be14c5ea16bf8dab27c6ae0f28a4cf5de145d (diff) | |
download | nspr-hg-a23363aeff2e6461035fbf16623deea373ee5114.tar.gz |
Bugzilla bug 264324: we need to test for __s390x__ before __s390__ because
the s390x platform also defines __s390__. The patch is contributed by
Wolfgang Rosenauer <mozilla@rosenauer.org>. r=wtc.
Modified Files: _linux.cfg _linux.h
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
-rw-r--r-- | pr/include/md/_linux.cfg | 54 | ||||
-rw-r--r-- | pr/include/md/_linux.h | 4 |
2 files changed, 29 insertions, 29 deletions
diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg index f1d89314..465c64ea 100644 --- a/pr/include/md/_linux.cfg +++ b/pr/include/md/_linux.cfg @@ -508,95 +508,95 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 -#elif defined(__s390__) +#elif defined(__s390x__) #define IS_BIG_ENDIAN 1 #undef IS_LITTLE_ENDIAN +#define IS_64 #define PR_BYTES_PER_BYTE 1 #define PR_BYTES_PER_SHORT 2 #define PR_BYTES_PER_INT 4 #define PR_BYTES_PER_INT64 8 -#define PR_BYTES_PER_LONG 4 +#define PR_BYTES_PER_LONG 8 #define PR_BYTES_PER_FLOAT 4 #define PR_BYTES_PER_DOUBLE 8 -#define PR_BYTES_PER_WORD 4 +#define PR_BYTES_PER_WORD 8 #define PR_BYTES_PER_DWORD 8 #define PR_BITS_PER_BYTE 8 #define PR_BITS_PER_SHORT 16 #define PR_BITS_PER_INT 32 #define PR_BITS_PER_INT64 64 -#define PR_BITS_PER_LONG 32 +#define PR_BITS_PER_LONG 64 #define PR_BITS_PER_FLOAT 32 #define PR_BITS_PER_DOUBLE 64 -#define PR_BITS_PER_WORD 32 +#define PR_BITS_PER_WORD 64 #define PR_BITS_PER_BYTE_LOG2 3 #define PR_BITS_PER_SHORT_LOG2 4 #define PR_BITS_PER_INT_LOG2 5 #define PR_BITS_PER_INT64_LOG2 6 -#define PR_BITS_PER_LONG_LOG2 5 +#define PR_BITS_PER_LONG_LOG2 6 #define PR_BITS_PER_FLOAT_LOG2 5 #define PR_BITS_PER_DOUBLE_LOG2 6 -#define PR_BITS_PER_WORD_LOG2 5 +#define PR_BITS_PER_WORD_LOG2 6 #define PR_ALIGN_OF_SHORT 2 #define PR_ALIGN_OF_INT 4 -#define PR_ALIGN_OF_LONG 4 -#define PR_ALIGN_OF_INT64 4 +#define PR_ALIGN_OF_LONG 8 +#define PR_ALIGN_OF_INT64 8 #define PR_ALIGN_OF_FLOAT 4 -#define PR_ALIGN_OF_DOUBLE 4 -#define PR_ALIGN_OF_POINTER 4 -#define PR_ALIGN_OF_WORD 4 +#define PR_ALIGN_OF_DOUBLE 8 +#define PR_ALIGN_OF_POINTER 8 +#define PR_ALIGN_OF_WORD 8 -#define PR_BYTES_PER_WORD_LOG2 2 +#define PR_BYTES_PER_WORD_LOG2 3 #define PR_BYTES_PER_DWORD_LOG2 3 -#elif defined(__s390x__) +#elif defined(__s390__) #define IS_BIG_ENDIAN 1 #undef IS_LITTLE_ENDIAN -#define IS_64 #define PR_BYTES_PER_BYTE 1 #define PR_BYTES_PER_SHORT 2 #define PR_BYTES_PER_INT 4 #define PR_BYTES_PER_INT64 8 -#define PR_BYTES_PER_LONG 8 +#define PR_BYTES_PER_LONG 4 #define PR_BYTES_PER_FLOAT 4 #define PR_BYTES_PER_DOUBLE 8 -#define PR_BYTES_PER_WORD 8 +#define PR_BYTES_PER_WORD 4 #define PR_BYTES_PER_DWORD 8 #define PR_BITS_PER_BYTE 8 #define PR_BITS_PER_SHORT 16 #define PR_BITS_PER_INT 32 #define PR_BITS_PER_INT64 64 -#define PR_BITS_PER_LONG 64 +#define PR_BITS_PER_LONG 32 #define PR_BITS_PER_FLOAT 32 #define PR_BITS_PER_DOUBLE 64 -#define PR_BITS_PER_WORD 64 +#define PR_BITS_PER_WORD 32 #define PR_BITS_PER_BYTE_LOG2 3 #define PR_BITS_PER_SHORT_LOG2 4 #define PR_BITS_PER_INT_LOG2 5 #define PR_BITS_PER_INT64_LOG2 6 -#define PR_BITS_PER_LONG_LOG2 6 +#define PR_BITS_PER_LONG_LOG2 5 #define PR_BITS_PER_FLOAT_LOG2 5 #define PR_BITS_PER_DOUBLE_LOG2 6 -#define PR_BITS_PER_WORD_LOG2 6 +#define PR_BITS_PER_WORD_LOG2 5 #define PR_ALIGN_OF_SHORT 2 #define PR_ALIGN_OF_INT 4 -#define PR_ALIGN_OF_LONG 8 -#define PR_ALIGN_OF_INT64 8 +#define PR_ALIGN_OF_LONG 4 +#define PR_ALIGN_OF_INT64 4 #define PR_ALIGN_OF_FLOAT 4 -#define PR_ALIGN_OF_DOUBLE 8 -#define PR_ALIGN_OF_POINTER 8 -#define PR_ALIGN_OF_WORD 8 +#define PR_ALIGN_OF_DOUBLE 4 +#define PR_ALIGN_OF_POINTER 4 +#define PR_ALIGN_OF_WORD 4 -#define PR_BYTES_PER_WORD_LOG2 3 +#define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 #else diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h index f68dfff1..68a9265f 100644 --- a/pr/include/md/_linux.h +++ b/pr/include/md/_linux.h @@ -66,10 +66,10 @@ #define _PR_SI_ARCHITECTURE "arm" #elif defined(__hppa__) #define _PR_SI_ARCHITECTURE "hppa" -#elif defined(__s390__) -#define _PR_SI_ARCHITECTURE "s390" #elif defined(__s390x__) #define _PR_SI_ARCHITECTURE "s390x" +#elif defined(__s390__) +#define _PR_SI_ARCHITECTURE "s390" #else #error "Unknown CPU architecture" #endif |