Skip to contentSkip to conversation

multilib: Add musl multilib support

PATCH Superseded Khem Raj 1 participant 1 message Aug 21, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 multilib: Add musl multilib support

Since musl ldso can now co-exist in multilib therefore add support to build multilibbed headers and adjust the wrapper header to support musl, it needs __WORDSIZE which is defined in bits/reg.h for musl

[YOCTO #13122]

---
 meta/classes/multilib_header.bbclass | 7 -------
 scripts/multilib_header_wrapper.h    | 4 ++++
 2 files changed, 4 insertions(+), 7 deletions(-)
meta/classes/multilib_header.bbclass +0 -7
index e03f5b13b2..48f231eed0 100644
@@ -6,13 +6,6 @@ inherit siteinfo
 # all of the ABI variants for that given architecture.
 #
 oe_multilib_header() {
-
-	case ${HOST_OS} in
-	*-musl*)
-		return
-		;;
-	*)
-	esac
         # For MIPS: "n32" is a special case, which needs to be
         # distinct from both 64-bit and 32-bit.
         case ${TARGET_ARCH} in
scripts/multilib_header_wrapper.h +4 -0
index 88f3193812..a4d6612edb 100644
@@ -5,7 +5,11 @@
  * 
  */
 
+#ifdef __GLIBC__
 #include <bits/wordsize.h>
+#else
+#include <bits/reg.h>
+#endif
 
 #if __WORDSIZE == 32
 
Signature · 1 line
2.28.0