From patchwork Fri Jun 20 17:07:50 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Joseph Myers <joseph@codesourcery.com>
X-Patchwork-Id: 1617
Received: (qmail 24908 invoked by alias); 20 Jun 2014 17:07:59 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 24891 invoked by uid 89); 20 Jun 2014 17:07:58 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,
	BAYES_00 autolearn=ham version=3.3.2
X-HELO: relay1.mentorg.com
Date: Fri, 20 Jun 2014 17:07:50 +0000
From: "Joseph S. Myers" <joseph@codesourcery.com>
To: <libc-alpha@sourceware.org>
Subject: Remove __ASSUME_ADJ_OFFSET_SS_READ
Message-ID: <Pine.LNX.4.64.1406201707090.16806@digraph.polyomino.org.uk>
MIME-Version: 1.0

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.

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.

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