From 2ca5b03131df8bee75fb4e25b0493de5d6d5a736 Mon Sep 17 00:00:00 2001 From: "caillon%redhat.com" Date: Wed, 4 May 2005 18:05:19 +0000 Subject: 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 . r=wtc, a=shaver Modified Files: _linux.cfg _linux.h --- pr/include/md/_linux.cfg | 54 ++++++++++++++++++++++++------------------------ 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 6a25d498..d8bd788a 100644 --- a/pr/include/md/_linux.cfg +++ b/pr/include/md/_linux.cfg @@ -505,95 +505,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 b18e1e6f..dbd95a20 100644 --- a/pr/include/md/_linux.h +++ b/pr/include/md/_linux.h @@ -63,10 +63,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 -- cgit v1.2.1