diff --git a/.gitignore b/.gitignore index 3b60f4f..e154cb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/stress-ng-0.17.01.tar.xz +SOURCES/stress-ng-0.17.08.tar.gz diff --git a/.stress-ng.metadata b/.stress-ng.metadata index bf94fd6..fe1f8fb 100644 --- a/.stress-ng.metadata +++ b/.stress-ng.metadata @@ -1 +1 @@ -3c24c3181e4b553f0e935903fbce9fad89272089 SOURCES/stress-ng-0.17.01.tar.xz +6b25c3530d961bd7a66b5c51b308c34691d9a4c8 SOURCES/stress-ng-0.17.08.tar.gz diff --git a/SOURCES/core-asm-arm.h-declare-stress_asm_arm_yield-when-HAV.patch b/SOURCES/core-asm-arm.h-declare-stress_asm_arm_yield-when-HAV.patch new file mode 100644 index 0000000..e15a4e1 --- /dev/null +++ b/SOURCES/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/SPECS/stress-ng.spec b/SPECS/stress-ng.spec index 30797e4..b9a1a99 100644 --- a/SPECS/stress-ng.spec +++ b/SPECS/stress-ng.spec @@ -1,11 +1,11 @@ Name: stress-ng -Version: 0.17.01 -Release: 1%{?dist} +Version: 0.17.08 +Release: 2%{?dist} Summary: Stress test a computer system in various ways License: GPLv2+ URL: https://github.com/ColinIanKing/%{name}/tarball -Source0: https://github.com/ColinIanKing/%{name}/tarball/%{name}-%{version}.tar.xz +Source0: https://github.com/ColinIanKing/%{name}/tarball/%{name}-%{version}.tar.gz # Work around for ld.gold error %undefine _package_note_flags @@ -25,6 +25,7 @@ BuildRequires: zlib-devel BuildRequires: Judy-devel # Patches +Patch1: core-asm-arm.h-declare-stress_asm_arm_yield-when-HAV.patch %description Stress test a computer system in various ways. It was designed to exercise @@ -33,6 +34,7 @@ system kernel interfaces. %prep %setup -q +%patch1 -p1 %build export CFLAGS="%{optflags}" @@ -56,6 +58,15 @@ install -pm 644 bash-completion/%{name} \ %{_datadir}/bash-completion/completions/%{name} %changelog +* Wed May 29 2024 John Kacur - 0.17.08-2 +- Fix missing corresponding macro to apply patch +Resolves: RHEL-33304 + +* Thu May 23 2024 John Kacur - 0.17.08-1 +- Rebase to upstream V0.17.08 +- ARM: Don't declare inlined yield helper if yield is not available +Resolves: RHEL-33304 + * Thu Nov 16 2023 John Kacur - 0.17.01-1 - Rebase to upstream V0.17.01 Resolves: RHEL-7859