diff --git a/backport-btf_encoder-Fix-dwarf-int-type-with-greater-than-16-.patch b/backport-btf_encoder-Fix-dwarf-int-type-with-greater-than-16-.patch deleted file mode 100644 index 4a931eaefe8eaf17bb75eb566992858a7359d887..0000000000000000000000000000000000000000 --- a/backport-btf_encoder-Fix-dwarf-int-type-with-greater-than-16-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b9607b8bf5fe3180ae4cd44cddaf054e5595e699 Mon Sep 17 00:00:00 2001 -From: Yonghong Song -Date: Wed, 24 Apr 2024 15:35:38 -0700 -Subject: [PATCH dwarves] btf_encoder: Fix dwarf int type with greater-than-16 byte issue - -Nick Desaulniers and Xin Liu separately reported that int type might -have greater-than-16 byte size ([1] and [2]). More specifically, the -reported int type sizes are 1024 and 64 bytes. - -The libbpf and bpf program does not really support any int type greater -than 16 bytes. Therefore, with current pahole, btf encoding will fail -with greater-than-16 byte int types. - -Since for now bpf does not support '> 16' bytes int type, the simplest -way is to sanitize such types, similar to existing conditions like -'!byte_sz' and 'byte_sz & (byte_sz - 1)'. This way, pahole won't -call libbpf with an unsupported int type size. The patch [3] was -proposed before. Now I resubmitted this patch as there are another -failure due to the same issue. - - [1] https://github.com/libbpf/libbpf/pull/680 - [2]https://lore.kernel.org/bpf/20240422144538.351722-1-liuxin350@huawei.com/ - [3] https://lore.kernel.org/bpf/20230426055030.3743074-1-yhs@fb.com/ - -Cc: Xin Liu -Cc: Alan Maguire -Signed-off-by: Yonghong Song ---- - btf_encoder.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/btf_encoder.c b/btf_encoder.c -index 65f6e71..1aa0ad0 100644 ---- a/btf_encoder.c -+++ b/btf_encoder.c -@@ -394,7 +394,7 @@ static int32_t btf_encoder__add_base_type(struct btf_encoder *encoder, const str - * these non-regular int types to avoid libbpf/kernel complaints. - */ - byte_sz = BITS_ROUNDUP_BYTES(bt->bit_size); -- if (!byte_sz || (byte_sz & (byte_sz - 1))) { -+ if (!byte_sz || (byte_sz & (byte_sz - 1)) || byte_sz > 16) { - name = "__SANITIZED_FAKE_INT__"; - byte_sz = 4; - } --- -2.33.0 - diff --git a/dwarves-1.25.tar.xz b/dwarves-1.25.tar.xz deleted file mode 100644 index fda7dd38cb8c74dd604dd68e02affd1e7045185f..0000000000000000000000000000000000000000 Binary files a/dwarves-1.25.tar.xz and /dev/null differ diff --git a/dwarves-1.30.tar.xz b/dwarves-1.30.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..2f463b027b2d49265380984149c204082ad5aec8 Binary files /dev/null and b/dwarves-1.30.tar.xz differ diff --git a/dwarves.spec b/dwarves.spec index 5f44ed268ef9f4bf30cb2fc54e4107eec223fb6b..fd3102cb1e6f6b65b61872f3fc3f2bd7851c81a2 100644 --- a/dwarves.spec +++ b/dwarves.spec @@ -1,22 +1,20 @@ %define libname libdwarves %define libver 1 -%define libbpfver 1.2.0 +%define libbpfver 1.6.0 Name: dwarves -Version: 1.25 -Release: 4 -License: GPLv2 +Version: 1.30 +Release: 1 +License: GPL-2.0-only Summary: Debugging Information Manipulation Tools -URL: http://acmel.wordpress.com -Source: http://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.xz -Source1: https://github.com/libbpf/libbpf/archive/refs/tags/v%{libbpfver}.tar.gz +URL: https://acmel.wordpress.com +Source: https://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.xz Requires: %{libname}%{libver} = %{version}-%{release} BuildRequires: gcc BuildRequires: cmake BuildRequires: zlib-devel BuildRequires: elfutils-devel >= 0.170 - -Patch0: backport-btf_encoder-Fix-dwarf-int-type-with-greater-than-16-.patch +Provides: bundled(libbpf) = %{libbpfver} %description dwarves is a set of tools that use the debugging information inserted in @@ -38,23 +36,19 @@ Debugging information processing library development files. %prep %autosetup -p1 -n %{name}-%{version} -tar -zxvf %{SOURCE1} --strip-components 1 -C %{_builddir}/%{name}-%{version}/lib/bpf/ %build -# Remove _FORTIFY_SOURCE from CFLAGS or else will get below error: -# error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] -%define _fortify_level 0 - -%cmake +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo %cmake_build %install %cmake_install %files +%license COPYING %doc README.ctracer %doc README.btf -%doc changes-v1.17 +%doc changes-v* %doc NEWS %{_bindir}/* %dir %{_datadir}/dwarves/ @@ -81,6 +75,9 @@ tar -zxvf %{SOURCE1} --strip-components 1 -C %{_builddir}/%{name}-%{version}/lib %{_libdir}/%{libname}_reorganize.so %changelog +* Mon Aug 25 2025 Funda Wang - 1.30-1 +- update to 1.30 + * Fri Dec 20 2024 Funda Wang - 1.25-4 - adopt to new cmake macro diff --git a/v1.2.0.tar.gz b/v1.2.0.tar.gz deleted file mode 100644 index 33cf1d775d5f1d73eee26ae3fbb02638b4cc9f26..0000000000000000000000000000000000000000 Binary files a/v1.2.0.tar.gz and /dev/null differ