This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch master updated. glibc-2.23-122-g7e1ff08

From: aurel32 at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 23 Mar 2016 22:36:08 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.23-122-g7e1ff08
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  7e1ff08c260ae105208edb4e778e50525dff05d3 (commit)
       via  16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af (commit)
      from  7a25d6a84df9fea56963569ceccaaf7c2a88f161 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7e1ff08c260ae105208edb4e778e50525dff05d3

commit 7e1ff08c260ae105208edb4e778e50525dff05d3
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Wed Mar 23 23:35:08 2016 +0100

    Assume __NR_utimensat is always defined
    
    With the 2.6.32 minimum kernel on x86 and 3.2 on other architectures,
    __NR_utimensat is always defined.
    
    Changelog:
    	* sysdeps/unix/sysv/linux/futimens.c (futimens) [__NR_utimensat]:
    	Make code unconditional.
    	[!__NR_utimensat]: Remove conditional code.
    	* sysdeps/unix/sysv/linux/lutimes.c (lutimes) [__NR_utimensat]:
    	Make code unconditional.
    	[!__NR_utimensat]: Remove conditional code.
    	* sysdeps/unix/sysv/linux/utimensat.c (utimensat) [__NR_utimensat]:
    	Make code unconditional.
    	[!__NR_utimensat]: Remove conditional code.

diff --git a/ChangeLog b/ChangeLog
index ce633e7..da349c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2016-03-23  Aurelien Jarno  <aurelien@aurel32.net>
 
+	* sysdeps/unix/sysv/linux/futimens.c (futimens) [__NR_utimensat]:
+	Make code unconditional.
+	[!__NR_utimensat]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/lutimes.c (lutimes) [__NR_utimensat]:
+	Make code unconditional.
+	[!__NR_utimensat]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/utimensat.c (utimensat) [__NR_utimensat]:
+	Make code unconditional.
+	[!__NR_utimensat]: Remove conditional code.
+
+2016-03-23  Aurelien Jarno  <aurelien@aurel32.net>
+
 	* sysdeps/unix/sysv/linux/dl-openat64.c (openat64) [__NR_openat]:
 	Make code unconditional.
 
diff --git a/sysdeps/unix/sysv/linux/futimens.c b/sysdeps/unix/sysv/linux/futimens.c
index 3176e65..3f96210 100644
--- a/sysdeps/unix/sysv/linux/futimens.c
+++ b/sysdeps/unix/sysv/linux/futimens.c
@@ -31,15 +31,8 @@
 int
 futimens (int fd, const struct timespec tsp[2])
 {
-#ifdef __NR_utimensat
   if (fd < 0)
     return INLINE_SYSCALL_ERROR_RETURN_VALUE (EBADF);
   /* Avoid implicit array coercion in syscall macros.  */
   return INLINE_SYSCALL (utimensat, 4, fd, NULL, &tsp[0], 0);
-#else
-  return INLINE_SYSCALL_ERROR_RETURN_VALUE (ENOSYS);
-#endif
 }
-#ifndef __NR_utimensat
-stub_warning (futimens)
-#endif
diff --git a/sysdeps/unix/sysv/linux/lutimes.c b/sysdeps/unix/sysv/linux/lutimes.c
index 69d3cfa..49fad3e 100644
--- a/sysdeps/unix/sysv/linux/lutimes.c
+++ b/sysdeps/unix/sysv/linux/lutimes.c
@@ -27,7 +27,6 @@
 int
 lutimes (const char *file, const struct timeval tvp[2])
 {
-#ifdef __NR_utimensat
   /* The system call espects timespec, not timeval.  */
   struct timespec ts[2];
   if (tvp != NULL)
@@ -42,11 +41,4 @@ lutimes (const char *file, const struct timeval tvp[2])
 
   return INLINE_SYSCALL (utimensat, 4, AT_FDCWD, file, tvp ? ts : NULL,
 			 AT_SYMLINK_NOFOLLOW);
-#else
-  return INLINE_SYSCALL_ERROR_RETURN_VALUE (ENOSYS);
-#endif
 }
-
-#ifndef __NR_utimensat
-stub_warning (lutimes)
-#endif
diff --git a/sysdeps/unix/sysv/linux/utimensat.c b/sysdeps/unix/sysv/linux/utimensat.c
index f3a9697..89af2f5 100644
--- a/sysdeps/unix/sysv/linux/utimensat.c
+++ b/sysdeps/unix/sysv/linux/utimensat.c
@@ -31,13 +31,6 @@ utimensat (int fd, const char *file, const struct timespec tsp[2],
 {
   if (file == NULL)
     return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
-#ifdef __NR_utimensat
   /* Avoid implicit array coercion in syscall macros.  */
   return INLINE_SYSCALL (utimensat, 4, fd, file, &tsp[0], flags);
-#else
-  return INLINE_SYSCALL_ERROR_RETURN_VALUE (ENOSYS);
-#endif
 }
-#ifndef __NR_utimensat
-stub_warning (utimensat)
-#endif

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af

commit 16d94f67e56c8dfd4fcac45ec0380d8b1ba6b2af
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Wed Mar 23 23:35:08 2016 +0100

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

-----------------------------------------------------------------------

Summary of changes:
 .gitattributes                        |    1 +
 ChangeLog                             |   17 +++++++++++++++++
 sysdeps/unix/sysv/linux/dl-openat64.c |    4 ----
 sysdeps/unix/sysv/linux/futimens.c    |    7 -------
 sysdeps/unix/sysv/linux/lutimes.c     |    8 --------
 sysdeps/unix/sysv/linux/utimensat.c   |    7 -------
 6 files changed, 18 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]