summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Calianu <adrian.calianu@enea.com>2015-11-19 15:47:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 13:27:35 +0000
commit31aa5145244c0a4b4f3247c9e75ba37ea1e07c65 (patch)
tree0242802aacff029389496fa3b266f18ae1fbfc5f
parent446295e866e648a4fdb38e0613980310d1ed50ad (diff)
downloadpoky-31aa5145244c0a4b4f3247c9e75ba37ea1e07c65.tar.gz
glibc: fix the big endian loader name on AArch64
Apply a patch backported from glibc 2.22 (master) to fix the loader name on AArch64. (From OE-Core rev: 513e52670ea52e8143f46777accf441bb5c299fa) Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc/AArch64-Fix-the-big-endian-loader-name.patch49
-rw-r--r--meta/recipes-core/glibc/glibc_2.21.bb1
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/AArch64-Fix-the-big-endian-loader-name.patch b/meta/recipes-core/glibc/glibc/AArch64-Fix-the-big-endian-loader-name.patch
new file mode 100644
index 0000000000..fd2bd8e846
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/AArch64-Fix-the-big-endian-loader-name.patch
@@ -0,0 +1,49 @@
1[AArch64] Fix the big endian loader name
2
3Signed-off-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
4
5The patch was imported from the glibc's official git server
6(https://sourceware.org/git/?p=glibc.git) as of commit id
744cb254f9a024db33ba549e59dc9d90355b797c9.
8
9Fixed conflicts raised on glibc 2.21.
10
11Upstream-Status: Backport [glibc 2.22]
12
13Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
14---
15 ChangeLog | 5 +++++
16 config.h.in | 3 +++
17 2 files changed, 8 insertions(+)
18
19diff --git a/ChangeLog b/ChangeLog
20index dc1ed1b..503ad41 100644
21--- a/ChangeLog
22+++ b/ChangeLog
23@@ -56278,4 +56278,9 @@
24 added check. Only act on the data if no current modification
25 happened.
26
27+2015-05-01 Szabolcs Nagy <szabolcs.nagy@arm.com>
28+
29+ * config.h.in (HAVE_AARCH64_BE): Add.
30+
31+
32 See ChangeLog.17 for earlier changes.
33diff --git a/config.h.in b/config.h.in
34index 695ca35..85c1761 100644
35--- a/config.h.in
36+++ b/config.h.in
37@@ -114,6 +114,9 @@
38 include/libc-symbols.h that avoid PLT slots in the shared objects. */
39 #undef NO_HIDDEN
40
41+/* AArch64 big endian ABI */
42+#undef HAVE_AARCH64_BE
43+
44
45 /* Defined to some form of __attribute__ ((...)) if the compiler supports
46 a different, more efficient calling convention. */
47--
481.9.1
49
diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb
index a0b2f2dee8..3bba7346f9 100644
--- a/meta/recipes-core/glibc/glibc_2.21.bb
+++ b/meta/recipes-core/glibc/glibc_2.21.bb
@@ -30,6 +30,7 @@ SRC_URI = "git://sourceware.org/git/glibc.git;branch=${BRANCH} \
30 file://Fix-__memcpy_chk-on-non-SSE2-CPUs.patch \ 30 file://Fix-__memcpy_chk-on-non-SSE2-CPUs.patch \
31 ${EGLIBCPATCHES} \ 31 ${EGLIBCPATCHES} \
32 ${CVEPATCHES} \ 32 ${CVEPATCHES} \
33 file://AArch64-Fix-the-big-endian-loader-name.patch \
33 " 34 "
34EGLIBCPATCHES = "\ 35EGLIBCPATCHES = "\
35 file://timezone-re-written-tzselect-as-posix-sh.patch \ 36 file://timezone-re-written-tzselect-as-posix-sh.patch \