Skip to contentSkip to conversation

core-image-sato-sdk-ptest: Remove valgrind ptests for riscv

PATCH In review Khem Raj 2 participants 4 messages Sep 28, 2019 – Oct 13, 2019 RISC-V

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 core-image-sato-sdk-ptest: Remove valgrind ptests for riscv

valgrind is not yet ported to riscv

---
 meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +2 -0
index ff297fe324..13c813a4d6 100644
@@ -10,6 +10,8 @@ PROVIDES += "core-image-sato-ptest"
 # Also include ptests which may not otherwise be included in a sato image
 IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}"
 
+PTESTS_SLOW_remove_riscv64 = "valgrind-ptest"
+
 # This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live
 # image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the
 # box) and explicitly add just 1100MB.
Signature · 1 line
2.23.0
author
#1 lore raw

PATCH 2/2 musl: Fix __riscv_mc* containers to match glibc

Fixes packages like gdb compile

---
 ...-for-riscv-floating-point-state-to-_.patch | 67 +++++++++++++++++++
 meta/recipes-core/musl/musl_git.bb            |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 meta/recipes-core/musl/musl/0001-Change-container-for-riscv-floating-point-state-to-_.patch
meta/recipes-core/musl/musl/0001-Change-container-for-riscv-floating-point-state-to-_.patch new file +67 -0
new file mode 100644
index 0000000000..a9abb18726
@@ -0,0 +1,67 @@
+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_git.bb +1 -0
index 335d53d42f..13fd17353d 100644
@@ -16,6 +16,7 @@ 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 \
           "
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.23.0
author
#2 lore raw
In reply to Khem Raj

ping

Quoted 24 lines · Khem Raj

valgrind is not yet ported to riscv

---
 meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +0 -0
index ff297fe324..13c813a4d6 100644
@@ -10,6 +10,8 @@ PROVIDES += "core-image-sato-ptest"
 # Also include ptests which may not otherwise be included in a sato

image
IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}"

meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +2 -0
+PTESTS_SLOW_remove_riscv64 = "valgrind-ptest"
+
 # This image is sufficiently large (~1.8GB) that we need to be

careful that it fits in a live

 # image (which has a 4GB limit), so nullify the overhead factor
(1.3x out of the
 # box) and explicitly add just 1100MB.