qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/unix/sysv/linux/x86_64/sysconf.c 

(handle_intel, handle_amd): Add __attribute__ ((noinline)).
	* sysdeps/unix/sysv/linux/i386/sysconf.c
	(handle_i486, handle_intel, handle_amd): Likewise.

	* sysdeps/unix/sysv/linux/i386/sysconf.c (__sysconf): Don't handle
	_SC_CPUTIME and _SC_THREAD_CPUTIME here.
	* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise.
This commit is contained in:
Roland McGrath 2006-03-06 08:26:03 +00:00
parent 16a1046837
commit 6f92000389
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2006-03-06 Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sysconf.c
(handle_intel, handle_amd): Add __attribute__ ((noinline)).
* sysdeps/unix/sysv/linux/i386/sysconf.c
(handle_i486, handle_intel, handle_amd): Likewise.
* sysdeps/unix/sysv/linux/i386/sysconf.c (__sysconf): Don't handle
_SC_CPUTIME and _SC_THREAD_CPUTIME here.
* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise.
2006-03-05 Roland McGrath <roland@redhat.com> 2006-03-05 Roland McGrath <roland@redhat.com>
* malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value. * malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value.

17
sysdeps/unix/sysv/linux/i386/sysconf.c
View File

@ -26,7 +26,7 @@
static long int linux_sysconf (int name); static long int linux_sysconf (int name);
static long int static long int __attribute__ ((noinline))
handle_i486 (int name) handle_i486 (int name)
{ {
/* The processor only has a unified level 1 cache of 8k. */ /* The processor only has a unified level 1 cache of 8k. */
@ -202,7 +202,7 @@ intel_check_word (int name, unsigned int value, bool *has_level_2,
} }
static long int static long int __attribute__ ((noinline))
handle_intel (int name, unsigned int maxidx) handle_intel (int name, unsigned int maxidx)
{ {
if (maxidx < 2) if (maxidx < 2)
@ -264,7 +264,7 @@ handle_intel (int name, unsigned int maxidx)
} }
static long int static long int __attribute__ ((noinline))
handle_amd (int name) handle_amd (int name)
{ {
unsigned int eax; unsigned int eax;
@ -359,17 +359,6 @@ i386_i486_test (void)
long int long int
__sysconf (int name) __sysconf (int name)
{ {
if (name == _SC_CPUTIME || name == _SC_THREAD_CPUTIME)
{
#if HP_TIMING_AVAIL
// XXX We can add here test for machines which cannot support a
// XXX usable TSC.
return 200112L;
#else
return -1;
#endif
}
/* All the remainder, except the cache information, is handled in /* All the remainder, except the cache information, is handled in
the generic code. */ the generic code. */
if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE) if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE)

10
sysdeps/unix/sysv/linux/x86_64/sysconf.c
View File

@ -163,7 +163,7 @@ intel_check_word (int name, unsigned int value, bool *has_level_2,
} }
static long int static long int __attribute__ ((noinline))
handle_intel (int name, unsigned int maxidx) handle_intel (int name, unsigned int maxidx)
{ {
assert (maxidx >= 2); assert (maxidx >= 2);
@ -220,7 +220,7 @@ handle_intel (int name, unsigned int maxidx)
} }
static long int static long int __attribute__ ((noinline))
handle_amd (int name) handle_amd (int name)
{ {
unsigned int eax; unsigned int eax;
@ -293,12 +293,6 @@ handle_amd (int name)
long int long int
__sysconf (int name) __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). */ /* We only handle the cache information here (for now). */
if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE) if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE)
return linux_sysconf (name); return linux_sysconf (name);