From eb6dc0ceb5e1cd1d1f2fed8bbd6d3143c434b7ab Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 22 Apr 2025 20:52:59 +0200 Subject: mce-test: fix build with gcc-15 fix wait_handler declaration to match definition in: tools/ltp-pan/ltp-pan.c:wait_handler( int sig ) * fixes build with gcc-15: http://errors.yoctoproject.org/Errors/Details/852857/ ltp-pan.c: In function 'main': ltp-pan.c:459:19: error: assignment to '__sighandler_t' {aka 'void (*)(int)'} from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types] 459 | sa.sa_handler = wait_handler; | ^ In file included from ltp-pan.c:67: zoolib.h:52:6: note: 'wait_handler' declared here 52 | void wait_handler(); | ^~~~~~~~~~~~ In file included from TOPDIR/tmp/work/core2-64-oe-linux/mce-test/20230601+git/recipe-sysroot/usr/include/sys/param.h:28, from ltp-pan.c:56: TOPDIR/tmp/work/core2-64-oe-linux/mce-test/20230601+git/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here 72 | typedef void (*__sighandler_t) (int); | ^~~~~~~~~~~~~~ ltp-pan.c:489:17: error: too many arguments to function 'wait_handler'; expected 0, have 1 489 | wait_handler(SIGINT); | ^~~~~~~~~~~~ ~~~~~~ Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- ..._merge.py-scov_merge.py-switch-to-python3.patch | 2 +- ...0001-ltp-pan-fix-wait_handler-declaration.patch | 47 ++++++++++++++++++++++ meta-oe/recipes-support/mcelog/mce-test_git.bb | 7 ++-- 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch diff --git a/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch b/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch index 969bfc17cf..80b9ae23b3 100644 --- a/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch +++ b/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch @@ -5,7 +5,7 @@ Subject: [PATCH] gcov_merge.py/scov_merge.py: switch to python3 Make gcov_merge.py and scov_merge.py port to python3. -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/andikleen/mce-test/pull/8] Signed-off-by: Mingli Yu --- diff --git a/meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch b/meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch new file mode 100644 index 0000000000..3b2e9502ae --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch @@ -0,0 +1,47 @@ +From 3f1f2d143a1e365bb0451609d08194756951099a Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Tue, 22 Apr 2025 18:03:24 +0000 +Subject: [PATCH] ltp-pan: fix wait_handler declaration + +to match definition in: +tools/ltp-pan/ltp-pan.c:wait_handler( int sig ) + +* fixes build with gcc-15: + http://errors.yoctoproject.org/Errors/Details/852857/ + +ltp-pan.c: In function 'main': +ltp-pan.c:459:19: error: assignment to '__sighandler_t' {aka 'void (*)(int)'} from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types] + 459 | sa.sa_handler = wait_handler; + | ^ +In file included from ltp-pan.c:67: +zoolib.h:52:6: note: 'wait_handler' declared here + 52 | void wait_handler(); + | ^~~~~~~~~~~~ +In file included from TOPDIR/tmp/work/core2-64-oe-linux/mce-test/20230601+git/recipe-sysroot/usr/include/sys/param.h:28, + from ltp-pan.c:56: +TOPDIR/tmp/work/core2-64-oe-linux/mce-test/20230601+git/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here + 72 | typedef void (*__sighandler_t) (int); + | ^~~~~~~~~~~~~~ +ltp-pan.c:489:17: error: too many arguments to function 'wait_handler'; expected 0, have 1 + 489 | wait_handler(SIGINT); + | ^~~~~~~~~~~~ ~~~~~~ + +Upstream-Status: Submitted [https://github.com/andikleen/mce-test/pull/9] +Signed-off-by: Martin Jansa +--- + tools/ltp-pan/zoolib.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/ltp-pan/zoolib.h b/tools/ltp-pan/zoolib.h +index 8b4049e..34ce76f 100644 +--- a/tools/ltp-pan/zoolib.h ++++ b/tools/ltp-pan/zoolib.h +@@ -49,7 +49,7 @@ extern char zoo_error[ZELEN]; + int lock_file( FILE *fp, short ltype, char **errmsg ); + /* FILE *open_file( char *file, char *mode, char **errmsg ); */ + +-void wait_handler(); ++void wait_handler(int sig); + + /* char *zoo_active( void ); */ + /* zoo_getname(): create a filename to use for the zoo diff --git a/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-oe/recipes-support/mcelog/mce-test_git.bb index c43651f6eb..c1661b5ed4 100644 --- a/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -11,9 +11,10 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git;branch=master \ - file://makefile-remove-ldflags.patch \ - file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ - " + file://makefile-remove-ldflags.patch \ + file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ + file://0001-ltp-pan-fix-wait_handler-declaration.patch \ +" SRCREV = "9d11fc3e05eae7b454efeb5941beded56f80445b" PV = "20230601+git" -- cgit v1.2.3-54-g00ecf