AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 00:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sysconf compilation for !HP_TIMING_AVAIL archs

Browse Source
This commit is contained in:
Andreas Schwab 2011-05-23 11:51:12 -04:00 committed by Ulrich Drepper
parent f2962a7195
commit f50ef8f1ef
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2011-05-23 Andreas Schwab <schwab@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sysconf.c (HAS_CPUCLOCK): Add
parameter name.
* sysdeps/unix/sysv/linux/sysconf.c (has_cpuclock, HAS_CPUCLOCK):
Add parameter name.
(__sysconf): Pass it down.
2011-05-22 Ulrich Drepper <drepper@gmail.com> 2011-05-22 Ulrich Drepper <drepper@gmail.com>
[BZ #12671] [BZ #12671]

2
sysdeps/unix/sysv/linux/ia64/sysconf.c
View File

@ -24,7 +24,7 @@
#include "has_cpuclock.c" #include "has_cpuclock.c"
#define HAS_CPUCLOCK() (has_cpuclock () ? _POSIX_VERSION : -1) #define HAS_CPUCLOCK(name) (has_cpuclock () ? _POSIX_VERSION : -1)
/* Now the generic Linux version. */ /* Now the generic Linux version. */

6
sysdeps/unix/sysv/linux/sysconf.c
View File

@ -37,7 +37,7 @@ static long int posix_sysconf (int name);
#ifndef HAS_CPUCLOCK #ifndef HAS_CPUCLOCK
static long int static long int
has_cpuclock (void) has_cpuclock (int name)
{ {
# if defined __NR_clock_getres || HP_TIMING_AVAIL # if defined __NR_clock_getres || HP_TIMING_AVAIL
/* If we have HP_TIMING, we will fall back on that if the system /* If we have HP_TIMING, we will fall back on that if the system
@ -59,7 +59,7 @@ has_cpuclock (void)
return -1; return -1;
# endif # endif
} }
# define HAS_CPUCLOCK() has_cpuclock () # define HAS_CPUCLOCK(name) has_cpuclock (name)
#endif #endif
@ -86,7 +86,7 @@ __sysconf (int name)
case _SC_CPUTIME: case _SC_CPUTIME:
case _SC_THREAD_CPUTIME: case _SC_THREAD_CPUTIME:
return HAS_CPUCLOCK (); return HAS_CPUCLOCK (name);
case _SC_ARG_MAX: case _SC_ARG_MAX:
#if __LINUX_KERNEL_VERSION < 0x020617 #if __LINUX_KERNEL_VERSION < 0x020617