aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes1
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/dl-openat64.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes
index 8947e72..06b553d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
+ChangeLog merge=merge-changelog
timezone/* -whitespace
diff --git a/ChangeLog b/ChangeLog
index b7574b0..ce633e7 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 1138779..75c2439 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
}