Skip to contentSkip to conversation

musl: Update to latest

PATCH New Khem Raj 1 participant 2 messages Oct 3, 2019 RISC-V

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 musl: Update to latest

Drop upstream'ed patch
Fix libgcc build with musl

Detailed ChangeLog [1]

[1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=1f0e9f9cc2e3fa354f94e18b3b362de5f1ec7272..2c2477da9a553c0b9b2fa18073a5dcdbe6d395af

---
 ...-for-riscv-floating-point-state-to-_.patch | 67 -------------------
 ...and-specifiers-in-the-riscv64-CAS-ro.patch | 55 ---------------
 .../0001-riscv-Define-sigcontext-again.patch  | 48 +++++++++++++
 meta/recipes-core/musl/musl_git.bb            |  5 +-
 4 files changed, 50 insertions(+), 125 deletions(-)
 delete mode 100644 meta/recipes-core/musl/musl/0001-Change-container-for-riscv-floating-point-state-to-_.patch
 delete mode 100644 meta/recipes-core/musl/musl/0001-correct-the-operand-specifiers-in-the-riscv64-CAS-ro.patch
 create mode 100644 meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch
meta/recipes-core/musl/musl/0001-Change-container-for-riscv-floating-point-state-to-_.patch deleted +0 -67
deleted file mode 100644
index a9abb18726..0000000000
@@ -1,67 +0,0 @@
-From 52a37610650e7366a398dd07393d3902d2f3faa3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 28 Sep 2019 12:19:57 -0700
-Subject: [PATCH] Change container for riscv floating-point state to __riscv_mc_fp_state
-
-Match the struct elements with glibc
-glibc also uses __riscv_mc prefix, some packages like gdb uses that
-
-Upstream-Status: Submitted [https://www.openwall.com/lists/musl/2019/09/28/1]
-Signed-off-by: Khem Raj <[email protected]>
----
- arch/riscv64/bits/signal.h | 18 +++++++++---------
- arch/riscv64/bits/user.h   |  2 +-
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h
-index 76d7ad80..aba7ab00 100644
---- a/arch/riscv64/bits/signal.h
-+++ b/arch/riscv64/bits/signal.h
-@@ -13,25 +13,25 @@ typedef unsigned long greg_t;
- typedef unsigned long gregset_t[32];
- 
- struct __riscv_mc_f_ext_state {
--	unsigned int f[32];
--	unsigned int fcsr;
-+	unsigned int __f[32];
-+	unsigned int __fcsr;
- };
- 
- struct __riscv_mc_d_ext_state {
--	unsigned long long f[32];
--	unsigned int fcsr;
-+	unsigned long long __f[32];
-+	unsigned int __fcsr;
- };
- 
- struct __riscv_mc_q_ext_state {
--	unsigned long long f[64] __attribute__((aligned(16)));
--	unsigned int fcsr;
-+	unsigned long long __f[64] __attribute__((aligned(16)));
-+	unsigned int __fcsr;
- 	unsigned int reserved[3];
- };
- 
- union __riscv_mc_fp_state {
--	struct __riscv_mc_f_ext_state f;
--	struct __riscv_mc_d_ext_state d;
--	struct __riscv_mc_q_ext_state q;
-+	struct __riscv_mc_f_ext_state __f;
-+	struct __riscv_mc_d_ext_state __d;
-+	struct __riscv_mc_q_ext_state __q;
- };
- 
- typedef union __riscv_mc_fp_state fpregset_t;
-diff --git a/arch/riscv64/bits/user.h b/arch/riscv64/bits/user.h
-index d2e383b2..9918a2fe 100644
---- a/arch/riscv64/bits/user.h
-+++ b/arch/riscv64/bits/user.h
-@@ -5,4 +5,4 @@ struct user_fpregs_struct {
- 
- #define ELF_NGREG 32
- typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
--typedef struct user_fpregs_struct elf_fpregset_t;
-+typedef union __riscv_mc_fp_state elf_fpregset_t;
--- 
-2.23.0
-
meta/recipes-core/musl/musl/0001-correct-the-operand-specifiers-in-the-riscv64-CAS-ro.patch deleted +0 -55

55 lines not on this page · raw message

meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch new file +48 -0

48 lines not on this page · raw message

meta/recipes-core/musl/musl_git.bb +2 -3
index 13fd17353d..aacff79f7c 100644
@@ -4,7 +4,7 @@
 require musl.inc
 inherit linuxloader
 
-SRCREV = "1f0e9f9cc2e3fa354f94e18b3b362de5f1ec7272"
+SRCREV = "2c2477da9a553c0b9b2fa18073a5dcdbe6d395af"
 
 BASEVER = "1.1.23"
 
@@ -15,8 +15,7 @@ PV = "${BASEVER}+git${SRCPV}"
 SRC_URI = "git://git.musl-libc.org/musl \
            file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
            file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
-           file://0001-correct-the-operand-specifiers-in-the-riscv64-CAS-ro.patch \
-           file://0001-Change-container-for-riscv-floating-point-state-to-_.patch \
+           file://0001-riscv-Define-sigcontext-again.patch \
           "
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.23.0
author
#1 lore raw

PATCH 2/2 qemu: Add ppc64 to QEMU_TARGETS

helps with qemuppc target

---
 meta/recipes-devtools/qemu/qemu.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/qemu/qemu.inc +1 -1
index de21d30732..551b49ac0a 100644
@@ -53,7 +53,7 @@ do_install_ptest() {
 }
 
 # QEMU_TARGETS is overridable variable
-QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc riscv32 riscv64 sh4 x86_64"
+QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc ppc64 riscv32 riscv64 sh4 x86_64"
 
 EXTRA_OECONF = " \
     --prefix=${prefix} \
Signature · 1 line
2.23.0