0.13-6
This commit is contained in:
Jakub Jelinek
parent
be09fd0d22
commit
a2e2b1b820
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@
|
||||
/dwz-0.12.tar.bz2
|
||||
/dwz-0.13.tar.xz
|
||||
/dwz-20210118.tar.xz
|
||||
/dwz-20210121.tar.xz
|
||||
|
||||
131
dwz.patch
131
dwz.patch
@ -1,87 +1,44 @@
|
||||
diff --git a/dwz.c b/dwz.c
|
||||
index 308bcba..a6ea5ec 100644
|
||||
--- a/dwz.c
|
||||
+++ b/dwz.c
|
||||
@@ -3580,7 +3580,14 @@ checksum_die (DSO *dso, dw_cu_ref cu, dw_die_ref top_die, dw_die_ref die)
|
||||
ptr += ptr_size;
|
||||
break;
|
||||
case DW_FORM_flag_present:
|
||||
+ break;
|
||||
case DW_FORM_implicit_const:
|
||||
+ if (!handled && die->die_ck_state != CK_BAD)
|
||||
+ {
|
||||
+ handled = true;
|
||||
+ die->u.p1.die_hash
|
||||
+ = iterative_hash_object (t->values[i], die->u.p1.die_hash);
|
||||
+ }
|
||||
break;
|
||||
case DW_FORM_flag:
|
||||
case DW_FORM_data1:
|
||||
@@ -4837,7 +4844,11 @@ die_eq_1 (dw_cu_ref cu1, dw_cu_ref cu2,
|
||||
ptr2 += ptr_size;
|
||||
break;
|
||||
case DW_FORM_flag_present:
|
||||
+ break;
|
||||
case DW_FORM_implicit_const:
|
||||
+ if ((!ignore_locus || old_ptr1)
|
||||
+ && t1->values[i] != t2->values[j])
|
||||
+ FAIL;
|
||||
break;
|
||||
case DW_FORM_flag:
|
||||
case DW_FORM_data1:
|
||||
@@ -10456,19 +10467,18 @@ build_abbrevs_for_die (htab_t h, dw_cu_ref cu, dw_die_ref die,
|
||||
case DW_FORM_data4: value = read_32 (ptr); break;
|
||||
case DW_FORM_data8: value = read_64 (ptr); break;
|
||||
case DW_FORM_udata: value = read_uleb128 (ptr); break;
|
||||
- case DW_FORM_implicit_const: break;
|
||||
+ case DW_FORM_implicit_const:
|
||||
+ value = reft->values[i];
|
||||
+ break;
|
||||
default:
|
||||
error (0, 0, "Unhandled %s for %s",
|
||||
get_DW_FORM_str (form),
|
||||
get_DW_AT_str (reft->attr[i].attr));
|
||||
return 1;
|
||||
}
|
||||
- /* Note that the value is only used for calculating the
|
||||
- DIE size and possibly change form. Doesn't change the
|
||||
- implicit_const from or value. */
|
||||
+ value = line_htab_lookup (refcu, value);
|
||||
if (form != DW_FORM_implicit_const)
|
||||
{
|
||||
- value = line_htab_lookup (refcu, value);
|
||||
if (value <= 0xff)
|
||||
{
|
||||
form = DW_FORM_data1;
|
||||
@@ -10488,7 +10498,7 @@ build_abbrevs_for_die (htab_t h, dw_cu_ref cu, dw_die_ref die,
|
||||
t->attr[j].attr = reft->attr[i].attr;
|
||||
t->attr[j].form = form;
|
||||
if (form == DW_FORM_implicit_const)
|
||||
- t->values[j] = reft->values[i];
|
||||
+ t->values[j] = value;
|
||||
j++;
|
||||
continue;
|
||||
}
|
||||
@@ -12088,10 +12098,8 @@ write_die (unsigned char *ptr, dw_cu_ref cu, dw_die_ref die,
|
||||
update = true;
|
||||
break;
|
||||
case DW_FORM_implicit_const:
|
||||
- /* Negative means, already transformed. */
|
||||
- if (reft->values[i] >= 0)
|
||||
- update = true;
|
||||
- value = reft->values[i];
|
||||
+ /* DW_FORM_implicit_const should have been updated
|
||||
+ already when computing abbrevs. */
|
||||
break;
|
||||
default: abort ();
|
||||
}
|
||||
@@ -12104,9 +12112,6 @@ write_die (unsigned char *ptr, dw_cu_ref cu, dw_die_ref die,
|
||||
case DW_FORM_data2: write_16 (ptr, value); break;
|
||||
case DW_FORM_data4: write_32 (ptr, value); break;
|
||||
case DW_FORM_udata: write_uleb128 (ptr, value); break;
|
||||
- case DW_FORM_implicit_const:
|
||||
- reft->values[i] = -value; /* Note, negated. */
|
||||
- break;
|
||||
default: abort ();
|
||||
}
|
||||
}
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 340569a..94b77b1 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -99,32 +99,32 @@ $(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:
|
||||
|
||||
12
dwz.spec
12
dwz.spec
@ -4,8 +4,8 @@ Version: 0.13
|
||||
Release: 6%{?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/ 40d5efd4edc52a7d2ed02f8400a9beb129053271 | xz -9e > ../dwz-20210118.tar.xz
|
||||
Source: %{name}-20210118.tar.xz
|
||||
#git clone git://sourceware.org/git/dwz; cd dwz; git archive --format=tar --prefix=dwz/ 47af8da7c8533924e96d1dbd97625b6a4dc35855 | xz -9e > ../dwz-20210121.tar.xz
|
||||
Source: %{name}-20210121.tar.xz
|
||||
Patch: %{name}.patch
|
||||
BuildRequires: gcc, gcc-c++, gdb, elfutils-libelf-devel, dejagnu
|
||||
BuildRequires: make
|
||||
@ -32,9 +32,6 @@ rm -rf %{buildroot}
|
||||
%make_install prefix=%{_prefix} mandir=%{_mandir} bindir=%{_bindir}
|
||||
|
||||
%check
|
||||
rm -f testsuite/dwz.tests/odr*
|
||||
sed -i -e 's/odr-struct odr-class odr-union odr-struct-ns//' Makefile
|
||||
sed -i -e 's/odr-class-ns odr-union-ns odr-loc//' Makefile
|
||||
make check
|
||||
|
||||
%files
|
||||
@ -43,9 +40,10 @@ make check
|
||||
%{_mandir}/man1/dwz.1*
|
||||
|
||||
%changelog
|
||||
* Wed Jan 20 2021 Jakub Jelinek <jakub@redhat.com> 0.13-6
|
||||
* Thu Jan 21 2021 Jakub Jelinek <jakub@redhat.com> 0.13-6
|
||||
- DW_FORM_implicit_const handling fixes (sw#27212, sw#27213)
|
||||
- temporarily remove odr tests as they are incompatible with DWARF 5 right now
|
||||
- temporarily build odr tests with -gdwarf-4 as they are incompatible with
|
||||
DWARF 5
|
||||
|
||||
* Mon Jan 18 2021 Jakub Jelinek <jakub@redhat.com> 0.13-5
|
||||
- update to latest git snapshot
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (dwz-20210118.tar.xz) = 093cf08413e88def02bd55adf8a2aa515ae79f6cb21bbab7b943785437fd333b72175ad4284acfd2cd878e7527018c9be86ed8e26a9a5b97dfff0004cc93189a
|
||||
SHA512 (dwz-20210121.tar.xz) = f35855856e1ed6b64f726382b2d63ee1de5b16e06ef83a115563e9f4b2d661419a5c82f5e0da219e98f8f67d6af8bc2a5122ce14bba6a70aa00d7bd14fff3d98
|
||||
|
||||
Loading…
Reference in New Issue
Block a user