summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2019-12-29 16:26:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-30 23:39:09 +0000
commit7a6f7688b4a91b96ae6c3bf9caa40ab50c4b1dad (patch)
tree05ea8b17af3460d4182bba459c46ed4a66baf053 /meta/classes
parenteac8f2f9ca26bf8cdb7f554803fd73c73b0b576e (diff)
downloadpoky-7a6f7688b4a91b96ae6c3bf9caa40ab50c4b1dad.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: 7ad531093d620f18c04d487d79e9dad9f5a96232) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/linuxloader.bbclass2
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"):