From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 23 Mar 2016 22:35:08 +0000 (+0100)
Subject: Assume __NR_openat is always defined
X-Git-Tag: glibc-2.24~457
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af;p=thirdparty%2Fglibc.git

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.
---

diff --git a/.gitattributes b/.gitattributes
index 8947e726a21..06b553db809 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
+ChangeLog    merge=merge-changelog
 timezone/* -whitespace
diff --git a/ChangeLog b/ChangeLog
index b7574b06ea6..ce633e7649a 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 11387791748..75c2439a3de 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
 }