cb74f3b
Index: nsprpub/pr/include/md/_linux.cfg
cb74f3b
===================================================================
cb74f3b
RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_linux.cfg,v
cb74f3b
retrieving revision 3.12.4.5
cb74f3b
diff -u -r3.12.4.5 _linux.cfg
cb74f3b
--- nsprpub/pr/include/md/_linux.cfg	9 Mar 2004 03:18:20 -0000	3.12.4.5
cb74f3b
+++ nsprpub/pr/include/md/_linux.cfg	19 Nov 2004 01:36:07 -0000
cb74f3b
@@ -505,95 +505,95 @@
cb74f3b
 #define PR_BYTES_PER_WORD_LOG2   2
cb74f3b
 #define PR_BYTES_PER_DWORD_LOG2  3
cb74f3b
 
cb74f3b
-#elif defined(__s390__)
cb74f3b
+#elif defined(__s390x__)
cb74f3b
 
cb74f3b
 #define IS_BIG_ENDIAN 1
cb74f3b
 #undef  IS_LITTLE_ENDIAN
cb74f3b
+#define IS_64
cb74f3b
 
cb74f3b
 #define PR_BYTES_PER_BYTE   1
cb74f3b
 #define PR_BYTES_PER_SHORT  2
cb74f3b
 #define PR_BYTES_PER_INT    4
cb74f3b
 #define PR_BYTES_PER_INT64  8
cb74f3b
-#define PR_BYTES_PER_LONG   4
cb74f3b
+#define PR_BYTES_PER_LONG   8
cb74f3b
 #define PR_BYTES_PER_FLOAT  4
cb74f3b
 #define PR_BYTES_PER_DOUBLE 8
cb74f3b
-#define PR_BYTES_PER_WORD   4
cb74f3b
+#define PR_BYTES_PER_WORD   8
cb74f3b
 #define PR_BYTES_PER_DWORD  8
cb74f3b
 
cb74f3b
 #define PR_BITS_PER_BYTE    8
cb74f3b
 #define PR_BITS_PER_SHORT   16
cb74f3b
 #define PR_BITS_PER_INT     32
cb74f3b
 #define PR_BITS_PER_INT64   64
cb74f3b
-#define PR_BITS_PER_LONG    32
cb74f3b
+#define PR_BITS_PER_LONG    64
cb74f3b
 #define PR_BITS_PER_FLOAT   32
cb74f3b
 #define PR_BITS_PER_DOUBLE  64
cb74f3b
-#define PR_BITS_PER_WORD    32
cb74f3b
+#define PR_BITS_PER_WORD    64
cb74f3b
 
cb74f3b
 #define PR_BITS_PER_BYTE_LOG2   3
cb74f3b
 #define PR_BITS_PER_SHORT_LOG2  4
cb74f3b
 #define PR_BITS_PER_INT_LOG2    5
cb74f3b
 #define PR_BITS_PER_INT64_LOG2  6
cb74f3b
-#define PR_BITS_PER_LONG_LOG2   5
cb74f3b
+#define PR_BITS_PER_LONG_LOG2   6
cb74f3b
 #define PR_BITS_PER_FLOAT_LOG2  5
cb74f3b
 #define PR_BITS_PER_DOUBLE_LOG2 6
cb74f3b
-#define PR_BITS_PER_WORD_LOG2   5
cb74f3b
+#define PR_BITS_PER_WORD_LOG2   6
cb74f3b
 
cb74f3b
 #define PR_ALIGN_OF_SHORT   2
cb74f3b
 #define PR_ALIGN_OF_INT     4
cb74f3b
-#define PR_ALIGN_OF_LONG    4
cb74f3b
-#define PR_ALIGN_OF_INT64   4
cb74f3b
+#define PR_ALIGN_OF_LONG    8
cb74f3b
+#define PR_ALIGN_OF_INT64   8
cb74f3b
 #define PR_ALIGN_OF_FLOAT   4
cb74f3b
-#define PR_ALIGN_OF_DOUBLE  4
cb74f3b
-#define PR_ALIGN_OF_POINTER 4
cb74f3b
-#define PR_ALIGN_OF_WORD    4
cb74f3b
+#define PR_ALIGN_OF_DOUBLE  8
cb74f3b
+#define PR_ALIGN_OF_POINTER 8
cb74f3b
+#define PR_ALIGN_OF_WORD    8
cb74f3b
 
cb74f3b
-#define PR_BYTES_PER_WORD_LOG2   2
cb74f3b
+#define PR_BYTES_PER_WORD_LOG2   3
cb74f3b
 #define PR_BYTES_PER_DWORD_LOG2  3
cb74f3b
 
cb74f3b
-#elif defined(__s390x__)
cb74f3b
+#elif defined(__s390__)
cb74f3b
 
cb74f3b
 #define IS_BIG_ENDIAN 1
cb74f3b
 #undef  IS_LITTLE_ENDIAN
