diff options
| author | Adrian Calianu <adrian.calianu@enea.com> | 2015-11-19 15:47:14 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-08 13:27:35 +0000 |
| commit | 31aa5145244c0a4b4f3247c9e75ba37ea1e07c65 (patch) | |
| tree | 0242802aacff029389496fa3b266f18ae1fbfc5f /meta/recipes-core | |
| parent | 446295e866e648a4fdb38e0613980310d1ed50ad (diff) | |
| download | ast2050-yocto-poky-31aa5145244c0a4b4f3247c9e75ba37ea1e07c65.zip ast2050-yocto-poky-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>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/glibc/glibc/AArch64-Fix-the-big-endian-loader-name.patch | 49 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/glibc_2.21.bb | 1 |
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 0000000..fd2bd8e --- /dev/null +++ b/meta/recipes-core/glibc/glibc/AArch64-Fix-the-big-endian-loader-name.patch @@ -0,0 +1,49 @@ +[AArch64] Fix the big endian loader name + +Signed-off-by: Szabolcs Nagy <szabolcs.nagy@arm.com> + +The patch was imported from the glibc's official git server +(https://sourceware.org/git/?p=glibc.git) as of commit id +44cb254f9a024db33ba549e59dc9d90355b797c9. + +Fixed conflicts raised on glibc 2.21. + +Upstream-Status: Backport [glibc 2.22] + +Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> +--- + ChangeLog | 5 +++++ + config.h.in | 3 +++ + 2 files changed, 8 insertions(+) + +diff --git a/ChangeLog b/ChangeLog +index dc1ed1b..503ad41 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -56278,4 +56278,9 @@ + added check. Only act on the data if no current modification + happened. + ++2015-05-01 Szabolcs Nagy <szabolcs.nagy@arm.com> ++ ++ * config.h.in (HAVE_AARCH64_BE): Add. ++ ++ + See ChangeLog.17 for earlier changes. +diff --git a/config.h.in b/config.h.in +index 695ca35..85c1761 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -114,6 +114,9 @@ + include/libc-symbols.h that avoid PLT slots in the shared objects. */ + #undef NO_HIDDEN + ++/* AArch64 big endian ABI */ ++#undef HAVE_AARCH64_BE ++ + + /* Defined to some form of __attribute__ ((...)) if the compiler supports + a different, more efficient calling convention. */ +-- +1.9.1 + diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb index a0b2f2d..3bba734 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} \ file://Fix-__memcpy_chk-on-non-SSE2-CPUs.patch \ ${EGLIBCPATCHES} \ ${CVEPATCHES} \ + file://AArch64-Fix-the-big-endian-loader-name.patch \ " EGLIBCPATCHES = "\ file://timezone-re-written-tzselect-as-posix-sh.patch \ |
