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.23-456-ge0835a5


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  e0835a5354aba6015648473a727823ea434a48e6 (commit)
      from  78880cc185dc521855a58001a28e3059722d8e85 (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=e0835a5354aba6015648473a727823ea434a48e6

commit e0835a5354aba6015648473a727823ea434a48e6
Author: Carlos O'Donell <carlos@redhat.com>
Date:   Fri Jun 10 14:40:38 2016 -0400

    Bug 20215: Always undefine __always_inline before defining it.
    
    The Linux kernel defines __always_inline in stddef.h (283d7573),
    and it conflicts with the definition in misc/sys/cdefs.h.  To fix
    this we undefine it first and always use the glibc definition.

diff --git a/ChangeLog b/ChangeLog
index 34f51b5..fd2ea8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-09  Carlos O'Donell  <carlos@redhat.com>
+
+	[BZ #20215]
+	* misc/sys/cdefs.h [__GNUC_PREREQ (3,2)]: Undef __always_inline first.
+	[!__GNUC_PREREQ (3,2)]: Likewise.
+
 2016-06-10  Adhemerval Zanela  <adhemerval.zanella@linaro.org>
 
 	* conform/data/sys/socket.h-data (msghdr.msg_iovlen): Add xfail-.
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 7fd4154..a3c2429 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -304,8 +304,13 @@
 
 /* Forces a function to be always inlined.  */
 #if __GNUC_PREREQ (3,2)
+/* The Linux kernel defines __always_inline in stddef.h (283d7573), and
+   it conflicts with this definition.  Therefore undefine it first to
+   allow either header to be included first.  */
+# undef __always_inline
 # define __always_inline __inline __attribute__ ((__always_inline__))
 #else
+# undef __always_inline
 # define __always_inline __inline
 #endif
 

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

Summary of changes:
 ChangeLog        |    6 ++++++
 misc/sys/cdefs.h |    5 +++++
 2 files changed, 11 insertions(+), 0 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]