cb74f3b
-#define IS_64
cb74f3b
 
cb74f3b
 #define PR_BYTES_PER_BYTE   1
cb74f3b
 #define PR_BYTES_PER_SHORT  2
cb74f3b
 #define PR_BYTES_PER_INT    4
cb74f3b
 #define PR_BYTES_PER_INT64  8
cb74f3b
-#define PR_BYTES_PER_LONG   8
cb74f3b
+#define PR_BYTES_PER_LONG   4
cb74f3b
 #define PR_BYTES_PER_FLOAT  4
cb74f3b
 #define PR_BYTES_PER_DOUBLE 8
cb74f3b
-#define PR_BYTES_PER_WORD   8
cb74f3b
+#define PR_BYTES_PER_WORD   4
cb74f3b
 #define PR_BYTES_PER_DWORD  8
cb74f3b
 
cb74f3b
 #define PR_BITS_PER_BYTE    8
cb74f3b
 #define PR_BITS_PER_SHORT   16
cb74f3b
 #define PR_BITS_PER_INT     32
cb74f3b
 #define PR_BITS_PER_INT64   64
cb74f3b
-#define PR_BITS_PER_LONG    64
cb74f3b
+#define PR_BITS_PER_LONG    32
cb74f3b
 #define PR_BITS_PER_FLOAT   32
cb74f3b
 #define PR_BITS_PER_DOUBLE  64
cb74f3b
-#define PR_BITS_PER_WORD    64
cb74f3b
+#define PR_BITS_PER_WORD    32
cb74f3b
 
cb74f3b
 #define PR_BITS_PER_BYTE_LOG2   3
cb74f3b
 #define PR_BITS_PER_SHORT_LOG2  4
cb74f3b
 #define PR_BITS_PER_INT_LOG2    5
cb74f3b
 #define PR_BITS_PER_INT64_LOG2  6
cb74f3b
-#define PR_BITS_PER_LONG_LOG2   6
cb74f3b
+#define PR_BITS_PER_LONG_LOG2   5
cb74f3b
 #define PR_BITS_PER_FLOAT_LOG2  5
cb74f3b
 #define PR_BITS_PER_DOUBLE_LOG2 6
cb74f3b
-#define PR_BITS_PER_WORD_LOG2   6
cb74f3b
+#define PR_BITS_PER_WORD_LOG2   5
cb74f3b
 
cb74f3b
 #define PR_ALIGN_OF_SHORT   2
cb74f3b
 #define PR_ALIGN_OF_INT     4
cb74f3b
-#define PR_ALIGN_OF_LONG    8
cb74f3b
-#define PR_ALIGN_OF_INT64   8
cb74f3b
+#define PR_ALIGN_OF_LONG    4
cb74f3b
+#define PR_ALIGN_OF_INT64   4
cb74f3b
 #define PR_ALIGN_OF_FLOAT   4
cb74f3b
-#define PR_ALIGN_OF_DOUBLE  8
cb74f3b
-#define PR_ALIGN_OF_POINTER 8
cb74f3b
-#define PR_ALIGN_OF_WORD    8
cb74f3b
+#define PR_ALIGN_OF_DOUBLE  4
cb74f3b
+#define PR_ALIGN_OF_POINTER 4
cb74f3b
+#define PR_ALIGN_OF_WORD    4
cb74f3b
 
cb74f3b
-#define PR_BYTES_PER_WORD_LOG2   3
cb74f3b
+#define PR_BYTES_PER_WORD_LOG2   2
cb74f3b
 #define PR_BYTES_PER_DWORD_LOG2  3
cb74f3b
 
cb74f3b
 #else
cb74f3b
Index: nsprpub/pr/include/md/_linux.h
cb74f3b
===================================================================
cb74f3b
RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_linux.h,v
cb74f3b
retrieving revision 3.34.2.8
cb74f3b
diff -u -r3.34.2.8 _linux.h
cb74f3b
--- nsprpub/pr/include/md/_linux.h	9 Mar 2004 03:18:20 -0000	3.34.2.8
cb74f3b
+++ nsprpub/pr/include/md/_linux.h	19 Nov 2004 01:36:07 -0000
cb74f3b
@@ -63,10 +63,10 @@
cb74f3b
 #define _PR_SI_ARCHITECTURE "arm"
cb74f3b
 #elif defined(__hppa__)
cb74f3b
 #define _PR_SI_ARCHITECTURE "hppa"
cb74f3b
-#elif defined(__s390__)
cb74f3b
-#define _PR_SI_ARCHITECTURE "s390"
cb74f3b
 #elif defined(__s390x__)
cb74f3b
 #define _PR_SI_ARCHITECTURE "s390x"
cb74f3b
+#elif defined(__s390__)
cb74f3b
+#define _PR_SI_ARCHITECTURE "s390"
cb74f3b
 #else
cb74f3b
 #error "Unknown CPU architecture"
cb74f3b
 #endif