S390: Define SIZE_MAX as unsigned long (BZ #16712).

diff --git a/ChangeLog b/ChangeLog
index 4da10277cc567038f031ba6ff6acdffe43ec8e1e..c0d13ab866fc4959e7cc2f711a31002a0607e1ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-24  Stefan Liebler <stli@linux.vnet.ibm.com>
+
+       [BZ #16712]
+       * sysdeps/s390/s390-32/bits/wordsize.h
+       (__WORDSIZE32_SIZE_ULONG): New define.
+       * sysdeps/s390/s390-64/bits/wordsize.h
+       (__WORDSIZE32_SIZE_ULONG): Likewise.
+       * sysdeps/generic/stdint.h (SIZE_MAX):
+       Define as UL if __WORDSIZE32_SIZE_ULONG.
+
 2014-03-24  Stefan Liebler <stli@linux.vnet.ibm.com>
 
        [BZ #16713]

diff --git a/sysdeps/generic/stdint.h b/sysdeps/generic/stdint.h
index 4660748af109d81939503819fb7f3bbf90c532e4..f5d955648bbe700da00389000eedb1c8114521a6 100644 (file)
--- a/sysdeps/generic/stdint.h
+++ b/sysdeps/generic/stdint.h
@@ -260,7 +260,11 @@ typedef unsigned long long int     uintmax_t;
 # if __WORDSIZE == 64
 #  define SIZE_MAX             (18446744073709551615UL)
 # else
-#  define SIZE_MAX             (4294967295U)
+#  ifdef __WORDSIZE32_SIZE_ULONG
+#   define SIZE_MAX            (4294967295UL)
+#  else
+#   define SIZE_MAX            (4294967295U)
+#  endif
 # endif
 
 /* Limits of `wchar_t'.  */

diff --git a/sysdeps/s390/s390-32/bits/wordsize.h b/sysdeps/s390/s390-32/bits/wordsize.h
index b41661217f6edac300d379f72af8b73eb6921f85..da791fa28eb0dca3adc6ad5a0a1f50b91aa0af27 100644 (file)
--- a/sysdeps/s390/s390-32/bits/wordsize.h
+++ b/sysdeps/s390/s390-32/bits/wordsize.h
@@ -4,6 +4,7 @@
 # define __WORDSIZE    64
 #else
 # define __WORDSIZE    32
+# define __WORDSIZE32_SIZE_ULONG       1
 #endif
 
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL

diff --git a/sysdeps/s390/s390-64/bits/wordsize.h b/sysdeps/s390/s390-64/bits/wordsize.h
index b41661217f6edac300d379f72af8b73eb6921f85..da791fa28eb0dca3adc6ad5a0a1f50b91aa0af27 100644 (file)
--- a/sysdeps/s390/s390-64/bits/wordsize.h
+++ b/sysdeps/s390/s390-64/bits/wordsize.h
@@ -4,6 +4,7 @@
 # define __WORDSIZE    64
 #else
 # define __WORDSIZE    32
+# define __WORDSIZE32_SIZE_ULONG       1
 #endif
 
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL