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 /sysdeps | |
| parent | c2c6d39fab901c97c18fa3a3a3658d9dc3f7df61 (diff) | |
| download | glibc-6d08b0223aa3b3152ea7e9beb2b8f2a151b43109.tar.gz glibc-6d08b0223aa3b3152ea7e9beb2b8f2a151b43109.tar.xz glibc-6d08b0223aa3b3152ea7e9beb2b8f2a151b43109.zip | |
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.
Diffstat (limited to 'sysdeps')
| -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 |
3 files changed, 15 insertions, 0 deletions
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 |