Sync with upstream master
This commit is contained in:
parent
49b191c05b
commit
a391f0c0e6
|
@ -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 <will.newton@linaro.org>
|
||||
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 <will.newton@linaro.org>
|
||||
|
||||
* 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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
+/* Defining _LIBC_TEST ensures long double math functions are
|
||||
+ declared in the headers. */
|
||||
+#define _LIBC_TEST 1
|
||||
#include <fenv.h>
|
||||
#include <float.h>
|
||||
#include <math.h>
|
|
@ -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 <siddhesh@redhat.com> - 2.20.90-6
|
||||
- Sync with upstream master.
|
||||
- Disable more Intel TSX usage in rwlocks (#1146967).
|
||||
- Enable lock elision again on s390 and s390x.
|
||||
|
||||
|
|
Loading…
Reference in New Issue