[glibc] Sync with upstream roland/nptl branch

Siddhesh Poyarekar siddhesh at fedoraproject.org
Fri Jul 4 18:30:58 UTC 2014


commit 1779efa74a92f334e834a451144ecb22b43c6c3d
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Sat Jul 5 00:00:22 2014 +0530

    Sync with upstream roland/nptl branch

 glibc-fedora-ppc-unwind.patch |    6 +++---
 glibc-rtkaio-testcase.patch   |   15 ---------------
 glibc.spec                    |   10 ++++++----
 sources                       |    2 +-
 4 files changed, 10 insertions(+), 23 deletions(-)
---
diff --git a/glibc-fedora-ppc-unwind.patch b/glibc-fedora-ppc-unwind.patch
index 7e9b7ab..0a808ec 100644
--- a/glibc-fedora-ppc-unwind.patch
+++ b/glibc-fedora-ppc-unwind.patch
@@ -15,6 +15,6 @@ diff -Nrup a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Make
  
 +CFLAGS-libc-start.c += -fno-asynchronous-unwind-tables
 +
- ifeq ($(subdir),csu)
- sysdep_routines += hp-timing
- elide-routines.os += hp-timing
+ ifeq ($(subdir),elf)
+ # help gcc inline asm code from dl-machine.h
+ +cflags += -finline-limit=2000
diff --git a/glibc.spec b/glibc.spec
index 65f70ba..f3a36ca 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.19-739-gd6505ce
+%define glibcsrcdir  glibc-2.19-778-gc0c5824
 %define glibcversion 2.19.90
-%define glibcrelease 25%{?dist}
+%define glibcrelease 26%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -221,7 +221,6 @@ Patch2031: %{name}-rh1070416.patch
 
 Patch2033: %{name}-aarch64-tls-fixes.patch
 Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
-Patch2035: %{name}-rtkaio-testcase.patch
 
 ##############################################################################
 # End of glibc patches.
@@ -553,7 +552,6 @@ package or when debugging this package.
 %patch0047 -p1
 %patch2033 -p1
 %patch2034 -p1
-%patch2035 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...
@@ -1658,6 +1656,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Jul 04 2014 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.19.90-26
+- Sync with upstream roland/nptl branch.
+- Improve testsuite failure outputs in build.log
+
 * Thu Jul 03 2014 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.19.90-25
 - Sync with upstream roland/nptl branch.
 
diff --git a/sources b/sources
index 41bbe35..4f95dd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f1b4969786209cf1415ce8e953215e3  glibc-2.19-739-gd6505ce.tar.gz
+4126b610aea01c29182021cbe626b9ac  glibc-2.19-778-gc0c5824.tar.gz


More information about the scm-commits mailing list