This commit is contained in:
Jakub Jelinek 2006-03-06 08:24:20 +00:00
parent a18e83c77d
commit 1fda0f1c11

View File

@ -3347,3 +3347,47 @@
@@ -1 +1 @@ @@ -1 +1 @@
-s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_
+s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
--- libc/sysdeps/unix/sysv/linux/i386/sysconf.c 2006-02-02 06:10:40.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/i386/sysconf.c 2006-03-06 09:22:20.000000000 +0100
@@ -27,6 +27,7 @@ static long int linux_sysconf (int name)
static long int
+__attribute__((noinline))
handle_i486 (int name)
{
/* The processor only has a unified level 1 cache of 8k. */
@@ -203,6 +204,7 @@ intel_check_word (int name, unsigned int
static long int
+__attribute__((noinline))
handle_intel (int name, unsigned int maxidx)
{
if (maxidx < 2)
@@ -265,6 +267,7 @@ handle_intel (int name, unsigned int max
static long int
+__attribute__((noinline))
handle_amd (int name)
{
unsigned int eax;
@@ -359,17 +362,6 @@ i386_i486_test (void)
long int
__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
the generic code. */
if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE)