glibc: Incremental bump to 2.20 release branch

Now that glibc 2.20 has been released. We switch
to use release branch and remove the already applied
patch

(From OE-Core rev: 70bfccd8e13af712381b4feea3ef882369951264)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2014-09-09 08:04:29 -07:00 committed by Richard Purdie
parent a425639580
commit 0d3c79524c
3 changed files with 4 additions and 50 deletions

View File

@ -16,7 +16,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
PV = "2.20"
SRC_URI = "git://sourceware.org/git/glibc.git;branch=master;name=glibc \
SRC_URI = "git://sourceware.org/git/glibc.git;branch=release/${PV}/master;name=glibc \
git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
file://fix_for_centos_5.8.patch \
${EGLIBCPATCHES} \
@ -33,7 +33,7 @@ EGLIBCPATCHES = "\
file://eglibc-use-option-groups.patch \
"
SRCREV_glibc = "529bf51595fffbe80023e7d895b671391991bb1b"
SRCREV_glibc = "b8079dd0d360648e4e8de48656c5c38972621072"
SRCREV_localedef = "c833367348d39dad7ba018990bfdaffaec8e9ed3"
S = "${WORKDIR}/git"

View File

@ -1,45 +0,0 @@
From 07299d036672c86b278256e55ae0cbdae8f751fd Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Aug 2014 16:46:14 -0700
Subject: [PATCH] Define __GI_fegetenv for e500 libm
generic HAVE_RM_CTX implementation which is used for ppc/e500 as well
has introduced calls to fegetenv which should be resolved internally
with in libm
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Submitted
---
ChangeLog | 5 +++++
sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c | 1 +
2 files changed, 6 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 6261ed4..629ea8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-29 Khem Raj <raj.khem@gmail.com>
+
+ * sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c (fegetenv): Add
+ libm_hidden_ver.
+
2014-08-27 Allan McRae <allan@archlinux.org>
* sysdeps/i386/fpu/libm-test-ulps: Update ULPs.
diff --git a/sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c b/sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c
index 2ae06b8..5faabe8 100644
--- a/sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c
+++ b/sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c
@@ -43,5 +43,6 @@ __fegetenv (fenv_t *envp)
strong_alias (__fegetenv, __old_fegetenv)
compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1);
#endif
+libm_hidden_ver (__fegetenv, fegetenv)
versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2);
--
2.1.0

View File

@ -4,9 +4,9 @@ DEPENDS += "gperf-native kconfig-frontends-native"
PV = "2.20"
SRCREV = "529bf51595fffbe80023e7d895b671391991bb1b"
SRCREV = "b8079dd0d360648e4e8de48656c5c38972621072"
SRC_URI = "git://sourceware.org/git/glibc.git;branch=master \
SRC_URI = "git://sourceware.org/git/glibc.git;branch=release/${PV}/master \
file://IO-acquire-lock-fix.patch \
file://mips-rld-map-check.patch \
file://etc/ld.so.conf \
@ -23,7 +23,6 @@ SRC_URI = "git://sourceware.org/git/glibc.git;branch=master \
file://ppce6500-32b_slow_ieee754_sqrt.patch \
file://grok_gold.patch \
file://fix_am_rootsbindir.patch \
file://0001-Define-__GI_fegetenv-for-e500-libm.patch \
${EGLIBCPATCHES} \
"
EGLIBCPATCHES = "\