From: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Mon, 24 Mar 2014 15:46:51 +0000 (+0100)
Subject: S390: Define SIZE_MAX as unsigned long (BZ #16712).
X-Git-Tag: glibc-2.20~699
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26011b5cfa6a1a8d8005d65f11d97498444a4e95;p=thirdparty%2Fglibc.git

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

diff --git a/ChangeLog b/ChangeLog
index 4da10277cc5..c0d13ab866f 100644
--- 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 4660748af10..f5d955648bb 100644
--- 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 b41661217f6..da791fa28eb 100644
--- 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 b41661217f6..da791fa28eb 100644
--- 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