diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-02-18 15:49:44 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2009-02-18 15:49:44 +0000 |
| commit | cf22c5c9b3a4a6cc81a269d49d2324b5df084d74 (patch) | |
| tree | ca7e374c348baf4e6510329f3f271eca4eb5419f /nptl | |
| parent | 73c5dd45bc405428148ee740cac61a1279fe57d4 (diff) | |
Updated to fedora-glibc-20090218T1534
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index eb0f345cd8..c0c5f82ea8 100644 --- 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 c051192cee..b80c369a3c 100644 --- 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 ; \ |