[Glibc-bsd-commits] r4585 - trunk/glibc-ports/kfreebsd/x86_64/fbtl

[Petr Salinger]

Author: ps-guest
Date: 2013-06-23 07:49:20 +0000 (Sun, 23 Jun 2013)
New Revision: 4585

Modified:
   trunk/glibc-ports/kfreebsd/x86_64/fbtl/lowlevellock.S
   trunk/glibc-ports/kfreebsd/x86_64/fbtl/lowlevellock.h
Log:
fixup into stub lowlevellock


Modified: trunk/glibc-ports/kfreebsd/x86_64/fbtl/lowlevellock.S
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/fbtl/lowlevellock.S	2013-06-23 07:48:38 UTC (rev 4584)
+++ trunk/glibc-ports/kfreebsd/x86_64/fbtl/lowlevellock.S	2013-06-23 07:49:20 UTC (rev 4585)
@@ -160,12 +160,16 @@
 __lll_timedlock_wait:
 	cfi_startproc
 # ifndef __ASSUME_FUTEX_CLOCK_REALTIME
+#if 1
+	jmp	.Lreltmo
+#else
 #  ifdef PIC
 	cmpl	$0, __have_futex_clock_realtime(%rip)
 #  else
 	cmpl	$0, __have_futex_clock_realtime
 #  endif
 	je	.Lreltmo
+#endif
 # endif
 
 	cmpq	$0, (%rdx)

Modified: trunk/glibc-ports/kfreebsd/x86_64/fbtl/lowlevellock.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/fbtl/lowlevellock.h	2013-06-23 07:48:38 UTC (rev 4584)
+++ trunk/glibc-ports/kfreebsd/x86_64/fbtl/lowlevellock.h	2013-06-23 07:49:20 UTC (rev 4585)
@@ -27,6 +27,7 @@
 # include <bits/pthreadtypes.h>
 # include <kernel-features.h>
 # include <tcb-offsets.h>
+# include <atomic.h>
 
 # ifndef LOCK_INSTR
 #  ifdef UP