summaryrefslogtreecommitdiff
path: root/libpthread/nptl
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-02-19 16:32:22 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-02-19 16:32:22 +0100
commit4c15dd5a77e2df399ea3c4e6818cad4df42c0219 (patch)
tree577fe010f6165a8775ab960a96bce316c15d5282 /libpthread/nptl
parent510d1ed6dfdbf33103efe7d625779df1835d6ce9 (diff)
nptl_sh: Fix build problem with FUTEX_CLOCK_REALTIME
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@st.com> Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/nptl')
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S2
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 25c75c54a..00edc75a7 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