aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--NEWS8
-rw-r--r--sysdeps/unix/sysv/linux/hppa/kernel-features.h5
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/kernel-features.h5
-rw-r--r--sysdeps/unix/sysv/linux/sh/kernel-features.h5
5 files changed, 32 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 98fbedb4f7..0412b046ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-03-02 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #17779]
+ * sysdeps/unix/sysv/linux/hppa/kernel-features.h
+ [__LINUX_KERNEL_VERSION < 0x020625] (__ASSUME_PRLIMIT64):
+ Undefine.
+ * sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+ [__LINUX_KERNEL_VERSION < 0x020625] (__ASSUME_PRLIMIT64):
+ Likewise.
+ * sysdeps/unix/sysv/linux/sh/kernel-features.h
+ [__LINUX_KERNEL_VERSION < 0x020625] (__ASSUME_PRLIMIT64):
+ Likewise.
+
2015-03-02 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #18036]
diff --git a/NEWS b/NEWS
index 8976f1100d..c1193fd6eb 100644
--- a/NEWS
+++ b/NEWS
@@ -10,10 +10,10 @@ Version 2.22
* The following bugs are resolved with this release:
4719, 14841, 13064, 14094, 15319, 15467, 15790, 15969, 16351, 16560,
- 16783, 17269, 17523, 17569, 17588, 17711, 17792, 17836, 17912, 17916,
- 17932, 17944, 17949, 17964, 17965, 17967, 17969, 17978, 17987, 17991,
- 17996, 17998, 17999, 18019, 18020, 18029, 18030, 18032, 18036, 18038,
- 18039, 18046, 18047.
+ 16783, 17269, 17523, 17569, 17588, 17711, 17779, 17792, 17836, 17912,
+ 17916, 17932, 17944, 17949, 17964, 17965, 17967, 17969, 17978, 17987,
+ 17991, 17996, 17998, 17999, 18019, 18020, 18029, 18030, 18032, 18036,
+ 18038, 18039, 18046, 18047.
* Character encoding and ctype tables were updated to Unicode 7.0.0, using
new generator scripts contributed by Pravin Satpute and Mike FABIAN (Red
diff --git a/sysdeps/unix/sysv/linux/hppa/kernel-features.h b/sysdeps/unix/sysv/linux/hppa/kernel-features.h
index fb94450dad..61bb026e09 100644
--- a/sysdeps/unix/sysv/linux/hppa/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/hppa/kernel-features.h
@@ -38,3 +38,8 @@
#endif
#include_next <kernel-features.h>
+
+/* The prlimit64 syscall was added for PA in 2.6.37. */
+#if __LINUX_KERNEL_VERSION < 0x020625
+# undef __ASSUME_PRLIMIT64
+#endif
diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
index faaee6d680..f2c580d36a 100644
--- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
@@ -45,6 +45,11 @@
# undef __ASSUME_SET_ROBUST_LIST
#endif
+/* The prlimit64 syscall was added for MicroBlaze in 2.6.37. */
+#if __LINUX_KERNEL_VERSION < 0x020625
+# undef __ASSUME_PRLIMIT64
+#endif
+
/* Support for the pselect6, preadv and pwritev syscalls was added in
3.15. */
#if __LINUX_KERNEL_VERSION < 0x030f00
diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h
index 08e5dcc566..5e3487cae2 100644
--- a/sysdeps/unix/sysv/linux/sh/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h
@@ -40,3 +40,8 @@
/* SH does not have a 64-bit inode field. */
#undef __ASSUME_ST_INO_64_BIT
+
+/* The prlimit64 syscall was added for SH in 2.6.37. */
+#if __LINUX_KERNEL_VERSION < 0x020625
+# undef __ASSUME_PRLIMIT64
+#endif