diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-03-02 23:05:55 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-03-02 23:05:55 +0000 |
| commit | 6d08b0223aa3b3152ea7e9beb2b8f2a151b43109 (patch) | |
| tree | 0c17dc3b0b79c324a2a5a37e9975cba5b49ec1a1 | |
| parent | c2c6d39fab901c97c18fa3a3a3658d9dc3f7df61 (diff) | |
| download | glibc-6d08b0223aa3b3152ea7e9beb2b8f2a151b43109.zip glibc-6d08b0223aa3b3152ea7e9beb2b8f2a151b43109.tar.gz glibc-6d08b0223aa3b3152ea7e9beb2b8f2a151b43109.tar.bz2 | |
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.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/kernel-features.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/microblaze/kernel-features.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/kernel-features.h | 5 |
5 files changed, 32 insertions, 4 deletions
@@ -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] @@ -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 fb94450..61bb026 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 faaee6d..f2c580d3 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 08e5dcc..5e3487c 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 |