Skip to contentSkip to conversation

musl: Upgrade to latest master

PATCH New Khem Raj 1 participant 3 messages Sep 10, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 musl: Upgrade to latest master

Accomodates rv32 port which is out of tree at the moment

details are [1]

[1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=73cc775bee53300c7cf759f37580220b18ac13d3..ffac0c229986725c0d0f3c806bafa7e3ca409f3b

---
 meta/recipes-core/musl/musl_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/musl/musl_git.bb +1 -1
index 51b19e89a5..e72b05a36c 100644
@@ -4,7 +4,7 @@
 require musl.inc
 inherit linuxloader
 
-SRCREV = "73cc775bee53300c7cf759f37580220b18ac13d3"
+SRCREV = "ffac0c229986725c0d0f3c806bafa7e3ca409f3b"
 
 BASEVER = "1.2.1"
 
Signature · 1 line
2.28.0
author
#1 lore raw

PATCH 2/3 libucontext: Recognise riscv32 architecture

---
 meta/recipes-core/musl/libucontext_git.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/musl/libucontext_git.bb +1 -0
index ec988f1920..734ad9c953 100644
@@ -43,6 +43,7 @@ def map_kernel_arch(a, d):
     elif re.match('p(pc|owerpc)', a):               return 'ppc'
     elif re.match('p(pc64|owerpc64)', a):           return 'ppc64'
     elif re.match('riscv64$', a):                   return 'riscv64'
+    elif re.match('riscv32$', a):                   return 'riscv32'
     else:
         if not d.getVar("TARGET_OS").startswith("linux"):
             return a
Signature · 1 line
2.28.0
author
#2 lore raw

PATCH 3/3 linuxloader.bbclass: Define riscv32 ldso for musl

In reply to Khem Raj
---
 meta/classes/linuxloader.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/linuxloader.bbclass +2 -0
index ec0e0556dd..176fd89fdb 100644
@@ -21,6 +21,8 @@ def get_musl_loader_arch(d):
         ldso_arch = "aarch64${ARMPKGSFX_ENDIAN_64}"
     elif targetarch.startswith("riscv64"):
         ldso_arch = "riscv64${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}"
+    elif targetarch.startswith("riscv32"):
+        ldso_arch = "riscv32${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}"
     return ldso_arch
 
 def get_musl_loader(d):
Signature · 1 line
2.28.0