diff --git a/dwz-0.14.tar.xz b/dwz-0.14.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..3d6789fa0c184db8bf86243f17c6702be4a6637a Binary files /dev/null and b/dwz-0.14.tar.xz differ diff --git a/dwz-0.15.tar.xz b/dwz-0.15.tar.xz deleted file mode 100644 index d293ea07776b0fe2bc984c366466c493bb9eeea5..0000000000000000000000000000000000000000 Binary files a/dwz-0.15.tar.xz and /dev/null differ diff --git a/dwz.spec b/dwz.spec index faab81557b4fb4aa146cc0c5db2f5c69b5f19a38..22426a3781f97bcda1fa07cd28b527dec4f17e00 100644 --- a/dwz.spec +++ b/dwz.spec @@ -1,13 +1,14 @@ Name: dwz -Version: 0.15 -Release: 1 +Version: 0.14 +Release: 4 Summary: A DWARF optimization and duplicate removal tool License: GPLv2+ and GPLv3+ URL: https://sourceware.org/dwz/ Source0:https://sourceware.org/ftp/dwz/releases/%{name}-%{version}.tar.xz +Patch1: testsuite-Handle-readelf-following-links-by-default.patch + BuildRequires:gcc elfutils-libelf-devel dejagnu gcc-c++ gdb -BuildRequires:xxhash-devel %description The package contains a program that attempts to optimize DWARF debugging @@ -53,6 +54,9 @@ make check %{_mandir}/man1/dwz* %changelog +* Tue Nov 14 2023 renhongxun - 0.14-4 +- revert version to 0.14 + * Tue Oct 24 2023 renhongxun - 0.15-1 - upgrade version to 0.15 diff --git a/testsuite-Handle-readelf-following-links-by-default.patch b/testsuite-Handle-readelf-following-links-by-default.patch new file mode 100644 index 0000000000000000000000000000000000000000..22c0f0890703b0939c1dde141ded4f5c50bb1a98 --- /dev/null +++ b/testsuite-Handle-readelf-following-links-by-default.patch @@ -0,0 +1,58 @@ +From b1f26dc76158e1f3364836d8b540b17a7a1ccb3d Mon Sep 17 00:00:00 2001 +From: Tom de Vries +Date: Sat, 20 Mar 2021 09:37:31 +0100 +Subject: [PATCH] [testsuite] Handle readelf following links by default + +Since binutils commit c46b706620e "Change the readelf and objdump programs so +that they will automatically follow links to separate debug info files" there +are a few FAILs in the dwz testsuite. + +This is just due to changing the default behaviour for readelf. + +Fix this by testing whether the new -Wn readelf flag is supported, +and if so, adding it to the readelf call. + +2021-03-20 Tom de Vries + + PR dwz/27592 + * testsuite/dwz.tests/odr-struct-multifile.sh: Call readelf with -wN + if supported. + * testsuite/dwz.tests/cycle.sh: Same. +--- + testsuite/dwz.tests/odr-struct-multifile.sh | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/testsuite/dwz.tests/odr-struct-multifile.sh b/testsuite/dwz.tests/odr-struct-multifile.sh +index cc462c9..20b682b 100644 +--- a/testsuite/dwz.tests/odr-struct-multifile.sh ++++ b/testsuite/dwz.tests/odr-struct-multifile.sh +@@ -2,6 +2,11 @@ if ! $execs/dwz-for-test --odr -v 2>/dev/null; then + exit 77 + fi + ++readelf_flags="" ++if readelf -h 2>&1 | grep -q "\-wN"; then ++ readelf_flags=-wN ++fi ++ + cp $execs/odr-struct 1 + cp 1 2 + +@@ -41,12 +46,12 @@ done + + + for name in aaa bbb ccc; do +- cnt=$(readelf -wi 1 | grep -c "DW_AT_name.*:.*$name" || true) ++ cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*:.*$name" || true) + [ $cnt -eq 0 ] + done + + for name in member_one member_two member_three member_four; do +- cnt=$(readelf -wi 1 | grep -c "DW_AT_name.*:.*$name" || true) ++ cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*:.*$name" || true) + [ $cnt -eq 0 ] + done + +-- +1.8.3.1 +