about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-03-12 17:29:24 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-03-12 17:29:24 +0000
commitabe6d90cc8c1c212dab7cde4468f9ed895d6ba86 (patch)
treef593989348ea48961a08fec5047850d8b790aad1
parentdd3946c615184e1957a0cb09352cac72be5d6d5b (diff)
downloadglibc-abe6d90cc8c1c212dab7cde4468f9ed895d6ba86.tar.gz
glibc-abe6d90cc8c1c212dab7cde4468f9ed895d6ba86.tar.xz
glibc-abe6d90cc8c1c212dab7cde4468f9ed895d6ba86.zip
Fix __ASSUME_PSELECT for MicroBlaze (bug 16642).
Reviewing (for all architectures, with a baseline kernel version of
2.6.32) the kernel support for features for which __ASSUME_* macros
would be affected by a move to 2.6.32 as minimum kernel version showed
up that __ASSUME_PSELECT was wrongly defined for MicroBlaze, despite
the corresponding syscall table entry not being wired up in the
MicroBlaze kernel.

This patch makes the MicroBlaze kernel-features.h undefine
__ASSUME_PSELECT.  I'd also encourage wiring it up in the kernel (so
you can then make this #undef conditional, and eventually obsolete
once a recent-enough kernel is required).  I suspect it wasn't wired
up because of the mistaken comment in asm/unistd.h "obsolete ->
sys_pselect7" (there is no such syscall as pselect7).

	[BZ #16642]
	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
	(__ASSUME_PSELECT): Undefine.
-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 398cc5f484..defe406d72 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 aa097dba67..446ce94ec7 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 1e9aba5f42..dfb83443c1 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