Sync with upstream master.

- Disable -Werror on powerpc and armv7hl.
- Temporarily disable valgrind test on ppc64.

glibc-aarch64-fix-strchrnul-clobbering-v15.patch

@@ -1,19 +0,0 @@
-commit aa76a5c7010e98c737d79f37aa6ae668f60f7a00
-Author: Richard Earnshaw <rearnsha@arm.com>
-Date:   Wed Dec 10 09:54:09 2014 +0000
-
-    [AArch64] Fix strchrnul clobbering v15
-
-diff --git a/sysdeps/aarch64/strchrnul.S b/sysdeps/aarch64/strchrnul.S
-index b98c2e9..57835d8 100644
---- a/sysdeps/aarch64/strchrnul.S
-+++ b/sysdeps/aarch64/strchrnul.S
-@@ -46,7 +46,7 @@
- #define vhas_nul2	v4
- #define vhas_chr1	v5
- #define vhas_chr2	v6
--#define vrepmask	v15
-+#define vrepmask	v7
- #define vend1		v16
- 
- /* Core algorithm.

glibc-fedora-getrlimit-PLT.patch

@@ -1,45 +0,0 @@
-From 70d0a630700f602a457832383161d261fe222db5 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 1 Jul 2010 13:14:26 +0200
-Subject: [PATCH] Fix PLT reference
-
-* include/sys/resource.h (__getrlimit): Add hidden proto.
-* sysdeps/unix/sysv/linux/i386/getrlimit.c: Add libc_hidden_weak.
-* sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def.
-* resource/getrlimit.c: Likewise.
-
----
- ChangeLog                                |    7 +++++++
- include/sys/resource.h                   |    1 +
- resource/getrlimit.c                     |    1 +
- sysdeps/mach/hurd/getrlimit.c            |    1 +
- sysdeps/unix/sysv/linux/i386/getrlimit.c |    1 +
- 5 files changed, 11 insertions(+), 0 deletions(-)
-
---- a/include/sys/resource.h
-+++ b/include/sys/resource.h
-@@ -14,5 +14,6 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
- 
- extern int __setrlimit (enum __rlimit_resource __resource,
- 			const struct rlimit *__rlimits);
-+libc_hidden_proto (__getrlimit)
- #endif
- #endif
---- a/resource/getrlimit.c
-+++ b/resource/getrlimit.c
-@@ -27,6 +27,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
-   __set_errno (ENOSYS);
-   return -1;
- }
-+libc_hidden_def (__getrlimit)
- weak_alias (__getrlimit, getrlimit)
- 
- stub_warning (getrlimit)
---- a/sysdeps/mach/hurd/getrlimit.c
-+++ b/sysdeps/mach/hurd/getrlimit.c
-@@ -43,4 +43,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
- 
-   return 0;
- }
-+libc_hidden_def (__getrlimit)
- weak_alias (__getrlimit, getrlimit)

glibc-fedora-uname-getrlimit.patch

@@ -28,17 +28,6 @@ GLIBC_PRIVATE.
    }
  }
  
---- a/nptl/nptl-init.c
-+++ b/nptl/nptl-init.c
-@@ -414,7 +414,7 @@ __pthread_initialize_minimal_internal (void)
-   /* Determine the default allowed stack size.  This is the size used
-      in case the user does not specify one.  */
-   struct rlimit limit;
--  if (getrlimit (RLIMIT_STACK, &limit) != 0
-+  if (__getrlimit (RLIMIT_STACK, &limit) != 0
-       || limit.rlim_cur == RLIM_INFINITY)
-     /* The system limit is not usable.  Use an architecture-specific
-        default.  */
 --- a/sysdeps/unix/sysv/linux/i386/Versions
 +++ b/sysdeps/unix/sysv/linux/i386/Versions
 @@ -53,5 +53,6 @@

glibc.spec

@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.20-276-g0e7e69b
+%define glibcsrcdir  glibc-2.20-480-g46abb64
 %define glibcversion 2.20.90
-%define glibcrelease 13%{?dist}
+%define glibcrelease 15%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -15,7 +15,7 @@
 # You must always set run_glibc_tests to one for production builds.
 %define run_glibc_tests 1
 # Run valgrind test to ensure compatibility.
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
+%ifarch %{ix86} x86_64 ppc ppc64le s390x armv7hl aarch64
 %define run_valgrind_tests 1
 %endif
 ##############################################################################
@@ -146,12 +146,8 @@ Patch0005: %{name}-rh825061.patch
 Patch0006: %{name}-arm-hardfloat-3.patch
 
 # Needs to be sent upstream
-Patch0008: %{name}-fedora-getrlimit-PLT.patch
 Patch0009: %{name}-fedora-include-bits-ldbl.patch
 
-# Needs to be sent upstream
-Patch0029: %{name}-rh841318.patch
-
 # All these were from the glibc-fedora.patch mega-patch and need another
 # round of reviewing.  Ideally they'll either be submitted upstream or
 # dropped.
@@ -239,7 +235,6 @@ Patch2031: %{name}-rh1070416.patch
 
 Patch2033: %{name}-aarch64-tls-fixes.patch
 Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
-Patch2035: %{name}-aarch64-fix-strchrnul-clobbering-v15.patch
 
 ##############################################################################
 # End of glibc patches.
@@ -541,7 +536,6 @@ package or when debugging this package.
 %patch0005 -p1
 %patch0006 -p1
 %patch2007 -p1
-%patch0008 -p1
 %patch0009 -p1
 %patch2011 -p1
 %patch0012 -p1
@@ -557,7 +551,6 @@ package or when debugging this package.
 %patch2026 -p1
 %patch2027 -p1
 %patch0028 -p1
-%patch0029 -p1
 %patch0030 -p1
 %patch0031 -p1
 %patch0033 -p1
@@ -572,7 +565,6 @@ package or when debugging this package.
 %patch0047 -p1
 %patch2033 -p1
 %patch2034 -p1
-%patch2035 -p1
 %patch0050 -p1
 %patch0052 -p1
 %patch0053 -p1
@@ -721,6 +713,9 @@ build()
 %endif
 %ifarch %{lock_elision_arches}
 		--enable-lock-elision \
+%endif
+%ifarch armv7hl ppc64 ppc64p7 ppc64le
+		--disable-werror \
 %endif
 		--disable-profile --enable-nss-crypt ||
 		{ cat config.log; false; }
@@ -1747,6 +1742,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Jan 07 2015 Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com> - 2.20.90-14
+- Sync with upstream master.
+- Disable -Werror on powerpc and armv7hl.
+- Temporarily disable valgrind test on ppc64.
+
 * Sun Dec 28 2014 Dan Horák <dan[at]danny.cz>
 - valgrind available only on selected arches (missing on s390)
 

sources

@@ -1 +1 @@
-a398fd3085733707361fac380088ee8e  glibc-2.20-276-g0e7e69b.tar.gz
+ca27ede0a7704d4417885f96470a9279  glibc-2.20-480-g46abb64.tar.gz