OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Joseph Myers 2014-06-20 20:00:51 +00:00
parent 90e5dd482f
commit a2a76afe91
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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]

22
sysdeps/unix/sysv/linux/adjtime.c
View File

@ -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)
{

3
sysdeps/unix/sysv/linux/kernel-features.h
View File

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