diff options
Diffstat (limited to 'poky/meta/recipes-devtools/elfutils')
10 files changed, 112 insertions, 372 deletions
diff --git a/poky/meta/recipes-devtools/elfutils/elfutils_0.185.bb b/poky/meta/recipes-devtools/elfutils/elfutils_0.186.bb index f4769e3632..93f53c1f2e 100644 --- a/poky/meta/recipes-devtools/elfutils/elfutils_0.185.bb +++ b/poky/meta/recipes-devtools/elfutils/elfutils_0.186.bb @@ -4,7 +4,7 @@ DESCRIPTION = "elfutils is a collection of utilities and libraries to read, crea SECTION = "base" LICENSE = "GPLv2 & GPLv2+ & LGPLv3+ & GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://debuginfod/debuginfod-client.c;endline=27;md5=f8e9d171c401c493ec45a0b2992ea2ed \ + file://debuginfod/debuginfod-client.c;endline=27;md5=d2adfd8f5347d4c96e3c280393ce66da \ " DEPENDS = "zlib virtual/libintl" DEPENDS:append:libc-musl = " argp-standalone fts musl-obstack " @@ -21,21 +21,17 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://run-ptest \ file://ptest.patch \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ - file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ - file://glibc-2.34-fix.patch \ + file://0001-debuginfod-fix-compilation-on-platforms-without-erro.patch \ + file://0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch \ " SRC_URI:append:libc-musl = " \ - file://0002-musl-libs.patch \ file://0003-musl-utils.patch \ - file://0004-Fix-error-on-musl.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " -SRC_URI[sha256sum] = "dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6" - -# remove at next version upgrade or when output changes -PR = "r1" +SRC_URI[sha256sum] = "7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177" inherit autotools gettext ptest pkgconfig +PTEST_ENABLED:libc-musl = "0" EXTRA_OECONF = "--program-prefix=eu-" diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch b/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch deleted file mode 100644 index 5b225c532d..0000000000 --- a/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch +++ /dev/null @@ -1,63 +0,0 @@ -From c3055ce9eb32d0d24abc5cea5e1d231c499312a7 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 19 Apr 2021 23:29:10 +0200 -Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on - 32bit arches with 64bit time_t - -Use intmax_t to print time_t - -time_t is platform dependent and some of architectures e.g. -x32, riscv32, arc use 64bit time_t even while they are 32bit -architectures, therefore directly using integer printf formats will not -work portably, use intmax_t to typecast time_t into printf family of -functions - -Upstream-Status: Pending - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - debuginfod/debuginfod-client.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c -index ee7eda2..083ec2c 100644 ---- a/debuginfod/debuginfod-client.c -+++ b/debuginfod/debuginfod-client.c -@@ -226,7 +226,7 @@ debuginfod_config_cache(char *config_path, - if (fd < 0) - return -errno; - -- if (dprintf(fd, "%ld", cache_config_default_s) < 0) -+ if (dprintf(fd, "%jd", (intmax_t)cache_config_default_s) < 0) - return -errno; - } - -@@ -234,7 +234,7 @@ debuginfod_config_cache(char *config_path, - FILE *config_file = fopen(config_path, "r"); - if (config_file) - { -- if (fscanf(config_file, "%ld", &cache_config) != 1) -+ if (fscanf(config_file, "%jd", (intmax_t*)(&cache_config)) != 1) - cache_config = cache_config_default_s; - fclose(config_file); - } -@@ -267,7 +267,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) - if (fd < 0) - return -errno; - -- if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0) -+ if (dprintf(fd, "%jd", (intmax_t)cache_clean_default_interval_s) < 0) - return -errno; - - /* init max age config file. */ -@@ -275,7 +275,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) - && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0) - return -errno; - -- if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0) -+ if (dprintf(fd, "%jd", (intmax_t)cache_default_max_unused_age_s) < 0) - return -errno; - - return 0; diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch b/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch new file mode 100644 index 0000000000..089f1a2210 --- /dev/null +++ b/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch @@ -0,0 +1,45 @@ +From a0852044907110479d0fb212dda2c5e45af2d3aa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Thu, 9 Dec 2021 10:43:06 +0100 +Subject: [PATCH] debuginfod/debuginfod-client.c: use long for cache time + configurations + +time_t is platform dependent and some of architectures e.g. +x32, riscv32, arc use 64bit time_t even while they are 32bit +architectures, therefore directly using integer printf formats will not +work portably. + +Use a plain long everywhere as the intervals are small enough +that it will not be problematic. + +Upstream-Status: Submitted [via email to mark@klomp.org,elfutils-devel@sourceware.org] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + debuginfod/debuginfod-client.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c +index c875ee6..11e0fd5 100644 +--- a/debuginfod/debuginfod-client.c ++++ b/debuginfod/debuginfod-client.c +@@ -134,17 +134,17 @@ struct debuginfod_client + how frequently the cache should be cleaned. The file's st_mtime represents + the time of last cleaning. */ + static const char *cache_clean_interval_filename = "cache_clean_interval_s"; +-static const time_t cache_clean_default_interval_s = 86400; /* 1 day */ ++static const long cache_clean_default_interval_s = 86400; /* 1 day */ + + /* The cache_miss_default_s within the debuginfod cache specifies how + frequently the 000-permision file should be released.*/ +-static const time_t cache_miss_default_s = 600; /* 10 min */ ++static const long cache_miss_default_s = 600; /* 10 min */ + static const char *cache_miss_filename = "cache_miss_s"; + + /* The cache_max_unused_age_s file within the debuginfod cache specifies the + the maximum time since last access that a file will remain in the cache. */ + static const char *cache_max_unused_age_filename = "max_unused_age_s"; +-static const time_t cache_default_max_unused_age_s = 604800; /* 1 week */ ++static const long cache_default_max_unused_age_s = 604800; /* 1 week */ + + /* Location of the cache of files downloaded from debuginfods. + The default parent directory is $HOME, or '/' if $HOME doesn't exist. */ diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch b/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch new file mode 100644 index 0000000000..e80d96aaca --- /dev/null +++ b/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch @@ -0,0 +1,54 @@ +From 99617d7ab5b01c322b0f27d4aa0dd91c61793a5e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com> +Date: Wed, 10 Nov 2021 21:17:48 -0300 +Subject: [PATCH] debuginfod: fix compilation on platforms without <error.h> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +"system.h" only declares the error() function, so it needs to be in an +'extern "C"' block, otherwise linking fails. + +Since we are here, use quotes for "system.h" header, since it's a local +header, not a system one. + +Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=90b9e91b961b794a4e58ab76d9191a5e7343584e] +Signed-off-by: Érico Nogueira <erico.erc@gmail.com> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + debuginfod/ChangeLog | 4 ++++ + debuginfod/debuginfod.cxx | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog +index f06d3ee..822bd63 100644 +--- a/debuginfod/ChangeLog ++++ b/debuginfod/ChangeLog +@@ -1,3 +1,7 @@ ++2021-11-10 Érico N. Rolim <erico.erc@gmail.com> ++ ++ * debuginfod.cxx: include "system.h" under 'extern "C"' block. ++ + 2021-11-05 Frank Ch. Eigler <fche@redhat.com> + + PR28430 +diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx +index 521cb52..764e7b9 100644 +--- a/debuginfod/debuginfod.cxx ++++ b/debuginfod/debuginfod.cxx +@@ -33,11 +33,11 @@ + + extern "C" { + #include "printversion.h" ++#include "system.h" + } + + #include "debuginfod.h" + #include <dwarf.h> +-#include <system.h> + + #include <argp.h> + #ifdef __GNUC__ +-- +2.20.1 + diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch b/poky/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch index 114ca63cb5..0e6bf5573c 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch @@ -6,7 +6,7 @@ Subject: [PATCH] skip the test when gcc not deployed Skip the tests which depend on gcc when gcc not deployed. -Upstream-Status: Submitted[https://sourceware.org/ml/elfutils-devel/2019-q2/msg00091.html] +Upstream-Status: Submitted [https://sourceware.org/ml/elfutils-devel/2019-q2/msg00091.html] Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> diff --git a/poky/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch b/poky/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch deleted file mode 100644 index c7360da7a7..0000000000 --- a/poky/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 0f4667f0bb4b000d74ade07e90bd690b7217a19d Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 23 Aug 2019 10:18:47 +0800 -Subject: [PATCH] musl-libs - -Collection of fixes needed to compile libelf and other libraries -provided by elfutils for musl targets - -error is glibc specific API, so this patch will mostly not accepted -upstream given that elfutils has been closely tied to glibc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Inappropriate [workaround for musl] - -Rebase to 0.177 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - lib/error.h | 27 +++++++++++++++++++++++++++ - lib/fixedsizehash.h | 1 - - lib/libeu.h | 1 + - libdwfl/linux-kernel-modules.c | 1 + - libelf/elf.h | 7 +++++++ - 5 files changed, 36 insertions(+), 1 deletion(-) - create mode 100644 lib/error.h - -diff --git a/lib/error.h b/lib/error.h -new file mode 100644 -index 0000000..ef06827 ---- /dev/null -+++ b/lib/error.h -@@ -0,0 +1,27 @@ -+#ifndef _ERROR_H_ -+#define _ERROR_H_ -+ -+#include <stdarg.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <errno.h> -+ -+static unsigned int error_message_count = 0; -+ -+static inline void error(int status, int errnum, const char* format, ...) -+{ -+ va_list ap; -+ fprintf(stderr, "%s: ", program_invocation_name); -+ va_start(ap, format); -+ vfprintf(stderr, format, ap); -+ va_end(ap); -+ if (errnum) -+ fprintf(stderr, ": %s", strerror(errnum)); -+ fprintf(stderr, "\n"); -+ error_message_count++; -+ if (status) -+ exit(status); -+} -+ -+#endif /* _ERROR_H_ */ -diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h -index dac2a5f..43016fc 100644 ---- a/lib/fixedsizehash.h -+++ b/lib/fixedsizehash.h -@@ -30,7 +30,6 @@ - #include <errno.h> - #include <stdlib.h> - #include <string.h> --#include <sys/cdefs.h> - - #include <system.h> - -diff --git a/lib/libeu.h b/lib/libeu.h -index ecb4d01..edc85e3 100644 ---- a/lib/libeu.h -+++ b/lib/libeu.h -@@ -29,6 +29,7 @@ - #ifndef LIBEU_H - #define LIBEU_H - -+#include "system.h" - #include <stddef.h> - #include <stdint.h> - -diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c -index c0f8dfa..aa78033 100644 ---- a/libdwfl/linux-kernel-modules.c -+++ b/libdwfl/linux-kernel-modules.c -@@ -50,6 +50,7 @@ - #include <sys/utsname.h> - #include <fcntl.h> - #include <unistd.h> -+#include "system.h" - - /* If fts.h is included before config.h, its indirect inclusions may not - give us the right LFS aliases of these functions, so map them manually. */ -diff --git a/libelf/elf.h b/libelf/elf.h -index 8e3e618..1353890 100644 ---- a/libelf/elf.h -+++ b/libelf/elf.h -@@ -19,6 +19,10 @@ - #ifndef _ELF_H - #define _ELF_H 1 - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - /* Standard ELF types. */ - - #include <stdint.h> -@@ -4102,4 +4106,7 @@ enum - #define R_ARC_TLS_LE_S9 0x4a - #define R_ARC_TLS_LE_32 0x4b - -+#ifdef __cplusplus -+} -+#endif - #endif /* elf.h */ diff --git a/poky/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/poky/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch index 2e379cdba6..cbc9fce790 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch @@ -1,4 +1,4 @@ -From 2f94d488bf3daaa6a8548ee77120fc2506a9bbe3 Mon Sep 17 00:00:00 2001 +From 8b48c580bae0b0ffc773b0b829c50d33a907853c Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Fri, 23 Aug 2019 10:19:48 +0800 Subject: [PATCH] musl-utils @@ -57,7 +57,7 @@ index 2c6d91b..608646e 100644 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; diff --git a/src/strip.c b/src/strip.c -index 70fc8c0..d035d9e 100644 +index d5b753d..d6e1b64 100644 --- a/src/strip.c +++ b/src/strip.c @@ -46,6 +46,13 @@ @@ -75,7 +75,7 @@ index 70fc8c0..d035d9e 100644 /* Name and version of program. */ diff --git a/src/unstrip.c b/src/unstrip.c -index e488e81..0e44456 100644 +index aacc9aa..5e71290 100644 --- a/src/unstrip.c +++ b/src/unstrip.c @@ -52,6 +52,15 @@ diff --git a/poky/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch b/poky/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch deleted file mode 100644 index 2fa60c333c..0000000000 --- a/poky/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 72819106d0e5666d172d39c24c19e4e7a3b8be0e Mon Sep 17 00:00:00 2001 -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Wed, 1 May 2019 22:15:03 +0100 -Subject: [PATCH] Fix error on musl: - -| ../../elfutils-0.176/tests/elfstrmerge.c: In function 'main': -| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: error: 'ALLPERMS' undeclared (first use in this function); did you mean 'EPERM'? -| fdnew = open (fnew, O_WRONLY | O_CREAT, st.st_mode & ALLPERMS); -| ^~~~~~~~ -| EPERM -| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: note: each undeclared identifier is reported only once for each function it appears in - -Upstream-Status: Inappropriate [workaround in musl] - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - ---- - tests/elfstrmerge.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c -index 197c6a5..3683672 100644 ---- a/tests/elfstrmerge.c -+++ b/tests/elfstrmerge.c -@@ -33,6 +33,11 @@ - #include ELFUTILS_HEADER(dwelf) - #include "elf-knowledge.h" - -+/* for musl */ -+#ifndef ALLPERMS -+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ -+#endif -+ - /* The original ELF file. */ - static int fd = -1; - static Elf *elf = NULL; diff --git a/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch index 5cd6fffc27..9952070939 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch @@ -1,4 +1,4 @@ -From cfced441d4a6f2eca51d29c52240275bd6f54e49 Mon Sep 17 00:00:00 2001 +From 5e39da062929a60a07ddfc8b6d435ea65ea3e31f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 22 Jun 2020 21:35:16 +0000 Subject: [PATCH] config/eu.am: do not use -Werror @@ -16,10 +16,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 2 deletions(-) diff --git a/config/eu.am b/config/eu.am -index 2c3e457..8fb0411 100644 +index 58cd3c4..ac42390 100644 --- a/config/eu.am +++ b/config/eu.am -@@ -89,7 +89,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ +@@ -91,7 +91,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ @@ -27,7 +27,7 @@ index 2c3e457..8fb0411 100644 $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -@@ -99,7 +98,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ +@@ -101,7 +100,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ $(TRAMPOLINES_WARNING) \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ diff --git a/poky/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch b/poky/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch deleted file mode 100644 index 9509fb4e77..0000000000 --- a/poky/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch +++ /dev/null @@ -1,138 +0,0 @@ -glibc 2.34 calls pthread_kill from the raise function. Before raise -directly called the (tg)kill syscall. So allow pthread_kill to be the -first frame in a backtrace where raise is expected. Also change some -asserts to fprintf plus abort to make it more clear why the testcase -fails. - -https://sourceware.org/bugzilla/show_bug.cgi?id=28190 - -Signed-off-by: Mark Wielaard <mark@klomp.org> -Upstream-Status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2021q3/004019.html] ---- - tests/ChangeLog | 6 +++++ - tests/backtrace.c | 62 +++++++++++++++++++++++++++++++++++++++++------ - 2 files changed, 61 insertions(+), 7 deletions(-) - -Index: elfutils-0.185/tests/ChangeLog -=================================================================== ---- elfutils-0.185.orig/tests/ChangeLog -+++ elfutils-0.185/tests/ChangeLog -@@ -1,3 +1,9 @@ -+2021-08-04 Mark Wielaard <mark@klomp.org> -+ -+ PR28190 -+ * backtrace.c (callback_verify): Check for pthread_kill as first -+ frame. Change asserts to fprintf plus abort. -+ - 2021-05-14 Frank Ch. Eigler <fche@redhat.com> - - PR27859 -Index: elfutils-0.185/tests/backtrace.c -=================================================================== ---- elfutils-0.185.orig/tests/backtrace.c -+++ elfutils-0.185/tests/backtrace.c -@@ -97,6 +97,9 @@ callback_verify (pid_t tid, unsigned fra - static bool reduce_frameno = false; - if (reduce_frameno) - frameno--; -+ static bool pthread_kill_seen = false; -+ if (pthread_kill_seen) -+ frameno--; - if (! use_raise_jmp_patching && frameno >= 2) - frameno += 2; - const char *symname2 = NULL; -@@ -107,11 +110,26 @@ callback_verify (pid_t tid, unsigned fra - && (strcmp (symname, "__kernel_vsyscall") == 0 - || strcmp (symname, "__libc_do_syscall") == 0)) - reduce_frameno = true; -+ else if (! pthread_kill_seen && symname -+ && strstr (symname, "pthread_kill") != NULL) -+ pthread_kill_seen = true; - else -- assert (symname && strcmp (symname, "raise") == 0); -+ { -+ if (!symname || strcmp (symname, "raise") != 0) -+ { -+ fprintf (stderr, -+ "case 0: expected symname 'raise' got '%s'\n", symname); -+ abort (); -+ } -+ } - break; - case 1: -- assert (symname != NULL && strcmp (symname, "sigusr2") == 0); -+ if (symname == NULL || strcmp (symname, "sigusr2") != 0) -+ { -+ fprintf (stderr, -+ "case 1: expected symname 'sigusr2' got '%s'\n", symname); -+ abort (); -+ } - break; - case 2: // x86_64 only - /* __restore_rt - glibc maybe does not have to have this symbol. */ -@@ -120,11 +138,21 @@ callback_verify (pid_t tid, unsigned fra - if (use_raise_jmp_patching) - { - /* Verify we trapped on the very first instruction of jmp. */ -- assert (symname != NULL && strcmp (symname, "jmp") == 0); -+ if (symname == NULL || strcmp (symname, "jmp") != 0) -+ { -+ fprintf (stderr, -+ "case 3: expected symname 'raise' got '%s'\n", symname); -+ abort (); -+ } - mod = dwfl_addrmodule (dwfl, pc - 1); - if (mod) - symname2 = dwfl_module_addrname (mod, pc - 1); -- assert (symname2 == NULL || strcmp (symname2, "jmp") != 0); -+ if (symname2 == NULL || strcmp (symname2, "jmp") != 0) -+ { -+ fprintf (stderr, -+ "case 3: expected symname2 'jmp' got '%s'\n", symname2); -+ abort (); -+ } - break; - } - FALLTHROUGH; -@@ -137,11 +165,22 @@ callback_verify (pid_t tid, unsigned fra - duplicate_sigusr2 = true; - break; - } -- assert (symname != NULL && strcmp (symname, "stdarg") == 0); -+ if (symname == NULL || strcmp (symname, "stdarg") != 0) -+ { -+ fprintf (stderr, -+ "case 4: expected symname 'stdarg' got '%s'\n", symname); -+ abort (); -+ } - break; - case 5: - /* Verify we trapped on the very last instruction of child. */ -- assert (symname != NULL && strcmp (symname, "backtracegen") == 0); -+ if (symname == NULL || strcmp (symname, "backtracegen") != 0) -+ { -+ fprintf (stderr, -+ "case 5: expected symname 'backtracegen' got '%s'\n", -+ symname); -+ abort (); -+ } - mod = dwfl_addrmodule (dwfl, pc); - if (mod) - symname2 = dwfl_module_addrname (mod, pc); -@@ -151,7 +190,15 @@ callback_verify (pid_t tid, unsigned fra - // instructions or even inserts some padding instructions at the end - // (which apparently happens on ppc64). - if (use_raise_jmp_patching) -- assert (symname2 == NULL || strcmp (symname2, "backtracegen") != 0); -+ { -+ if (symname2 != NULL && strcmp (symname2, "backtracegen") == 0) -+ { -+ fprintf (stderr, -+ "use_raise_jmp_patching didn't expect symname2 " -+ "'backtracegen'\n"); -+ abort (); -+ } -+ } - break; - } - } |