[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.20-roundup.patch)

[Allan McRae]

    Date: Tuesday, November 25, 2014 @ 02:52:32
  Author: allan
Revision: 227071

upgpkg: glibc 2.20-4

2.20 patchset update, fixes clang compile issue

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc-2.20-roundup.patch

--------------------------+
 PKGBUILD                 |    6 +++---
 glibc-2.20-roundup.patch |   26 +++++++++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-25 01:08:07 UTC (rev 227070)
+++ PKGBUILD	2014-11-25 01:52:32 UTC (rev 227071)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.20
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
@@ -27,7 +27,7 @@
         locale-gen)
 md5sums=('948a6e06419a01bd51e97206861595b0'
          'SKIP'
-         '7414dd9a268e93111a9ffd7e13b7fa53'
+         '8cfa2a0fa2a9aad8b86a138587d6261f'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
 
@@ -36,7 +36,7 @@
 prepare() {
   cd ${srcdir}/glibc-${pkgver}
 
-  # glibc-2.20..33ceaf61
+  # glibc-2.20..d73ac1bb
   patch -p1 -i $srcdir/glibc-2.20-roundup.patch
 
   mkdir ${srcdir}/glibc-build

Modified: glibc-2.20-roundup.patch
===================================================================
--- glibc-2.20-roundup.patch	2014-11-25 01:08:07 UTC (rev 227070)
+++ glibc-2.20-roundup.patch	2014-11-25 01:52:32 UTC (rev 227071)
@@ -1,8 +1,14 @@
 diff --git a/ChangeLog b/ChangeLog
-index f343428..f9f3407 100644
+index f343428..ac7d980 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,88 @@
+@@ -1,3 +1,94 @@
++2014-11-24  Siddhesh Poyarekar  <siddhesh at redhat.com>
++
++	[BZ #17266]
++	* misc/sys/cdefs.h: Define __extern_always_inline for clang
++	4.2 and newer.
++
 +2014-11-19  Carlos O'Donell  <carlos at redhat.com>
 +	    Florian Weimer  <fweimer at redhat.com>
 +	    Joseph Myers  <joseph at codesourcery.com>
@@ -181,7 +187,7 @@
  extern double __gamma_r_finite (double, int *);
  __extern_always_inline double __NTH (tgamma (double __d))
 diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
-index 04db956..01e81ba 100644
+index 04db956..711ac1d 100644
 --- a/misc/sys/cdefs.h
 +++ b/misc/sys/cdefs.h
 @@ -131,7 +131,6 @@
@@ -192,7 +198,7 @@
  
  #if __GNUC_PREREQ (4,3)
  # define __warndecl(name, msg) \
-@@ -318,12 +317,13 @@
+@@ -318,12 +317,19 @@
  # define __attribute_artificial__ /* Ignore */
  #endif
  
@@ -206,13 +212,19 @@
 +   inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
 +   or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
 +   older than 4.3 may define these macros and still not guarantee GNU inlining
-+   semantics.  */
-+#if !defined __cplusplus || __GNUC_PREREQ (4,3)
++   semantics.
++
++   clang++ identifies itself as gcc-4.2, but has support for GNU inlining
++   semantics, that can be checked fot by using the __GNUC_STDC_INLINE_ and
++   __GNUC_GNU_INLINE__ macro definitions.  */
++#if (!defined __cplusplus || __GNUC_PREREQ (4,3) \
++     || (defined __clang__ && (defined __GNUC_STDC_INLINE__ \
++			       || defined __GNUC_GNU_INLINE__)))
 +# if defined __GNUC_STDC_INLINE__ || defined __cplusplus
  #  define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
  #  define __extern_always_inline \
    extern __always_inline __attribute__ ((__gnu_inline__))
-@@ -331,9 +331,10 @@
+@@ -331,9 +337,10 @@
  #  define __extern_inline extern __inline
  #  define __extern_always_inline extern __always_inline
  # endif