diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-07-03 22:03:14 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-07-03 22:03:14 -0700 |
| commit | 3d9eb57c55c30a6fd69b056851e3ed9f07cd97c5 (patch) | |
| tree | 42d1cdc247ff47bee6233bec36ac540b1ec0ab09 | |
| parent | 78b984ae2c015997be860b0eedc880691d6620cf (diff) | |
| download | glibc-3d9eb57c55c30a6fd69b056851e3ed9f07cd97c5.tar.gz glibc-3d9eb57c55c30a6fd69b056851e3ed9f07cd97c5.tar.xz glibc-3d9eb57c55c30a6fd69b056851e3ed9f07cd97c5.zip | |
Fix ia64 build error in lll_futex_timed_wait_bitset
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e3a9b4f098..5f12906b01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-07-03 Roland McGrath <roland@hack.frob.com> + * sysdeps/unix/sysv/linux/ia64/lowlevellock.h + (lll_futex_timed_wait_bitset): Fix syscall argument count. + * sysdeps/nptl/configure.ac (libc_cv_forced_unwind): Use -Dinhibit_libc=1 for unwind.h check to prevent false failure in a bare environment with no <stdlib.h> installed. diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h index 0105972b40..9d323955a5 100644 --- a/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h @@ -95,7 +95,7 @@ ({ \ int __op = FUTEX_WAIT_BITSET | (clockbit); \ \ - DO_INLINE_SYSCALL(futex, 4, (long) (ftx), \ + DO_INLINE_SYSCALL(futex, 6, (long) (ftx), \ __lll_private_flag (__op, private), \ (int) (val), (long) (timespec), NULL /* Unused. */, \ FUTEX_BITSET_MATCH_ANY); \ |