* sysdeps/unix/sysv/linux/sh/lowlevellock.S: Define

	LOAD_FUTEX_WAIT_ABS even if (FUTEX_WAIT == 0).

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5551d7a2ec48070338accd37550d01859d591bdd..530e7105260b2540b7ea499245c1825f0275bdd2 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-14  SUGIOKA Toshinobu  <sugioka@itonet.co.jp>
+
+       * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Define
+       LOAD_FUTEX_WAIT_ABS even if (FUTEX_WAIT == 0).
+
 2009-01-29  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/pthread/unwind-forcedunwind.c: Encrypt all function

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index c051192cee063ac03eb391923a5f620ef789cc57..b80c369a3c897fa72d45fc041dddffcc6536a1f3 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -103,7 +103,8 @@
        and     tmp2, reg       ; \
        mov     #FUTEX_WAIT, tmp ; \
        or      tmp, reg
-#  define LOAD_FUTEX_WAIT_ABS(reg,tmp,tmp2) \
+# endif
+# define LOAD_FUTEX_WAIT_ABS(reg,tmp,tmp2) \
        stc     gbr, tmp        ; \
        mov.w   99f, tmp2       ; \
        add     tmp2, tmp       ; \
@@ -119,7 +120,6 @@
        swap.b  tmp2, tmp2; \
        or      tmp2, tmp; \
        or      tmp, reg
-# endif
 # define LOAD_FUTEX_WAKE(reg,tmp,tmp2) \
        stc     gbr, tmp        ; \
        mov.w   99f, tmp2       ; \