diff options
| author |   Alex Kiernan <alex.kiernan@gmail.com> | 2019-12-29 16:26:55 +0000 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2020-01-18 12:49:41 -0800 |
| commit | 70efe880589df1dfe7d71451d62d9d8e4afd7981 (patch) | |
| tree | da77384bb08e1cc0fe4dfd8defb0b4c2ea7a3f0a | |
| parent | 5ed714139f91eb03871e01b68a4370784071234d (diff) | |
| download | openembedded-core-contrib-70efe880589df1dfe7d71451d62d9d8e4afd7981.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"
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>
| -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): elif re.search("i.86", targetarch): dynamic_loader = "${base_libdir}/ld-linux.so.2" elif targetarch == "arm": - dynamic_loader = "${base_libdir}/ld-linux.so.3" + dynamic_loader = "${base_libdir}/ld-linux${@['-armhf', ''][d.getVar('TARGET_FPU') == 'soft']}.so.3" elif targetarch.startswith("aarch64"): dynamic_loader = "${base_libdir}/ld-linux-aarch64${ARMPKGSFX_ENDIAN_64}.so.1" elif targetarch.startswith("riscv64"): |