diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2019-12-29 16:26:55 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-28 11:51:03 +0000 |
| commit | 8fdf082c11131524d803e61f9272aec319811a3d (patch) | |
| tree | 4386f386dc783b0a8780c7116a5d73c46607bb16 | |
| parent | 375065fa17b04ff73529911ece02069eaf7a8e71 (diff) | |
| download | poky-8fdf082c11131524d803e61f9272aec319811a3d.tar.gz | |
linuxloader: Correct loader for glibc on armhf
Fix the naming of the loader on armhf to match what glibc expects:
#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT SYSTEMLIBS_DIR "ld-linux.so.3"
#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT SYSTEMLIBS_DIR "ld-linux-armhf.so.3"
(From OE-Core rev: 70efe880589df1dfe7d71451d62d9d8e4afd7981)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 7ad531093d620f18c04d487d79e9dad9f5a96232)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/linuxloader.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/linuxloader.bbclass b/meta/classes/linuxloader.bbclass index c0fbf26836..e2876cec7a 100644 --- a/meta/classes/linuxloader.bbclass +++ b/meta/classes/linuxloader.bbclass | |||
| @@ -41,7 +41,7 @@ def get_glibc_loader(d): | |||
| 41 | elif re.search("i.86", targetarch): | 41 | elif re.search("i.86", targetarch): |
| 42 | dynamic_loader = "${base_libdir}/ld-linux.so.2" | 42 | dynamic_loader = "${base_libdir}/ld-linux.so.2" |
| 43 | elif targetarch == "arm": | 43 | elif targetarch == "arm": |
| 44 | dynamic_loader = "${base_libdir}/ld-linux.so.3" | 44 | dynamic_loader = "${base_libdir}/ld-linux${@['-armhf', ''][d.getVar('TARGET_FPU') == 'soft']}.so.3" |
| 45 | elif targetarch.startswith("aarch64"): | 45 | elif targetarch.startswith("aarch64"): |
| 46 | dynamic_loader = "${base_libdir}/ld-linux-aarch64${ARMPKGSFX_ENDIAN_64}.so.1" | 46 | dynamic_loader = "${base_libdir}/ld-linux-aarch64${ARMPKGSFX_ENDIAN_64}.so.1" |
| 47 | elif targetarch.startswith("riscv64"): | 47 | elif targetarch.startswith("riscv64"): |