SH lowlevellock broken for FUTEX_CLOCK_REALTIME.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index a9a0168..911312f 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-27  Andrew Stubbs  <ams@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/sh/lowlevellock.S (__lll_timedlock_wait):
+       Correct a logic error.
+
 2009-08-25  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/x86_64/tls.h (RTLD_ENABLE_FOREIGN_CALL): Store old value

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index b80c369..49b4e6d 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -52,7 +52,7 @@
 #  define LOAD_PRIVATE_FUTEX_WAIT(reg,tmp,tmp2) \
        stc     gbr, tmp        ; \
        mov.w   99f, reg        ; \
-       add     reg, tmp        ; \
+       add     reg, tmp        ; \
        bra     98f             ; \
         mov.l  @tmp, reg       ; \
 99:    .word   PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
@@ -61,7 +61,7 @@
 #  define LOAD_PRIVATE_FUTEX_WAIT(reg,tmp,tmp2) \
        stc     gbr, tmp        ; \
        mov.w   99f, reg        ; \
-       add     reg, tmp        ; \
+       add     reg, tmp        ; \
        mov.l   @tmp, reg       ; \
        bra     98f             ; \
         mov    #FUTEX_WAIT, tmp ; \
@@ -71,7 +71,7 @@
 # define LOAD_PRIVATE_FUTEX_WAKE(reg,tmp,tmp2) \
        stc     gbr, tmp        ; \
        mov.w   99f, reg        ; \
-       add     reg, tmp        ; \
+       add     reg, tmp        ; \
        mov.l   @tmp, reg       ; \
        bra     98f             ; \
         mov    #FUTEX_WAKE, tmp ; \
@@ -81,7 +81,7 @@
 #  define LOAD_FUTEX_WAIT(reg,tmp,tmp2) \
        stc     gbr, tmp        ; \
        mov.w   99f, tmp2       ; \
-       add     tmp2, tmp       ; \
+       add     tmp2, tmp       ; \
        mov.l   @tmp, tmp2      ; \
        bra     98f             ; \
         mov    #FUTEX_PRIVATE_FLAG, tmp ; \
@@ -93,7 +93,7 @@
 #  define LOAD_FUTEX_WAIT(reg,tmp,tmp2) \
        stc     gbr, tmp        ; \
        mov.w   99f, tmp2       ; \
-       add     tmp2, tmp       ; \
+       add     tmp2, tmp       ; \
        mov.l   @tmp, tmp2      ; \
        bra     98f             ; \
         mov    #FUTEX_PRIVATE_FLAG, tmp ; \
@@ -107,7 +107,7 @@
 # define LOAD_FUTEX_WAIT_ABS(reg,tmp,tmp2) \
        stc     gbr, tmp        ; \
        mov.w   99f, tmp2       ; \
-       add     tmp2, tmp       ; \
+       add     tmp2, tmp       ; \
        mov.l   @tmp, tmp2      ; \
        bra     98f             ; \
         mov    #FUTEX_PRIVATE_FLAG, tmp ; \
@@ -123,7 +123,7 @@
 # define LOAD_FUTEX_WAKE(reg,tmp,tmp2) \
        stc     gbr, tmp        ; \
        mov.w   99f, tmp2       ; \
-       add     tmp2, tmp       ; \
+       add     tmp2, tmp       ; \
        mov.l   @tmp, tmp2      ; \
        bra     98f             ; \
         mov    #FUTEX_PRIVATE_FLAG, tmp ; \
@@ -253,7 +253,7 @@ __lll_timedlock_wait:
        mov     #2, r6
        cmp/eq  r6, r2
        bf/s    2f
-        mov    r2, r6
+        mov    r6, r2
 
 1:
        mov     #2, r6
@@ -327,7 +327,7 @@ __lll_timedlock_wait:
 
        tst     r3, r3
        bt      6f
-       
+
 1:
        /* Get current time.  */
        mov     r15, r4