Correct __ASSUME_PRLIMIT64 for hppa/microblaze/sh (bug 17779).

__ASSUME_PRLIMIT64 is defined in kernel-features.h for kernels 2.6.36
and later, but hppa, microblaze and sh did not add the prlimit64
syscall until 2.6.37.  This patch adds corresponding undefines of
__ASSUME_PRLIMIT64 to those architectures' kernel-features.h files.

(This concludes the kernel-features.h fixes arising out of the review
- limited to macros defined in the architecture-independent
kernel-features.h file - I did in connection with the move to 2.6.32
minimum kernel version.  For that subset of macros - I didn't check
any purely architecture-specific macros - I think they are now defined
for the correct kernel versions on each architecture after this
patch.)

	[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.
This commit is contained in:
Joseph Myers 2015-03-02 23:05:55 +00:00
parent c2c6d39fab
commit 6d08b0223a
5 changed files with 32 additions and 4 deletions

View File

@ -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> 2015-03-02 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #18036] [BZ #18036]

8
NEWS
View File

@ -10,10 +10,10 @@ Version 2.22
* The following bugs are resolved with this release: * The following bugs are resolved with this release:
4719, 14841, 13064, 14094, 15319, 15467, 15790, 15969, 16351, 16560, 4719, 14841, 13064, 14094, 15319, 15467, 15790, 15969, 16351, 16560,
16783, 17269, 17523, 17569, 17588, 17711, 17792, 17836, 17912, 17916, 16783, 17269, 17523, 17569, 17588, 17711, 17779, 17792, 17836, 17912,
17932, 17944, 17949, 17964, 17965, 17967, 17969, 17978, 17987, 17991, 17916, 17932, 17944, 17949, 17964, 17965, 17967, 17969, 17978, 17987,
17996, 17998, 17999, 18019, 18020, 18029, 18030, 18032, 18036, 18038, 17991, 17996, 17998, 17999, 18019, 18020, 18029, 18030, 18032, 18036,
18039, 18046, 18047. 18038, 18039, 18046, 18047.
* Character encoding and ctype tables were updated to Unicode 7.0.0, using * Character encoding and ctype tables were updated to Unicode 7.0.0, using
new generator scripts contributed by Pravin Satpute and Mike FABIAN (Red new generator scripts contributed by Pravin Satpute and Mike FABIAN (Red

View File

@ -38,3 +38,8 @@
#endif #endif
#include_next <kernel-features.h> #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

View File

@ -45,6 +45,11 @@
# undef __ASSUME_SET_ROBUST_LIST # undef __ASSUME_SET_ROBUST_LIST
#endif #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 /* Support for the pselect6, preadv and pwritev syscalls was added in
3.15. */ 3.15. */
#if __LINUX_KERNEL_VERSION < 0x030f00 #if __LINUX_KERNEL_VERSION < 0x030f00

View File

@ -40,3 +40,8 @@
/* SH does not have a 64-bit inode field. */ /* SH does not have a 64-bit inode field. */
#undef __ASSUME_ST_INO_64_BIT #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