This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.19-770-g3d9eb57


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  3d9eb57c55c30a6fd69b056851e3ed9f07cd97c5 (commit)
      from  78b984ae2c015997be860b0eedc880691d6620cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3d9eb57c55c30a6fd69b056851e3ed9f07cd97c5

commit 3d9eb57c55c30a6fd69b056851e3ed9f07cd97c5
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jul 3 22:03:14 2014 -0700

    Fix ia64 build error in lll_futex_timed_wait_bitset

diff --git a/ChangeLog b/ChangeLog
index e3a9b4f..5f12906 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 0105972..9d32395 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);				   \

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                        |    3 +++
 sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]