]> code.ossystems Code Review - openembedded-core.git/commitdiff
linuxloader.bbclass: add musl libc support
authorMing Liu <peter.x.liu@external.atlascopco.com>
Thu, 6 Jul 2017 11:50:31 +0000 (13:50 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 8 Jul 2017 12:34:00 +0000 (13:34 +0100)
Current linuxloader.bbclass does not support musl libc ldso, so add it
in.

After changing, now the linuxloader function will call a subfunction
according to which virtual/libc is being used, glibc or musl, the
linuxloader_musl function is made on top of the LDSO macro defined
in musl source, by mapping related OE variables to it.

Change tested on following machines:
"genericx86"
"genericx86-64"
"beaglebone"
"qemumips64"
"qemuarm64"
"mpc8315e-rdb"
"edgerouter"
"qemumips"
"kc705-microblazeel" - meta-xilinx
"qemuppc"

Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/linuxloader.bbclass

index 117b03074611685e9e97f079d1992de0fcfc5cf8..8f30eb32e76d38e222d5366afdd38a4d38d46835 100644 (file)
@@ -1,5 +1,8 @@
+LDSO_TCLIBC = "glibc"
+LDSO_TCLIBC_libc-musl = "musl"
+LDSO_TCLIBC_libc-baremetal = "musl"
 
-linuxloader () {
+linuxloader_glibc () {
        case ${TARGET_ARCH} in
                powerpc | microblaze )
                        dynamic_loader="${base_libdir}/ld.so.1"
@@ -28,3 +31,40 @@ linuxloader () {
        esac
        echo $dynamic_loader
 }
+
+linuxloader_musl () {
+       case ${TARGET_ARCH} in
+               microblaze* )
+                       dynamic_loader="${base_libdir}/ld-musl-microblaze${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '', 'el' ,d)}.so.1"
+                       ;;
+               mips* )
+                       dynamic_loader="${base_libdir}/ld-musl-mips${ABIEXTENSION}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}.so.1"
+                       ;;
+               powerpc )
+                       dynamic_loader="${base_libdir}/ld-musl-powerpc${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}.so.1"
+                       ;;
+               powerpc64 )
+                       dynamic_loader="${base_libdir}/ld-musl-powerpc64.so.1"
+                       ;;
+               x86_64 )
+                       dynamic_loader="${base_libdir}/ld-musl-x86_64.so.1"
+                       ;;
+               i*86 )
+                       dynamic_loader="${base_libdir}/ld-musl-i386.so.1"
+                       ;;
+               arm* )
+                       dynamic_loader="${base_libdir}/ld-musl-arm${ARMPKGSFX_ENDIAN}${ARMPKGSFX_EABI}.so.1"
+                       ;;
+               aarch64* )
+                       dynamic_loader="${base_libdir}/ld-musl-aarch64${ARMPKGSFX_ENDIAN_64}.so.1"
+                       ;;
+               * )
+                       dynamic_loader="/unknown_dynamic_linker"
+                       ;;
+       esac
+       echo $dynamic_loader
+}
+
+linuxloader () {
+       linuxloader_${LDSO_TCLIBC}
+}