[git commit nptl] nptl_sh: Fix build problem with FUTEX_CLOCK_REALTIME

Carmelo Amoroso carmelo.amoroso at st.com
Wed Feb 10 14:24:03 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=4c15dd5a77e2df399ea3c4e6818cad4df42c0219
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

This patch fixes a build problem into the lowlevellock.S
when support FUTEX_CLOCK_REALTIME (kernel newer than 2.6.29).
__have_futex_clock_realtime symbol is not defined when set
__ASSUME_FUTEX_CLOCK_REALTIME. The same is on i386 arch.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro at st.com>
Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
---
 .../nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index 25c75c5..00edc75 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -284,6 +284,7 @@ __lll_timedlock_wait:
 	 mov.l	@r15+, r12
 
 	.align	2
+# ifndef __ASSUME_FUTEX_CLOCK_REALTIME
 # ifdef __PIC__
 .Lgot:
 	.long	_GLOBAL_OFFSET_TABLE_
@@ -294,7 +295,6 @@ __lll_timedlock_wait:
 	.long	__have_futex_clock_realtime
 # endif
 
-# ifndef __ASSUME_FUTEX_CLOCK_REALTIME
 .Lreltmo:
 	/* Check for a valid timeout value.  */
 	mov.l	@(4,r6), r1
-- 
1.6.3.3



More information about the uClibc-cvs mailing list