2.4.90-20

This commit is contained in:
Jakub Jelinek 2006-08-15 08:45:05 +00:00
parent 4333d793d9
commit 218b9026d8

View File

@ -3438,3 +3438,23 @@
@@ -1 +1 @@
-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"_
--- libc/sysdeps/unix/sysv/linux/clock_settime.c 2006-08-15 07:35:15.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/clock_settime.c 2006-08-15 10:41:50.000000000 +0200
@@ -22,7 +22,7 @@
#include "kernel-posix-cpu-timers.h"
#include <kernel-features.h>
-#ifndef HAVE_CLOCK_GETTIME_VSYSCALL
+#ifndef HAVE_CLOCK_GETRES_VSYSCALL
# undef INTERNAL_VSYSCALL
# define INTERNAL_VSYSCALL INTERNAL_SYSCALL
# undef INLINE_VSYSCALL
@@ -43,7 +43,7 @@ maybe_syscall_settime_cpu (clockid_t clo
if (!__libc_missing_posix_cpu_timers)
{
INTERNAL_SYSCALL_DECL (err);
- int r = INTERNAL_VSYSCALL (clock_settime, err, 2, clock_id, tp);
+ int r = INTERNAL_SYSCALL (clock_settime, err, 2, clock_id, tp);
if (!INTERNAL_SYSCALL_ERROR_P (r, err))
return 0;