Author: aurel32
Date: 2008-01-03 10:43:55 +0000 (Thu, 03 Jan 2008)
New Revision: 2769

Added:
   glibc-package/trunk/debian/patches/amd64/cvs-vdso_clock_gettime.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
  * patches/amd64/cvs-vdso_clock_gettime.diff: new patch from CVS to fix
    static linking on amd64.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2008-01-03 10:30:09 UTC (rev 
2768)
+++ glibc-package/trunk/debian/changelog        2008-01-03 10:43:55 UTC (rev 
2769)
@@ -11,11 +11,13 @@
     iconv hang when converting to ISO-2022-JP. Thanks to Bryan Donlan for
     the patch.  Closes: #458579.
   * kfreebsd/local-sysdeps.diff: update to revision 2094 (from glibc-bsd).
+  * patches/amd64/cvs-vdso_clock_gettime.diff: new patch from CVS to fix
+    static linking on amd64.
 
   [ Clint Adams ]
   * debhelper.in/nscd.init: use lsb output functions.  Closes: #457661.
 
- -- Aurelien Jarno <[EMAIL PROTECTED]>  Thu, 03 Jan 2008 11:29:44 +0100
+ -- Aurelien Jarno <[EMAIL PROTECTED]>  Thu, 03 Jan 2008 11:43:30 +0100
 
 glibc (2.7-5) unstable; urgency=low
 

Added: glibc-package/trunk/debian/patches/amd64/cvs-vdso_clock_gettime.diff
===================================================================
--- glibc-package/trunk/debian/patches/amd64/cvs-vdso_clock_gettime.diff        
                        (rev 0)
+++ glibc-package/trunk/debian/patches/amd64/cvs-vdso_clock_gettime.diff        
2008-01-03 10:43:55 UTC (rev 2769)
@@ -0,0 +1,29 @@
+2007-12-12  Ulrich Drepper  <[EMAIL PROTECTED]>
+
+       [BZ #5465]
+       * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S [!SHARED]
+       (__pthread_cond_timedwait): Don't use VDSO.
+       Patch by Michal Januszewski.
+
+===================================================================
+RCS file: 
/cvs/glibc/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S,v
+retrieving revision 1.29
+retrieving revision 1.30
+diff -u -r1.29 -r1.30
+--- libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S  
2007/08/20 22:36:19     1.29
++++ libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S  
2007/12/12 08:05:33     1.30
+@@ -134,12 +134,14 @@
+       /* Only clocks 0 and 1 are allowed so far.  Both are handled in the
+          kernel.  */
+       leaq    24(%rsp), %rsi
++#ifdef SHARED
+       movq    [EMAIL PROTECTED](%rip), %rax
+       movq    (%rax), %rax
+       PTR_DEMANGLE (%rax)
+       jz      26f
+       call    *%rax
+       jmp     27f
++#endif
+ 26:   movl    $__NR_clock_gettime, %eax
+       syscall
+ 27:

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series   2008-01-03 10:30:09 UTC (rev 
2768)
+++ glibc-package/trunk/debian/patches/series   2008-01-03 10:43:55 UTC (rev 
2769)
@@ -46,6 +46,7 @@
 alpha/submitted-xstat.diff -p0
 alpha/submitted-PTR_MANGLE.diff
 
+amd64/cvs-vdso_clock_gettime.diff -p1
 amd64/local-biarch.diff 
 amd64/local-clone.diff -p0
 amd64/local-linuxthreads-gscope.diff -p0


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to