summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-09-09 08:04:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-10 11:33:26 +0100
commit0d3c79524c95a7ab3b87c9dcb49746746900a18a (patch)
tree4992f95aa881cc30948f37a4f56070fd65d979db /meta/recipes-core/glibc
parenta4256395800b49fd6ca5bf52b282a89218afeb0c (diff)
downloadpoky-0d3c79524c95a7ab3b87c9dcb49746746900a18a.tar.gz
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>
Diffstat (limited to 'meta/recipes-core/glibc')
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.20.bb4
-rw-r--r--meta/recipes-core/glibc/glibc/0001-Define-__GI_fegetenv-for-e500-libm.patch45
-rw-r--r--meta/recipes-core/glibc/glibc_2.20.bb5
3 files changed, 4 insertions, 50 deletions
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.20.bb b/meta/recipes-core/glibc/cross-localedef-native_2.20.bb
index fd8c242895..ccf56a9415 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.20.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.20.bb
@@ -16,7 +16,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
16 16
17PV = "2.20" 17PV = "2.20"
18 18
19SRC_URI = "git://sourceware.org/git/glibc.git;branch=master;name=glibc \ 19SRC_URI = "git://sourceware.org/git/glibc.git;branch=release/${PV}/master;name=glibc \
20 git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ 20 git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
21 file://fix_for_centos_5.8.patch \ 21 file://fix_for_centos_5.8.patch \
22 ${EGLIBCPATCHES} \ 22 ${EGLIBCPATCHES} \
@@ -33,7 +33,7 @@ EGLIBCPATCHES = "\
33 file://eglibc-use-option-groups.patch \ 33 file://eglibc-use-option-groups.patch \
34 " 34 "
35 35
36SRCREV_glibc = "529bf51595fffbe80023e7d895b671391991bb1b" 36SRCREV_glibc = "b8079dd0d360648e4e8de48656c5c38972621072"
37SRCREV_localedef = "c833367348d39dad7ba018990bfdaffaec8e9ed3" 37SRCREV_localedef = "c833367348d39dad7ba018990bfdaffaec8e9ed3"
38 38
39S = "${WORKDIR}/git" 39S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/glibc/glibc/0001-Define-__GI_fegetenv-for-e500-libm.patch b/meta/recipes-core/glibc/glibc/0001-Define-__GI_fegetenv-for-e500-libm.patch
deleted file mode 100644
index c0e155c5b0..0000000000
--- a/meta/recipes-core/glibc/glibc/0001-Define-__GI_fegetenv-for-e500-libm.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 07299d036672c86b278256e55ae0cbdae8f751fd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Aug 2014 16:46:14 -0700
4Subject: [PATCH] Define __GI_fegetenv for e500 libm
5
6generic HAVE_RM_CTX implementation which is used for ppc/e500 as well
7has introduced calls to fegetenv which should be resolved internally
8with in libm
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12Upstream-Status: Submitted
13
14---
15 ChangeLog | 5 +++++
16 sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c | 1 +
17 2 files changed, 6 insertions(+)
18
19diff --git a/ChangeLog b/ChangeLog
20index 6261ed4..629ea8e 100644
21--- a/ChangeLog
22+++ b/ChangeLog
23@@ -1,3 +1,8 @@
24+2014-08-29 Khem Raj <raj.khem@gmail.com>
25+
26+ * sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c (fegetenv): Add
27+ libm_hidden_ver.
28+
29 2014-08-27 Allan McRae <allan@archlinux.org>
30
31 * sysdeps/i386/fpu/libm-test-ulps: Update ULPs.
32diff --git a/sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c b/sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c
33index 2ae06b8..5faabe8 100644
34--- a/sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c
35+++ b/sysdeps/powerpc/powerpc32/e500/nofpu/fegetenv.c
36@@ -43,5 +43,6 @@ __fegetenv (fenv_t *envp)
37 strong_alias (__fegetenv, __old_fegetenv)
38 compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1);
39 #endif
40+libm_hidden_ver (__fegetenv, fegetenv)
41
42 versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2);
43--
442.1.0
45
diff --git a/meta/recipes-core/glibc/glibc_2.20.bb b/meta/recipes-core/glibc/glibc_2.20.bb
index c6ef34afb3..30a4397cd6 100644
--- a/meta/recipes-core/glibc/glibc_2.20.bb
+++ b/meta/recipes-core/glibc/glibc_2.20.bb
@@ -4,9 +4,9 @@ DEPENDS += "gperf-native kconfig-frontends-native"
4 4
5PV = "2.20" 5PV = "2.20"
6 6
7SRCREV = "529bf51595fffbe80023e7d895b671391991bb1b" 7SRCREV = "b8079dd0d360648e4e8de48656c5c38972621072"
8 8
9SRC_URI = "git://sourceware.org/git/glibc.git;branch=master \ 9SRC_URI = "git://sourceware.org/git/glibc.git;branch=release/${PV}/master \
10 file://IO-acquire-lock-fix.patch \ 10 file://IO-acquire-lock-fix.patch \
11 file://mips-rld-map-check.patch \ 11 file://mips-rld-map-check.patch \
12 file://etc/ld.so.conf \ 12 file://etc/ld.so.conf \
@@ -23,7 +23,6 @@ SRC_URI = "git://sourceware.org/git/glibc.git;branch=master \
23 file://ppce6500-32b_slow_ieee754_sqrt.patch \ 23 file://ppce6500-32b_slow_ieee754_sqrt.patch \
24 file://grok_gold.patch \ 24 file://grok_gold.patch \
25 file://fix_am_rootsbindir.patch \ 25 file://fix_am_rootsbindir.patch \
26 file://0001-Define-__GI_fegetenv-for-e500-libm.patch \
27 ${EGLIBCPATCHES} \ 26 ${EGLIBCPATCHES} \
28 " 27 "
29EGLIBCPATCHES = "\ 28EGLIBCPATCHES = "\