2.3.91-2
This commit is contained in:
parent
1fda0f1c11
commit
350c8dab79
@ -3347,33 +3347,36 @@
|
|||||||
@@ -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 1 Feb 2006 18:26:19 -0000 1.6
|
||||||
+++ libc/sysdeps/unix/sysv/linux/i386/sysconf.c 2006-03-06 09:22:20.000000000 +0100
|
+++ libc/sysdeps/unix/sysv/linux/i386/sysconf.c 6 Mar 2006 08:25:57 -0000 1.7
|
||||||
@@ -27,6 +27,7 @@ static long int linux_sysconf (int name)
|
@@ -26,7 +26,7 @@
|
||||||
|
static long int linux_sysconf (int name);
|
||||||
|
|
||||||
|
|
||||||
static long int
|
-static long int
|
||||||
+__attribute__((noinline))
|
+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. */
|
||||||
@@ -203,6 +204,7 @@ intel_check_word (int name, unsigned int
|
@@ -202,7 +202,7 @@ intel_check_word (int name, unsigned int
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static long int
|
-static long int
|
||||||
+__attribute__((noinline))
|
+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)
|
||||||
@@ -265,6 +267,7 @@ handle_intel (int name, unsigned int max
|
@@ -264,7 +264,7 @@ handle_intel (int name, unsigned int max
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static long int
|
-static long int
|
||||||
+__attribute__((noinline))
|
+static long int __attribute__ ((noinline))
|
||||||
handle_amd (int name)
|
handle_amd (int name)
|
||||||
{
|
{
|
||||||
unsigned int eax;
|
unsigned int eax;
|
||||||
@@ -359,17 +362,6 @@ i386_i486_test (void)
|
@@ -359,17 +359,6 @@ i386_i486_test (void)
|
||||||
long int
|
long int
|
||||||
__sysconf (int name)
|
__sysconf (int name)
|
||||||
{
|
{
|
||||||
@ -3391,3 +3394,36 @@
|
|||||||
/* 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)
|
||||||
|
--- libc/sysdeps/unix/sysv/linux/x86_64/sysconf.c 2 Feb 2006 05:33:33 -0000 1.4
|
||||||
|
+++ libc/sysdeps/unix/sysv/linux/x86_64/sysconf.c 6 Mar 2006 08:25:57 -0000 1.5
|
||||||
|
@@ -163,7 +163,7 @@ intel_check_word (int name, unsigned int
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
-static long int
|
||||||
|
+static long int __attribute__ ((noinline))
|
||||||
|
handle_intel (int name, unsigned int maxidx)
|
||||||
|
{
|
||||||
|
assert (maxidx >= 2);
|
||||||
|
@@ -220,7 +220,7 @@ handle_intel (int name, unsigned int max
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
-static long int
|
||||||
|
+static long int __attribute__ ((noinline))
|
||||||
|
handle_amd (int name)
|
||||||
|
{
|
||||||
|
unsigned int eax;
|
||||||
|
@@ -293,12 +293,6 @@ 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);
|
||||||
|
Loading…
Reference in New Issue
Block a user