aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--sysdeps/generic/stdint.h6
-rw-r--r--sysdeps/s390/s390-32/bits/wordsize.h1
-rw-r--r--sysdeps/s390/s390-64/bits/wordsize.h1
4 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4da1027..c0d13ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
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]
* sysdeps/unix/sysv/linux/s390/bits/sigaction.h
(__glibc_reserved0): New variable.
diff --git a/sysdeps/generic/stdint.h b/sysdeps/generic/stdint.h
index 4660748..f5d9556 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 b416612..da791fa 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 b416612..da791fa 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