This is the mail archive of the 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.22-412-g5ef1933

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  5ef193391bb0916ec03f0f06a9b1fe0b00591ad8 (commit)
      from  15306e38888f770e548538a956e279b019654443 (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 -----------------------------------------------------------------;a=commitdiff;h=5ef193391bb0916ec03f0f06a9b1fe0b00591ad8

commit 5ef193391bb0916ec03f0f06a9b1fe0b00591ad8
Author: Joseph Myers <>
Date:   Fri Oct 16 16:04:06 2015 +0000

    Fix i386 build for lll_unlock_elision change.
    Tested for i386.
    	* sysdeps/unix/sysv/linux/i386/lowlevellock.h
    	(lll_unlock_elision): Add adapt_count parameter.

diff --git a/ChangeLog b/ChangeLog
index ad3f64f..3e35f81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-16  Joseph Myers  <>
+	* sysdeps/unix/sysv/linux/i386/lowlevellock.h
+	(lll_unlock_elision): Add adapt_count parameter.
 2015-10-15  Joseph Myers  <>
 	* sysdeps/nptl/ Do not give errors based on the
diff --git a/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index 58f5638..b8ccd31 100644
--- a/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -317,7 +317,7 @@ extern int __lll_trylock_elision(int *lock, short *adapt_count)
 #define lll_lock_elision(futex, adapt_count, private) \
   __lll_lock_elision (&(futex), &(adapt_count), private)
-#define lll_unlock_elision(futex, private) \
+#define lll_unlock_elision(futex, adapt_count, private) \
   __lll_unlock_elision (&(futex), private)
 #define lll_trylock_elision(futex, adapt_count) \
   __lll_trylock_elision(&(futex), &(adapt_count))


Summary of changes:
 ChangeLog                                   |    5 +++++
 sysdeps/unix/sysv/linux/i386/lowlevellock.h |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

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]