aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--NEWS4
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/kernel-features.h3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 398cc5f..defe406 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-12 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #16642]
+ * sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+ (__ASSUME_PSELECT): Undefine.
+
2014-03-12 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
[BZ #16689]
diff --git a/NEWS b/NEWS
index aa097db..446ce94 100644
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,8 @@ Version 2.20
* The following bugs are resolved with this release:
15347, 15804, 15894, 16447, 16532, 16545, 16574, 16600, 16609, 16610,
- 16611, 16613, 16623, 16632, 16639, 16670, 16674, 16677, 16683, 16689,
- 16695.
+ 16611, 16613, 16623, 16632, 16639, 16642, 16670, 16674, 16677, 16683,
+ 16689, 16695.
* The am33 port, which had not worked for several years, has been removed
from ports.
diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
index 1e9aba5..dfb8344 100644
--- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
@@ -42,3 +42,6 @@
#endif
#include_next <kernel-features.h>
+
+/* The MicroBlaze kernel does not support the pselect6 syscall. */
+#undef __ASSUME_PSELECT