Annotation of /trunk/glibc/patches/glibc-2.7.0-static__vdso_clock_gettime.patch
Parent Directory
| 
Revision Log
Revision 697 -
(hide annotations)
(download)
Mon Oct 6 18:32:36 2008 UTC (15 years, 7 months ago) by niro
File size: 747 byte(s)
Mon Oct 6 18:32:36 2008 UTC (15 years, 7 months ago) by niro
File size: 747 byte(s)
-fixes errors with the __vdso_clock_gettime symbol while compiling static code. see: http://bbs.archlinux.org/viewtopic.php?pid=297346 and http://sourceware.org/ml/glibc-bugs/2008-01/msg00006.html
| 1 | niro | 697 | =================================================================== |
| 2 | RCS file: /cvs/glibc/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S,v | ||
| 3 | retrieving revision 1.29 | ||
| 4 | retrieving revision 1.30 | ||
| 5 | diff -u -r1.29 -r1.30 | ||
| 6 | --- libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S 2007/08/20 22:36:19 1.29 | ||
| 7 | +++ libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S 2007/12/12 08:05:33 1.30 | ||
| 8 | @@ -134,12 +134,14 @@ | ||
| 9 | /* Only clocks 0 and 1 are allowed so far. Both are handled in the | ||
| 10 | kernel. */ | ||
| 11 | leaq 24(%rsp), %rsi | ||
| 12 | +#ifdef SHARED | ||
| 13 | movq __vdso_clock_gettime@GOTPCREL(%rip), %rax | ||
| 14 | movq (%rax), %rax | ||
| 15 | PTR_DEMANGLE (%rax) | ||
| 16 | jz 26f | ||
| 17 | call *%rax | ||
| 18 | jmp 27f | ||
| 19 | +#endif | ||
| 20 | 26: movl $__NR_clock_gettime, %eax | ||
| 21 | syscall | ||
| 22 | 27: |