]> code.ossystems Code Review - openembedded-core.git/commitdiff
linuxloader: Correct loader for glibc on armhf
authorAlex Kiernan <alex.kiernan@gmail.com>
Sun, 29 Dec 2019 16:26:55 +0000 (16:26 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 30 Dec 2019 23:38:12 +0000 (23:38 +0000)
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>
meta/classes/linuxloader.bbclass

index c0fbf2683634dda004268f1d718720e9c35412a2..e2876cec7aad90c4e81e971770757209d3f32549 100644 (file)
@@ -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"):