diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2016-03-23 23:35:08 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2016-03-23 23:35:08 +0100 |
| commit | 16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af (patch) | |
| tree | ff3bb3ed3a4d87dabc606a528c704b1f16a4d426 | |
| parent | 7a25d6a84df9fea56963569ceccaaf7c2a88f161 (diff) | |
| download | glibc-16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af.tar.gz glibc-16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af.tar.xz glibc-16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af.zip | |
Assume __NR_openat is always defined
With the 2.6.32 minimum kernel on x86 and 3.2 on other architectures, __NR_openat is always defined. Changelog: * sysdeps/unix/sysv/linux/dl-openat64.c (openat64) [__NR_openat]: Make code unconditional.
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-openat64.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index 8947e726a2..06b553db80 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ +ChangeLog merge=merge-changelog timezone/* -whitespace diff --git a/ChangeLog b/ChangeLog index b7574b06ea..ce633e7649 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-03-23 Aurelien Jarno <aurelien@aurel32.net> + + * sysdeps/unix/sysv/linux/dl-openat64.c (openat64) [__NR_openat]: + Make code unconditional. + 2016-03-23 Nick Alcock <nick.alcock@oracle.com> * sysdeps/unix/sysv/linux/i386/pthread_cond_timedwait.S: Reload diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c index 1138779174..75c2439a3d 100644 --- a/sysdeps/unix/sysv/linux/dl-openat64.c +++ b/sysdeps/unix/sysv/linux/dl-openat64.c @@ -27,9 +27,5 @@ openat64 (int dfd, const char *file, int oflag, ...) { assert (!__OPEN_NEEDS_MODE (oflag)); -#ifdef __NR_openat return INLINE_SYSCALL (openat, 3, dfd, file, oflag | O_LARGEFILE); -#else - return INLINE_SYSCALL_ERROR_RETURN_VALUE (ENOSYS); -#endif } |