From 6ab5f50de41c22de3752722108def4ae721aec13 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 5 Oct 2004 09:26:23 +0000 Subject: Update. 2004-10-05 Jakub Jelinek * sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Return 200112L for _SC_CPUTIME or _SC_THREAD_CPUTIME. * nscd/Makefile (nscd-cflags): Set to -DIS_IN_nscd=1, plus -fpie if building PIE. (CFLAGS-*.c): Use it. * nscd/Makefile (relro-LDFLAGS): Add -Wl,-z,now if have-z-relro. ($(objpfx)nscd): Add $(relro-LDFLAGS). * sysdeps/unix/sysv/linux/i386/sysconf.c: Include hp-timing.h. (__sysconf): Return -1 for _SC_CPUTIME or _SC_THREAD_CPUTIME if !HP_TIMING_AVAIL. 2004-10-05 Ulrich Drepper * nscd/Makefile (distribute): Remove TODO. * nscd/TODO: Removed. --- sysdeps/unix/sysv/linux/i386/sysconf.c | 14 +++++++------- sysdeps/unix/sysv/linux/x86_64/sysconf.c | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/unix/sysv/linux/i386/sysconf.c b/sysdeps/unix/sysv/linux/i386/sysconf.c index 8a9ab61..eae849b 100644 --- a/sysdeps/unix/sysv/linux/i386/sysconf.c +++ b/sysdeps/unix/sysv/linux/i386/sysconf.c @@ -21,7 +21,7 @@ #include #include #include - +#include static long int linux_sysconf (int name); @@ -347,13 +347,13 @@ __sysconf (int name) { if (name == _SC_CPUTIME || name == _SC_THREAD_CPUTIME) { - /* Check dynamically. */ - int ac = i386_i486_test (); - - /* Only i386 and i486 have no TSC. */ +#if HP_TIMING_AVAIL // XXX We can add here test for machines which cannot support a - // XXX usabel TSC. - return ac == 0 || (ac & (1 << 21)) == 0 ? -1 : 200112L; + // XXX usable TSC. + return 200112L; +#else + return -1; +#endif } /* All the remainder, except the cache information, is handled in diff --git a/sysdeps/unix/sysv/linux/x86_64/sysconf.c b/sysdeps/unix/sysv/linux/x86_64/sysconf.c index 87f2c45..407fd46 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sysconf.c +++ b/sysdeps/unix/sysv/linux/x86_64/sysconf.c @@ -279,6 +279,12 @@ handle_amd (int name) long int __sysconf (int name) { + if (name == _SC_CPUTIME || name == _SC_THREAD_CPUTIME) + { + /* XXX Test whether TSC is usable. */ + return 200112L; + } + /* We only handle the cache information here (for now). */ if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE) return linux_sysconf (name); -- cgit v1.1