This commit is contained in:
Jakub Jelinek 2021-03-09 15:34:05 +01:00
parent a7824de66b
commit b31742dbf6
4 changed files with 8 additions and 60 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/dwz-20210118.tar.xz
/dwz-20210121.tar.xz
/dwz-20210122.tar.xz
/dwz-0.14.tar.xz

View File

@ -1,50 +0,0 @@
diff --git a/Makefile b/Makefile
index 340569a..236a3dc 100644
--- a/Makefile
+++ b/Makefile
@@ -99,37 +99,37 @@ $(TEST_EXECS_DWARF_ASM): %: %-dw.S
$(CC) $(TEST_SRC)/main.c $< -o $@
odr-struct:
- $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -g \
+ $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -gdwarf-4 \
-DKIND=struct
odr-class:
- $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -g \
+ $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -gdwarf-4 \
-DKIND=class
odr-union:
- $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -g \
+ $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -gdwarf-4 \
-DKIND=union
odr-struct-ns:
- $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -g \
+ $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -gdwarf-4 \
-DKIND=struct -DNAMESPACE=1
odr-class-ns:
- $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -g \
+ $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -gdwarf-4 \
-DKIND=class -DNAMESPACE=1
odr-union-ns:
- $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -g \
+ $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -gdwarf-4 \
-DKIND=union -DNAMESPACE=1
odr-loc:
$(CXX) $(TEST_SRC)/odr-loc.cc $(TEST_SRC)/odr-loc-2.cc -I$(TEST_SRC) \
- -o $@ -g
+ -o $@ -gdwarf-4
def-decl:
$(CXX) $(TEST_SRC)/decl.c $(TEST_SRC)/def.c $(TEST_SRC)/def2.c -I$(TEST_SRC) \
- -o $@ -g
+ -o $@ -gdwarf-4
# On some systems we need to set and export DEJAGNU to suppress
# WARNING: Couldn't find the global config file.

View File

@ -1,12 +1,9 @@
Summary: DWARF optimization and duplicate removal tool
Name: dwz
Version: 0.13
Release: 8%{?dist}
Version: 0.14
Release: 1%{?dist}
License: GPLv2+ and GPLv3+
#Source: https://sourceware.org/ftp/dwz/releases/%{name}-%{version}.tar.xz
#git clone git://sourceware.org/git/dwz; cd dwz; git archive --format=tar --prefix=dwz/ 216d4fadd5a475ed6a1bc565081b630b586155eb | xz -9e > ../dwz-20210122.tar.xz
Source: %{name}-20210122.tar.xz
Patch: %{name}.patch
Source: %{name}-0.14.tar.xz
BuildRequires: gcc, gcc-c++, gdb, elfutils-libelf-devel, dejagnu
BuildRequires: make
@ -21,13 +18,13 @@ and using DW_TAG_imported_unit to import it into each CU that needs it.
%prep
%setup -q -n dwz
%patch -p1
%build
%make_build CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}' \
prefix=%{_prefix} mandir=%{_mandir} bindir=%{_bindir}
%install
rm -rf %{buildroot}
%make_install prefix=%{_prefix} mandir=%{_mandir} bindir=%{_bindir}
%check
@ -39,8 +36,8 @@ make check
%{_mandir}/man1/dwz.1*
%changelog
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Mar 09 2021 Jakub Jelinek <jakub@redhat.com> 0.14-1
- update to a new upstream release
* Fri Jan 22 2021 Mark Wielaard <mjw@fedoraproject.org> 0.13-7
- Don't crash on DWARF5 .debug_line table with zero files (#1919243)

View File

@ -1 +1 @@
SHA512 (dwz-20210122.tar.xz) = b0e0df74b0a66a18f25bfdf7ee54b08326f4dceff4382a8137c8f18c6ef93099f2eca511cb271da3d5ec4dcd1c5136cfb6de11cf7a31bbdefba1b8eb4e116765
SHA512 (dwz-0.14.tar.xz) = 62c39f79723ca99305dbb08d1d24a17699b9a84dd98c30904103da116831b1253bf1edbfb905c76fdc4d48305bd1ea0046314c5619209c40a1e624b8ae4908b1