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.19-615-ga2a76af


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  a2a76afe9127dc7b3e7c526bdf0088c1cc17c33d (commit)
      from  90e5dd482fc4708d559fbec9740104470ffdb9df (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=a2a76afe9127dc7b3e7c526bdf0088c1cc17c33d

commit a2a76afe9127dc7b3e7c526bdf0088c1cc17c33d
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Fri Jun 20 20:00:51 2014 +0000

    Remove __ASSUME_ADJ_OFFSET_SS_READ.
    
    This patch removes the __ASSUME_ADJ_OFFSET_SS_READ macro (and
    conditionals on whether ADJ_OFFSET_SS_READ is defined), now it can be
    unconditionally assumed to be true and ADJ_OFFSET_SS_READ can be
    assumed to be defined.
    
    Tested x86_64 that the disassembly of installed shared libraries is
    unchanged by this patch.
    
    	* sysdeps/unix/sysv/linux/kernel-features.h
    	(__ASSUME_ADJ_OFFSET_SS_READ): Remove macro.
    	* sysdeps/unix/sysv/linux/adjtime.c (ADJTIME)
    	[ADJ_OFFSET_SS_READ]: Make code unconditional.
    	(ADJTIME) [!ADJ_OFFSET_SS_READ]: Remove conditional code.

diff --git a/ChangeLog b/ChangeLog
index fbbd5d2..a87a2d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_ADJ_OFFSET_SS_READ): Remove macro.
+	* sysdeps/unix/sysv/linux/adjtime.c (ADJTIME)
+	[ADJ_OFFSET_SS_READ]: Make code unconditional.
+	(ADJTIME) [!ADJ_OFFSET_SS_READ]: Remove conditional code.
+
 2014-06-20  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	[BZ #17075]
diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c
index be49911..ef31cc5 100644
--- a/sysdeps/unix/sysv/linux/adjtime.c
+++ b/sysdeps/unix/sysv/linux/adjtime.c
@@ -72,28 +72,10 @@ ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv)
       tntx.modes = ADJ_OFFSET_SINGLESHOT;
     }
   else
-    {
-#ifdef ADJ_OFFSET_SS_READ
-      tntx.modes = ADJ_OFFSET_SS_READ;
-#else
-      tntx.modes = 0;
-#endif
-    }
+    tntx.modes = ADJ_OFFSET_SS_READ;
 
-#if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ
- again:
-#endif
   if (__glibc_unlikely (ADJTIMEX (&tntx) < 0))
-    {
-#if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ
-      if (itv && errno == EINVAL && tntx.modes == ADJ_OFFSET_SS_READ)
-	{
-	  tntx.modes = ADJ_OFFSET_SINGLESHOT;
-	  goto again;
-	}
-#endif
-      return -1;
-    }
+    return -1;
 
   if (otv)
     {
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 026f89f..d067321 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -120,9 +120,6 @@
    2.6.23.  */
 #define __ASSUME_O_CLOEXEC	1
 
-/* Support for ADJ_OFFSET_SS_READ was added in 2.6.24.  */
-#define __ASSUME_ADJ_OFFSET_SS_READ	1
-
 /* Support for various CLOEXEC and NONBLOCK flags was added in
    2.6.27.  */
 #define __ASSUME_SOCK_CLOEXEC	1

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

Summary of changes:
 ChangeLog                                 |    8 ++++++++
 sysdeps/unix/sysv/linux/adjtime.c         |   22 ++--------------------
 sysdeps/unix/sysv/linux/kernel-features.h |    3 ---
 3 files changed, 10 insertions(+), 23 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]