From 0fe48b81d80ed5f767b0b2cbc5f2dedb6a8acc66 Mon Sep 17 00:00:00 2001 From: John Kacur Date: Thu, 23 May 2024 16:02:20 -0400 Subject: [PATCH] Rebase to V0.17.08 Upstream ARM: Don't declare inlined yield helper if yield not available Resolves: RHEL-33305 Signed-off-by: John Kacur --- .gitignore | 2 ++ 0_16_04-poewrpc-remove-darn.patch | 21 ------------ ...eclare-stress_asm_arm_yield-when-HAV.patch | 33 +++++++++++++++++++ sources | 2 +- stress-ng.spec | 12 ++++--- 5 files changed, 44 insertions(+), 26 deletions(-) delete mode 100644 0_16_04-poewrpc-remove-darn.patch create mode 100644 core-asm-arm.h-declare-stress_asm_arm_yield-when-HAV.patch diff --git a/.gitignore b/.gitignore index 70fd850..fbaf0f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.swp /stress-ng-*.tar.xz /stress-ng-0.13.11.tar.gz /stress-ng-0.14.02.tar.gz @@ -12,3 +13,4 @@ /stress-ng-0.16.05.tar.gz /stress-ng-0.17.01.tar.gz /stress-ng-0.17.03.tar.gz +/stress-ng-0.17.08.tar.gz diff --git a/0_16_04-poewrpc-remove-darn.patch b/0_16_04-poewrpc-remove-darn.patch deleted file mode 100644 index b046db4..0000000 --- a/0_16_04-poewrpc-remove-darn.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.config.orig 2023-08-14 17:36:38.938485273 +0200 -+++ Makefile.config 2023-08-14 17:40:49.498233884 +0200 -@@ -926,7 +926,7 @@ - ASM_ALPHA_DRAINA ASM_ALPHA_HALT ASM_ARM_YIELD ASM_ARM_TLBI \ - ASM_HPPA_DIAG ASM_HPPA_RFI ASM_M68K_EORI_SR ASM_MB ASM_MIPS_WAIT \ - ASM_NOP ASM_S390_PTLB ASM_SH4_RTE ASM_SH4_SLEEP ASM_SPARC_MEMBAR \ -- ASM_SPARC_RDPR ASM_SPARC_TICK ASM_PPC64_DARN ASM_PPC64_DCBST \ -+ ASM_SPARC_RDPR ASM_SPARC_TICK ASM_PPC64_DCBST \ - ASM_PPC64_DCBT ASM_PPC64_DCBTST ASM_PPC64_ICBI ASM_PPC64_MSYNC \ - ASM_PPC64_TLBIE ASM_RISCV_FENCE ASM_RISCV_FENCE_I ASM_RISCV_SFENCE_VMA \ - ASM_X86_CLDEMOTE ASM_X86_CLFLUSH ASM_X86_CLFLUSHOPT ASM_X86_CLWB \ -@@ -991,9 +991,6 @@ - ASM_MIPS_WAIT: - $(call check,test-asm-mips-wait,HAVE_ASM_MIPS_WAIT,MIPS wait instruction) - --ASM_PPC64_DARN: -- $(call check,test-asm-ppc64-darn,HAVE_ASM_PPC64_DARN,ppc64 darn instruction) -- - ASM_PPC64_DCBST: - $(call check,test-asm-ppc64-dcbst,HAVE_ASM_PPC64_DCBST,ppc64 dcbst instruction) - diff --git a/core-asm-arm.h-declare-stress_asm_arm_yield-when-HAV.patch b/core-asm-arm.h-declare-stress_asm_arm_yield-when-HAV.patch new file mode 100644 index 0000000..e15a4e1 --- /dev/null +++ b/core-asm-arm.h-declare-stress_asm_arm_yield-when-HAV.patch @@ -0,0 +1,33 @@ +From cdfb0b0656b6fd371cf73333af54530e8de556e1 Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Fri, 3 May 2024 10:46:01 +0100 +Subject: [PATCH] core-asm-arm.h: declare stress_asm_arm_yield when + HAVE_ASM_ARM_YIELD is defined + +Don't declare inlined yield helper if yield is not available + +Signed-off-by: Colin Ian King +--- + core-asm-arm.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/core-asm-arm.h b/core-asm-arm.h +index c275dc8b9bda..152e771811b8 100644 +--- a/core-asm-arm.h ++++ b/core-asm-arm.h +@@ -24,10 +24,12 @@ + + #if defined(STRESS_ARCH_ARM) + ++#if defined(HAVE_ASM_ARM_YIELD) + static inline void ALWAYS_INLINE stress_asm_arm_yield(void) + { + __asm__ __volatile__("yield;\n"); + } ++#endif + + /* #if defined(STRESS_ARCH_ARM) */ + #endif +-- +2.45.0 + diff --git a/sources b/sources index fc8ce9a..bacae79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stress-ng-0.17.03.tar.gz) = 8d4bcab77682e448f524c8e2f5bed35a4a3e946ac4b3ff2df451178fc520db13c84bfb112ad09c96db4467b41c06d9a33ded99efe90f17009effccb2310653c0 +SHA512 (stress-ng-0.17.08.tar.gz) = 3df9bb507687839ad9978099bea33bc6923d324c6e6f66d441911670fcd8080e093fd02741ea8516626ae1ba357f42d2c50b6553cb75f48fd5f008e59d469777 diff --git a/stress-ng.spec b/stress-ng.spec index a0bd881..8e48e87 100644 --- a/stress-ng.spec +++ b/stress-ng.spec @@ -1,13 +1,12 @@ Name: stress-ng -Version: 0.17.03 -Release: 3%{?dist} +Version: 0.17.08 +Release: 1%{?dist} Summary: Stress test a computer system in various ways License: GPL-2.0-or-later URL: https://github.com/ColinIanKing/stress-ng Source0: https://github.com/ColinIanKing/stress-ng/archive/V%{version}/%{name}-%{version}.tar.gz -# darn is not supported in Power ISA < 3.0, while Fedora aims for Power ISA 2.07 -Patch0: 0_16_04-poewrpc-remove-darn.patch +Patch1: core-asm-arm.h-declare-stress_asm_arm_yield-when-HAV.patch BuildRequires: make BuildRequires: gcc @@ -54,6 +53,11 @@ install -pm 644 bash-completion/%{name} \ %{_datadir}/bash-completion/completions/%{name} %changelog +* Thu May 23 2024 John Kacur - 0.17.08-3 +- Rebase to V0.17.08 Upstream +- ARM: Don't declare inlined yield helper if yield not available +Resolves: RHEL-33305 + * Tue Mar 26 2024 John Kacur - 0.17.03-3 - Added gating.yaml - Added rpminspect.yam