From: Wang Mingyu Date: Sun, 5 Mar 2023 08:07:45 +0000 (+0800) Subject: stress-ng: upgrade 0.15.03 -> 0.15.04 X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1508 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c6192ef37907341679a06ce9f5e519902036649;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git stress-ng: upgrade 0.15.03 -> 0.15.04 0001-test-float-Make-variables-global.patch 0001-Include-sys-futex.h-for-clock_adjtime.patch removed since they're included in 0.15.04. 0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch refreshed for 0.15.04. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni --- diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-Include-sys-futex.h-for-clock_adjtime.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-Include-sys-futex.h-for-clock_adjtime.patch deleted file mode 100644 index 87d2ead46ab..00000000000 --- a/meta/recipes-extended/stress-ng/stress-ng/0001-Include-sys-futex.h-for-clock_adjtime.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 57f207ec7fb39c8b502f40dbdabd568f6b866a82 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Feb 2023 12:18:08 -0800 -Subject: [PATCH] Include sys/futex.h for clock_adjtime - -Fixes -core-shim.c:1942:9: error: call to undeclared function 'clock_adjtime'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - -Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/261] -Signed-off-by: Khem Raj ---- - core-shim.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/core-shim.c b/core-shim.c -index dc539c64..de38e908 100644 ---- a/core-shim.c -+++ b/core-shim.c -@@ -66,6 +66,10 @@ UNEXPECTED - #include - #endif - -+#if defined(HAVE_SYS_TIMEX_H) -+#include -+#endif -+ - #if defined(HAVE_SYS_RANDOM_H) - #include - #endif --- -2.39.1 - diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch index 821e4d910f8..6742e0d2563 100644 --- a/meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch +++ b/meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch @@ -1,4 +1,4 @@ -From 32386c13420f676bd938a8b1ceaeab8a5da46d17 Mon Sep 17 00:00:00 2001 +From 5d6fa06b3104637289178a471dd28d7bf3e14e76 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 3 Jan 2023 11:00:09 -0800 Subject: [PATCH] Pass LD_GOLD=1 via makefile to enable gold linker @@ -10,16 +10,16 @@ detecting and deciding. Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/251] Signed-off-by: Khem Raj + --- - Makefile | 7 +++++++ - Makefile.config | 9 +-------- - 2 files changed, 8 insertions(+), 8 deletions(-) + Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/Makefile b/Makefile -index f2fd4b6c..bff6b8ac 100644 +index 7a969aba..583ae04f 100644 --- a/Makefile +++ b/Makefile -@@ -69,6 +69,13 @@ endif +@@ -93,6 +93,13 @@ endif #CFLAGS += -Weverything #endif @@ -33,33 +33,3 @@ index f2fd4b6c..bff6b8ac 100644 GREP = grep # # SunOS requires special grep for -e support -diff --git a/Makefile.config b/Makefile.config -index 394ed20d..48c94fa1 100644 ---- a/Makefile.config -+++ b/Makefile.config -@@ -241,7 +241,7 @@ define check_ld - $(call check_ld_tmp,$1,$2,$3) - endef - --all: linkers libraries headers cpufeatures types functions -+all: libraries headers cpufeatures types functions - @for I in $$(ls $(CONFIGS)); do \ - if [ -s $(CONFIGS)/$$I ]; then \ - echo "#define $$I"; \ -@@ -262,13 +262,6 @@ configdir: - clean: - @rm -rf $(CONFIGS) config config.h - --linkers: \ -- configdir \ -- LD_GOLD -- --LD_GOLD: -- $(call check_ld,test-ld,HAVE_LD_GOLD,gold) -- - libraries: \ - configdir \ - LIB_AIO LIB_APPARMOR LIB_BSD LIB_CRYPT LIB_DL \ --- -2.39.0 - diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-test-float-Make-variables-global.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-test-float-Make-variables-global.patch deleted file mode 100644 index 2e598ca4f4c..00000000000 --- a/meta/recipes-extended/stress-ng/stress-ng/0001-test-float-Make-variables-global.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 958a86069c8d0149969b5c32212a28009c4a9ded Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 21 Jan 2023 23:18:18 -0800 -Subject: [PATCH] test-float: Make variables global - -Latest clang ( clang 16+ ) is able to optimize everything out when -O2 is used and as -a result build succeeds and test output comes out to be wrong. Therefore -make the variables global, so clang does not optimize away the functions - -Upstream-Status: Backport [https://github.com/ColinIanKing/stress-ng/commit/e299eb60a3a029e975304cc43045aea6ab1fad70] -Signed-off-by: Khem Raj ---- - test/test-float.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/test/test-float.c b/test/test-float.c -index d2800cd3..ad5503c3 100644 ---- a/test/test-float.c -+++ b/test/test-float.c -@@ -61,10 +61,9 @@ - /* Avoid implicit int in the definition of test even if FLOAT is not known. */ - typedef FLOAT float_type; - -+FLOAT a = 0.0, b = 0.0, c = 0.0, d = 0.0; - static float_type HOT OPTIMIZE3 test(void) - { -- FLOAT a = 0.0, b = 0.0, c = 0.0, d = 0.0; -- - float_ops(FLOAT, a, b, c, d, sin, cos); - float_ops(FLOAT, a, b, c, d, sinl, cosl); - --- -2.39.1 - diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.15.03.bb b/meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb similarity index 82% rename from meta/recipes-extended/stress-ng/stress-ng_0.15.03.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb index cd7f41a0165..e891bb738b0 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.15.03.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb @@ -6,10 +6,9 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ - file://0001-test-float-Make-variables-global.patch \ - file://0001-Include-sys-futex.h-for-clock_adjtime.patch \ - file://0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch" -SRCREV = "f3be0447c10fd5652b4c3753d56bcaac13fd8917" + file://0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch \ + " +SRCREV = "b9a437ec790ad4bcc71d31b2df39d4a601c55fa8" S = "${WORKDIR}/git" DEPENDS = "coreutils-native libbsd"