From a391f0c0e6e35db7403b7647a5b392104ef578a6 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Tue, 30 Sep 2014 22:10:03 +0530 Subject: [PATCH] Sync with upstream master --- ...-tst-strtod-round.c-Fix-build-on-ARM.patch | 57 ------------------- glibc.spec | 9 +-- sources | 2 +- 3 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 glibc-stdlib-tst-strtod-round.c-Fix-build-on-ARM.patch diff --git a/glibc-stdlib-tst-strtod-round.c-Fix-build-on-ARM.patch b/glibc-stdlib-tst-strtod-round.c-Fix-build-on-ARM.patch deleted file mode 100644 index e284fcd..0000000 --- a/glibc-stdlib-tst-strtod-round.c-Fix-build-on-ARM.patch +++ /dev/null @@ -1,57 +0,0 @@ -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: stdlib/tst-strtod-round.c: Fix build on ARM -From: Will Newton -X-Patchwork-Id: 2870 -Message-Id: <1410903170-31206-2-git-send-email-will.newton@linaro.org> -To: libc-alpha@sourceware.org -Date: Tue, 16 Sep 2014 14:32:50 -0700 - -Building this test on ARM fails because the prototypes for the long -double variants of the math functions are unavailable. - -Add an additional include guard to math.h that enables long double math -function declarations if _LIBC_TEST is defined and define _LIBC_TEST in -stdlib/tst-strtod-round.c. - -ChangeLog: - -2014-09-16 Will Newton - - * math/math.h: Define long double math functions if - _LIBC_TEST is defined. - * stdlib/tst-strtod-round.c: Define _LIBC_TEST. - ---- -math/math.h | 2 +- - stdlib/tst-strtod-round.c | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/math/math.h b/math/math.h -index 72ec2ca..dc7ab2d 100644 ---- a/math/math.h -+++ b/math/math.h -@@ -91,7 +91,7 @@ __BEGIN_DECLS - # undef _Mdouble_END_NAMESPACE - # undef __MATH_PRECNAME - --# if !(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \ -+# if !(defined __NO_LONG_DOUBLE_MATH && defined _LIBC && !defined _LIBC_TEST) \ - || defined __LDBL_COMPAT - # ifdef __LDBL_COMPAT - -diff --git a/stdlib/tst-strtod-round.c b/stdlib/tst-strtod-round.c -index f334b20..cbde457 100644 ---- a/stdlib/tst-strtod-round.c -+++ b/stdlib/tst-strtod-round.c -@@ -17,6 +17,9 @@ - License along with the GNU C Library; if not, see - . */ - -+/* Defining _LIBC_TEST ensures long double math functions are -+ declared in the headers. */ -+#define _LIBC_TEST 1 - #include - #include - #include diff --git a/glibc.spec b/glibc.spec index 3e96f53..7738689 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.20-44-g68870f1 +%define glibcsrcdir glibc-2.20-53-g754a15c %define glibcversion 2.20.90 -%define glibcrelease 5%{?dist} +%define glibcrelease 6%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -199,9 +199,6 @@ Patch0047: %{name}-nscd-sysconfig.patch # more testing. Patch0050: %{name}-rh1124987.patch -# Fix the tst-strtod-round.c test build failure. -Patch0051: %{name}-stdlib-tst-strtod-round.c-Fix-build-on-ARM.patch - # Disable rwlock elision if --enable-lock-elision is not used. Patch0052: %{name}-disable-rwlock-elision.patch @@ -576,7 +573,6 @@ package or when debugging this package. %patch2033 -p1 %patch2034 -p1 %patch0050 -p1 -%patch0051 -p1 %patch0052 -p1 ############################################################################## @@ -1734,6 +1730,7 @@ rm -f *.filelist* %changelog * Tue Sep 30 2014 Siddhesh Poyarekar - 2.20.90-6 +- Sync with upstream master. - Disable more Intel TSX usage in rwlocks (#1146967). - Enable lock elision again on s390 and s390x. diff --git a/sources b/sources index 9c88267..3924a93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79b442c0c6bdcbf8bb5d26829c9c50a5 glibc-2.20-44-g68870f1.tar.gz +3a7f6a8f21a9b8ad462e7bc5fcaa283b glibc-2.20-53-g754a15c.tar.gz