0.176-3 - Add elfutils-0.176-elf-update.patch
This commit is contained in:
Mark Wielaard
parent
9989c790c6
commit
4fc3adb8b0
652
elfutils-0.176-elf-update.patch
Normal file
652
elfutils-0.176-elf-update.patch
Normal file
@ -0,0 +1,652 @@
|
||||
commit d7193bd7c9dc2a979352eee7fc446dacd3e97779
|
||||
Author: Mark Wielaard <mark@klomp.org>
|
||||
Date: Sun May 12 00:37:45 2019 +0200
|
||||
|
||||
libelf: Mark shdr_flags dirty if offset or size changes during update.
|
||||
|
||||
We forgot to mark the shdr_flags dirty when only the sh_size or
|
||||
sh_offset changed during elf_update (). This meant that if there were
|
||||
no other shdr changes we only wrote out the section data, but didn't
|
||||
write out the shdr table to the file.
|
||||
|
||||
Add a testcase that puts some sections in the reverse order and then
|
||||
writes out the resulting file again without doing any other
|
||||
updates. This would show the issue after write out of the
|
||||
(re-reversed) ELF file (the .shstrtab section offset would be wrong
|
||||
causing all section names to be garbage). Also run a self test.
|
||||
|
||||
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
||||
|
||||
diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
|
||||
index 2ce6a59..303055a 100644
|
||||
--- a/libelf/elf32_updatenull.c
|
||||
+++ b/libelf/elf32_updatenull.c
|
||||
@@ -366,12 +366,15 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum)
|
||||
}
|
||||
|
||||
/* See whether the section size is correct. */
|
||||
+ int size_changed = 0;
|
||||
update_if_changed (shdr->sh_size, (GElf_Word) offset,
|
||||
- changed);
|
||||
+ size_changed);
|
||||
+ changed |= size_changed;
|
||||
|
||||
if (shdr->sh_type != SHT_NOBITS)
|
||||
size += offset;
|
||||
|
||||
+ scn->shdr_flags |= (offset_changed | size_changed);
|
||||
scn->flags |= changed;
|
||||
}
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 80900e4..87428aa 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -60,7 +60,7 @@ check_PROGRAMS = arextract arsymtest newfile saridx scnnames sectiondump \
|
||||
fillfile dwarf_default_lower_bound dwarf-die-addr-die \
|
||||
get-units-invalid get-units-split attr-integrate-skel \
|
||||
all-dwarf-ranges unit-info next_cfi \
|
||||
- elfcopy addsections xlate_notes
|
||||
+ elfcopy addsections xlate_notes elfrdwrnop
|
||||
|
||||
asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
|
||||
asm-tst6 asm-tst7 asm-tst8 asm-tst9
|
||||
@@ -157,6 +157,7 @@ TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile test-nlist \
|
||||
run-all-dwarf-ranges.sh run-unit-info.sh \
|
||||
run-reloc-bpf.sh \
|
||||
run-next-cfi.sh run-next-cfi-self.sh \
|
||||
+ run-reverse-sections.sh run-reverse-sections-self.sh \
|
||||
run-copyadd-sections.sh run-copymany-sections.sh \
|
||||
run-typeiter-many.sh run-strip-test-many.sh \
|
||||
run-strip-version.sh run-xlate-note.sh
|
||||
@@ -419,6 +420,7 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \
|
||||
run-unit-info.sh run-next-cfi.sh run-next-cfi-self.sh \
|
||||
testfile-riscv64.bz2 testfile-riscv64-s.bz2 \
|
||||
testfile-riscv64-core.bz2 \
|
||||
+ run-reverse-sections.sh run-reverse-sections-self.sh \
|
||||
run-copyadd-sections.sh run-copymany-sections.sh \
|
||||
run-typeiter-many.sh run-strip-test-many.sh \
|
||||
testfile-debug-rel-ppc64-g.o.bz2 \
|
||||
@@ -598,6 +600,7 @@ next_cfi_LDADD = $(libelf) $(libdw)
|
||||
elfcopy_LDADD = $(libelf)
|
||||
addsections_LDADD = $(libelf)
|
||||
xlate_notes_LDADD = $(libelf)
|
||||
+elfrdwrnop_LDADD = $(libelf)
|
||||
|
||||
# We want to test the libelf header against the system elf.h header.
|
||||
# Don't include any -I CPPFLAGS. Except when we install our own elf.h.
|
||||
diff --git a/tests/elfcopy.c b/tests/elfcopy.c
|
||||
index 9000cc9..d457bad 100644
|
||||
--- a/tests/elfcopy.c
|
||||
+++ b/tests/elfcopy.c
|
||||
@@ -69,9 +69,11 @@ setshstrndx (Elf *elf, size_t ndx)
|
||||
|
||||
/* Copies all elements of an ELF file either using mmap or read. */
|
||||
static void
|
||||
-copy_elf (const char *in, const char *out, bool use_mmap)
|
||||
+copy_elf (const char *in, const char *out, bool use_mmap, bool reverse_offs)
|
||||
{
|
||||
- printf ("\ncopy_elf: %s -> %s (%s)\n", in, out, use_mmap ? "mmap" : "read");
|
||||
+ printf ("\ncopy_elf: %s -> %s (%s,%s)\n", in, out,
|
||||
+ use_mmap ? "mmap" : "read",
|
||||
+ reverse_offs ? "reverse" : "same");
|
||||
|
||||
/* Existing ELF file. */
|
||||
int fda = open (in, O_RDONLY);
|
||||
@@ -182,8 +184,28 @@ copy_elf (const char *in, const char *out, bool use_mmap)
|
||||
}
|
||||
}
|
||||
|
||||
+ GElf_Off *offs = NULL;
|
||||
+ size_t shnum;
|
||||
+ if (reverse_offs)
|
||||
+ {
|
||||
+ if (elf_getshdrnum (elfa, &shnum) < 0)
|
||||
+ {
|
||||
+ printf ("couldn't get shdrnum: %s\n", elf_errmsg (-1));
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ offs = (GElf_Off *) malloc (shnum * sizeof (GElf_Off));
|
||||
+ if (offs == NULL)
|
||||
+ {
|
||||
+ printf ("couldn't allocate memory for offs\n");
|
||||
+ exit (1);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/* Copy all sections, headers and data. */
|
||||
Elf_Scn *scn = NULL;
|
||||
+ size_t last_off = 0;
|
||||
+ GElf_Shdr last_shdr = { .sh_type = SHT_NULL };
|
||||
while ((scn = elf_nextscn (elfa, scn)) != NULL)
|
||||
{
|
||||
/* Get the header. */
|
||||
@@ -194,6 +216,34 @@ copy_elf (const char *in, const char *out, bool use_mmap)
|
||||
exit (1);
|
||||
}
|
||||
|
||||
+ if (reverse_offs)
|
||||
+ {
|
||||
+ offs[last_off] = shdr.sh_offset;
|
||||
+
|
||||
+ if (last_shdr.sh_type != SHT_NULL
|
||||
+ && last_shdr.sh_addralign == shdr.sh_addralign
|
||||
+ && shdr.sh_addralign == 1
|
||||
+ && last_shdr.sh_type != SHT_NOBITS
|
||||
+ && shdr.sh_type != SHT_NOBITS
|
||||
+ && (phnum == 0
|
||||
+ || ((shdr.sh_flags & SHF_ALLOC) == 0
|
||||
+ && (last_shdr.sh_flags & SHF_ALLOC) == 0)))
|
||||
+ {
|
||||
+ printf ("Swapping offsets of section %zd and %zd\n",
|
||||
+ last_off, last_off + 1);
|
||||
+ GElf_Word off = offs[last_off - 1];
|
||||
+ offs[last_off - 1] = off + shdr.sh_size;
|
||||
+ offs[last_off] = off;
|
||||
+ last_shdr.sh_type = SHT_NULL;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ last_shdr = shdr;
|
||||
+ offs[last_off] = shdr.sh_offset;
|
||||
+ }
|
||||
+ last_off++;
|
||||
+ }
|
||||
+
|
||||
/* Create new section. */
|
||||
Elf_Scn *new_scn = elf_newscn (elfb);
|
||||
if (new_scn == NULL)
|
||||
@@ -223,9 +273,34 @@ copy_elf (const char *in, const char *out, bool use_mmap)
|
||||
}
|
||||
}
|
||||
|
||||
- /* Write everything to disk. If there are any phdrs then we want
|
||||
- the exact same layout. Do we want ELF_F_PERMISSIVE? */
|
||||
- if (phnum > 0)
|
||||
+ if (reverse_offs)
|
||||
+ {
|
||||
+ last_off = 0;
|
||||
+ scn = NULL;
|
||||
+ while ((scn = elf_nextscn (elfb, scn)) != NULL)
|
||||
+ {
|
||||
+ GElf_Shdr shdr;
|
||||
+ if (gelf_getshdr (scn, &shdr) == NULL)
|
||||
+ {
|
||||
+ printf ("couldn't get shdr for updating: %s\n", elf_errmsg (-1));
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ shdr.sh_offset = offs[last_off++];
|
||||
+
|
||||
+ if (gelf_update_shdr (scn, &shdr) == 0)
|
||||
+ {
|
||||
+ printf ("couldn't update shdr sh_off: %s\n", elf_errmsg (-1));
|
||||
+ exit (1);
|
||||
+ }
|
||||
+ }
|
||||
+ free (offs);
|
||||
+ }
|
||||
+
|
||||
+ /* Write everything to disk. If there are any phdrs, or we want to
|
||||
+ update the offsets, then we want the exact same layout. Do we
|
||||
+ want ELF_F_PERMISSIVE? */
|
||||
+ if (phnum > 0 || reverse_offs)
|
||||
elf_flagelf (elfb, ELF_C_SET, ELF_F_LAYOUT);
|
||||
if (elf_update (elfb, ELF_C_WRITE) < 0)
|
||||
{
|
||||
@@ -264,9 +339,9 @@ main (int argc, const char *argv[])
|
||||
elf_version (EV_CURRENT);
|
||||
|
||||
/* Takes the given file, and create a new identical one. */
|
||||
- if (argc < 3 || argc > 4)
|
||||
+ if (argc < 3 || argc > 5)
|
||||
{
|
||||
- fprintf (stderr, "elfcopy [--mmap] in.elf out.elf\n");
|
||||
+ fprintf (stderr, "elfcopy [--mmap] [--reverse-offs] in.elf out.elf\n");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
@@ -278,9 +353,16 @@ main (int argc, const char *argv[])
|
||||
argn++;
|
||||
}
|
||||
|
||||
+ bool reverse_offs = false;
|
||||
+ if (strcmp (argv[argn], "--reverse-offs") == 0)
|
||||
+ {
|
||||
+ reverse_offs = true;
|
||||
+ argn++;
|
||||
+ }
|
||||
+
|
||||
const char *in = argv[argn++];
|
||||
const char *out = argv[argn];
|
||||
- copy_elf (in, out, use_mmap);
|
||||
+ copy_elf (in, out, use_mmap, reverse_offs);
|
||||
|
||||
return 0;
|
||||
}
|
||||
diff --git a/tests/elfrdwrnop.c b/tests/elfrdwrnop.c
|
||||
new file mode 100644
|
||||
index 0000000..997150b
|
||||
--- /dev/null
|
||||
+++ b/tests/elfrdwrnop.c
|
||||
@@ -0,0 +1,100 @@
|
||||
+/* Test program for reading and writing out the same file in-place
|
||||
+ Copyright (C) 2019 Red Hat, Inc.
|
||||
+ This file is part of elfutils.
|
||||
+
|
||||
+ This file is free software; you can redistribute it and/or modify
|
||||
+ it under the terms of the GNU General Public License as published by
|
||||
+ the Free Software Foundation; either version 3 of the License, or
|
||||
+ (at your option) any later version.
|
||||
+
|
||||
+ elfutils is distributed in the hope that it will be useful, but
|
||||
+ WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ GNU General Public License for more details.
|
||||
+
|
||||
+ You should have received a copy of the GNU General Public License
|
||||
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
+
|
||||
+
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+# include <config.h>
|
||||
+#endif
|
||||
+
|
||||
+#include <errno.h>
|
||||
+#include <fcntl.h>
|
||||
+#include <inttypes.h>
|
||||
+#include <stdbool.h>
|
||||
+#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
+#include <unistd.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/stat.h>
|
||||
+
|
||||
+#include ELFUTILS_HEADER(elf)
|
||||
+#include <gelf.h>
|
||||
+
|
||||
+
|
||||
+int
|
||||
+main (int argc, const char *argv[])
|
||||
+{
|
||||
+ /* Takes the given file, and create a new identical one. */
|
||||
+ if (argc != 2)
|
||||
+ {
|
||||
+ fprintf (stderr, "elfrdwrnop elf-file\n");
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ elf_version (EV_CURRENT);
|
||||
+
|
||||
+ const char *name = argv[1];
|
||||
+ printf ("elfrdwrdnop %s\n", name);
|
||||
+
|
||||
+ int fd = open (name, O_RDWR);
|
||||
+ if (fd < 0)
|
||||
+ {
|
||||
+ fprintf (stderr, "Couldn't open file '%s': %s\n",
|
||||
+ name, strerror (errno));
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ Elf *elf = elf_begin (fd, ELF_C_RDWR, NULL);
|
||||
+ if (elf == NULL)
|
||||
+ {
|
||||
+ fprintf (stderr, "Couldn't open ELF file '%s': %s\n",
|
||||
+ name, elf_errmsg (-1));
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ /* Write everything to disk. If there are any phdrs, then we want
|
||||
+ the exact same layout. */
|
||||
+ size_t phnum;
|
||||
+ if (elf_getphdrnum (elf, &phnum) != 0)
|
||||
+ {
|
||||
+ printf ("cannot get phdrs: %s\n", elf_errmsg (-1));
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ if (phnum > 0)
|
||||
+ elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT);
|
||||
+
|
||||
+ if (elf_update (elf, ELF_C_WRITE) < 0)
|
||||
+ {
|
||||
+ printf ("failure in elf_update: %s\n", elf_errmsg (-1));
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ if (elf_end (elf) != 0)
|
||||
+ {
|
||||
+ printf ("couldn't cleanup elf '%s': %s\n", name, elf_errmsg (-1));
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ if (close (fd) != 0)
|
||||
+ {
|
||||
+ printf ("couldn't close '%s': %s\n", name, strerror (errno));
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
diff --git a/tests/run-reverse-sections-self.sh b/tests/run-reverse-sections-self.sh
|
||||
new file mode 100755
|
||||
index 0000000..71afd6a
|
||||
--- /dev/null
|
||||
+++ b/tests/run-reverse-sections-self.sh
|
||||
@@ -0,0 +1,45 @@
|
||||
+#! /bin/sh
|
||||
+# Copyright (C) 2019 Red Hat, Inc.
|
||||
+# This file is part of elfutils.
|
||||
+#
|
||||
+# This file is free software; you can redistribute it and/or modify
|
||||
+# it under the terms of the GNU General Public License as published by
|
||||
+# the Free Software Foundation; either version 3 of the License, or
|
||||
+# (at your option) any later version.
|
||||
+#
|
||||
+# elfutils is distributed in the hope that it will be useful, but
|
||||
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+
|
||||
+. $srcdir/test-subr.sh
|
||||
+
|
||||
+test_reverse_self ()
|
||||
+{
|
||||
+ in_file="$1"
|
||||
+ base_name="$(basename ${in_file})"
|
||||
+ out_file="${base_name}.rev"
|
||||
+ out_file_mmap="${out_file}.mmap"
|
||||
+
|
||||
+ tempfiles ${out_file} ${out_file_mmap}
|
||||
+
|
||||
+ # Reverse the offsets (the files should still be the same otherwise)
|
||||
+ testrun ${abs_builddir}/elfcopy --reverse-offs ${in_file} ${out_file}
|
||||
+ testrun ${abs_top_builddir}/src/elfcmp ${in_file} ${out_file}
|
||||
+ testrun ${abs_top_builddir}/src/elflint --gnu ${out_file}
|
||||
+ # An in-place nop will likely revert them back
|
||||
+ testrun ${abs_builddir}/elfrdwrnop ${out_file}
|
||||
+ testrun ${abs_top_builddir}/src/elfcmp ${in_file} ${out_file}
|
||||
+ testrun ${abs_top_builddir}/src/elflint --gnu ${out_file}
|
||||
+}
|
||||
+
|
||||
+# Only really makes sense for ET_REL files, but try all, just to check
|
||||
+# it also works if we keep the order for the allocated sections.
|
||||
+for file in $self_test_files; do
|
||||
+ test_reverse_self $file
|
||||
+done
|
||||
+
|
||||
+exit 0
|
||||
diff --git a/tests/run-reverse-sections.sh b/tests/run-reverse-sections.sh
|
||||
new file mode 100755
|
||||
index 0000000..102a126
|
||||
--- /dev/null
|
||||
+++ b/tests/run-reverse-sections.sh
|
||||
@@ -0,0 +1,69 @@
|
||||
+#! /bin/sh
|
||||
+# Copyright (C) 2019 Red Hat, Inc.
|
||||
+# This file is part of elfutils.
|
||||
+#
|
||||
+# This file is free software; you can redistribute it and/or modify
|
||||
+# it under the terms of the GNU General Public License as published by
|
||||
+# the Free Software Foundation; either version 3 of the License, or
|
||||
+# (at your option) any later version.
|
||||
+#
|
||||
+# elfutils is distributed in the hope that it will be useful, but
|
||||
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+
|
||||
+. $srcdir/test-subr.sh
|
||||
+
|
||||
+test_reverse ()
|
||||
+{
|
||||
+ in_file="$1"
|
||||
+ out_file="${in_file}.rev"
|
||||
+ out_file_mmap="${out_file}.mmap"
|
||||
+
|
||||
+ testfiles ${in_file}
|
||||
+ tempfiles ${out_file} ${out_file_mmap}
|
||||
+
|
||||
+ # Reverse the offsets (the files should still be the same otherwise)
|
||||
+ testrun ${abs_builddir}/elfcopy --reverse-offs ${in_file} ${out_file}
|
||||
+ testrun ${abs_top_builddir}/src/elfcmp ${in_file} ${out_file}
|
||||
+ testrun ${abs_top_builddir}/src/elflint --gnu ${out_file}
|
||||
+ # An in-place nop will likely revert them back
|
||||
+ testrun ${abs_builddir}/elfrdwrnop ${out_file}
|
||||
+ testrun ${abs_top_builddir}/src/elfcmp ${in_file} ${out_file}
|
||||
+ testrun ${abs_top_builddir}/src/elflint --gnu ${out_file}
|
||||
+}
|
||||
+
|
||||
+# A collection of random testfiles to test 32/64bit, little/big endian
|
||||
+# and non-ET_REL (with phdrs)/ET_REL (without phdrs).
|
||||
+
|
||||
+# 32bit, big endian, rel
|
||||
+test_reverse testfile29
|
||||
+
|
||||
+# 64bit, big endian, rel
|
||||
+test_reverse testfile23
|
||||
+
|
||||
+# 32bit, little endian, rel
|
||||
+test_reverse testfile9
|
||||
+
|
||||
+# 64bit, little endian, rel
|
||||
+test_reverse testfile38
|
||||
+
|
||||
+# 32bit, big endian, non-rel
|
||||
+test_reverse testfile26
|
||||
+
|
||||
+# 64bit, big endian, non-rel
|
||||
+test_reverse testfile27
|
||||
+
|
||||
+# 32bit, little endian, non-rel
|
||||
+test_reverse testfile
|
||||
+
|
||||
+# 64bit, little endian, non-rel
|
||||
+# Don't use testfile10. It has section headers in the middle of the file.
|
||||
+# Same for testfile12. It is legal, but not the point of this testcase.
|
||||
+# test_reverse testfile10
|
||||
+test_reverse testfile13
|
||||
+
|
||||
+exit 0
|
||||
diff -ru elfutils-0.176.orig/tests/Makefile.in elfutils-0.176/tests/Makefile.in
|
||||
--- elfutils-0.176.orig/tests/Makefile.in 2019-06-03 14:57:17.223607024 +0200
|
||||
+++ elfutils-0.176/tests/Makefile.in 2019-06-03 14:58:32.671049626 +0200
|
||||
@@ -131,8 +131,8 @@
|
||||
get-units-invalid$(EXEEXT) get-units-split$(EXEEXT) \
|
||||
attr-integrate-skel$(EXEEXT) all-dwarf-ranges$(EXEEXT) \
|
||||
unit-info$(EXEEXT) next_cfi$(EXEEXT) elfcopy$(EXEEXT) \
|
||||
- addsections$(EXEEXT) xlate_notes$(EXEEXT) $(am__EXEEXT_1) \
|
||||
- $(am__EXEEXT_2) $(am__EXEEXT_4)
|
||||
+ addsections$(EXEEXT) xlate_notes$(EXEEXT) elfrdwrnop$(EXEEXT) \
|
||||
+ $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4)
|
||||
@BIARCH_TRUE@am__append_5 = backtrace-child-biarch
|
||||
TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile$(EXEEXT) \
|
||||
test-nlist$(EXEEXT) update1$(EXEEXT) update2$(EXEEXT) \
|
||||
@@ -209,7 +209,8 @@
|
||||
run-get-units-invalid.sh run-get-units-split.sh \
|
||||
run-attr-integrate-skel.sh run-all-dwarf-ranges.sh \
|
||||
run-unit-info.sh run-reloc-bpf.sh run-next-cfi.sh \
|
||||
- run-next-cfi-self.sh run-copyadd-sections.sh \
|
||||
+ run-next-cfi-self.sh run-reverse-sections.sh \
|
||||
+ run-reverse-sections-self.sh run-copyadd-sections.sh \
|
||||
run-copymany-sections.sh run-typeiter-many.sh \
|
||||
run-strip-test-many.sh run-strip-version.sh run-xlate-note.sh \
|
||||
$(am__EXEEXT_2) $(am__append_8) $(am__EXEEXT_5)
|
||||
@@ -451,6 +452,9 @@
|
||||
elfputzdata_SOURCES = elfputzdata.c
|
||||
elfputzdata_OBJECTS = elfputzdata.$(OBJEXT)
|
||||
elfputzdata_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
||||
+elfrdwrnop_SOURCES = elfrdwrnop.c
|
||||
+elfrdwrnop_OBJECTS = elfrdwrnop.$(OBJEXT)
|
||||
+elfrdwrnop_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
||||
elfshphehdr_SOURCES = elfshphehdr.c
|
||||
elfshphehdr_OBJECTS = elfshphehdr.$(OBJEXT)
|
||||
elfshphehdr_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
||||
@@ -660,13 +664,13 @@
|
||||
./$(DEPDIR)/early-offscn.Po ./$(DEPDIR)/ecp.Po \
|
||||
./$(DEPDIR)/elfcopy.Po ./$(DEPDIR)/elfgetchdr.Po \
|
||||
./$(DEPDIR)/elfgetzdata.Po ./$(DEPDIR)/elfputzdata.Po \
|
||||
- ./$(DEPDIR)/elfshphehdr.Po ./$(DEPDIR)/elfstrmerge.Po \
|
||||
- ./$(DEPDIR)/elfstrtab.Po ./$(DEPDIR)/emptyfile.Po \
|
||||
- ./$(DEPDIR)/fillfile.Po ./$(DEPDIR)/find-prologues.Po \
|
||||
- ./$(DEPDIR)/funcretval.Po ./$(DEPDIR)/funcscopes.Po \
|
||||
- ./$(DEPDIR)/get-aranges.Po ./$(DEPDIR)/get-files.Po \
|
||||
- ./$(DEPDIR)/get-lines.Po ./$(DEPDIR)/get-pubnames.Po \
|
||||
- ./$(DEPDIR)/get-units-invalid.Po \
|
||||
+ ./$(DEPDIR)/elfrdwrnop.Po ./$(DEPDIR)/elfshphehdr.Po \
|
||||
+ ./$(DEPDIR)/elfstrmerge.Po ./$(DEPDIR)/elfstrtab.Po \
|
||||
+ ./$(DEPDIR)/emptyfile.Po ./$(DEPDIR)/fillfile.Po \
|
||||
+ ./$(DEPDIR)/find-prologues.Po ./$(DEPDIR)/funcretval.Po \
|
||||
+ ./$(DEPDIR)/funcscopes.Po ./$(DEPDIR)/get-aranges.Po \
|
||||
+ ./$(DEPDIR)/get-files.Po ./$(DEPDIR)/get-lines.Po \
|
||||
+ ./$(DEPDIR)/get-pubnames.Po ./$(DEPDIR)/get-units-invalid.Po \
|
||||
./$(DEPDIR)/get-units-split.Po ./$(DEPDIR)/getsrc_die.Po \
|
||||
./$(DEPDIR)/hash.Po ./$(DEPDIR)/line2addr.Po \
|
||||
./$(DEPDIR)/low_high_pc.Po ./$(DEPDIR)/msg_tst.Po \
|
||||
@@ -718,19 +722,19 @@
|
||||
dwfl-bug-getmodules.c dwfl-bug-report.c dwfl-proc-attach.c \
|
||||
dwfl-report-elf-align.c dwfllines.c dwflmodtest.c dwflsyms.c \
|
||||
early-offscn.c ecp.c elfcopy.c elfgetchdr.c elfgetzdata.c \
|
||||
- elfputzdata.c elfshphehdr.c elfstrmerge.c elfstrtab.c \
|
||||
- emptyfile.c fillfile.c find-prologues.c funcretval.c \
|
||||
- funcscopes.c get-aranges.c get-files.c get-lines.c \
|
||||
- get-pubnames.c get-units-invalid.c get-units-split.c \
|
||||
- getsrc_die.c hash.c line2addr.c low_high_pc.c msg_tst.c \
|
||||
- newdata.c newfile.c newscn.c next-files.c next-lines.c \
|
||||
- next_cfi.c peel_type.c rdwrmmap.c rerequest_tag.c saridx.c \
|
||||
- scnnames.c sectiondump.c show-abbrev.c show-die-info.c \
|
||||
- showptable.c strptr.c system-elf-libelf-test.c \
|
||||
- test-elf_cntl_gelf_getshdr.c test-flag-nobits.c test-nlist.c \
|
||||
- typeiter.c typeiter2.c unit-info.c update1.c update2.c \
|
||||
- update3.c update4.c varlocs.c vdsosyms.c vendorelf.c \
|
||||
- xlate_notes.c zstrptr.c
|
||||
+ elfputzdata.c elfrdwrnop.c elfshphehdr.c elfstrmerge.c \
|
||||
+ elfstrtab.c emptyfile.c fillfile.c find-prologues.c \
|
||||
+ funcretval.c funcscopes.c get-aranges.c get-files.c \
|
||||
+ get-lines.c get-pubnames.c get-units-invalid.c \
|
||||
+ get-units-split.c getsrc_die.c hash.c line2addr.c \
|
||||
+ low_high_pc.c msg_tst.c newdata.c newfile.c newscn.c \
|
||||
+ next-files.c next-lines.c next_cfi.c peel_type.c rdwrmmap.c \
|
||||
+ rerequest_tag.c saridx.c scnnames.c sectiondump.c \
|
||||
+ show-abbrev.c show-die-info.c showptable.c strptr.c \
|
||||
+ system-elf-libelf-test.c test-elf_cntl_gelf_getshdr.c \
|
||||
+ test-flag-nobits.c test-nlist.c typeiter.c typeiter2.c \
|
||||
+ unit-info.c update1.c update2.c update3.c update4.c varlocs.c \
|
||||
+ vdsosyms.c vendorelf.c xlate_notes.c zstrptr.c
|
||||
DIST_SOURCES = addrcfi.c addrscopes.c addsections.c aggregate_size.c \
|
||||
all-dwarf-ranges.c alldts.c allfcts.c allregs.c arextract.c \
|
||||
arls.c arsymtest.c asm-tst1.c asm-tst2.c asm-tst3.c asm-tst4.c \
|
||||
@@ -745,19 +749,19 @@
|
||||
dwfl-bug-getmodules.c dwfl-bug-report.c dwfl-proc-attach.c \
|
||||
dwfl-report-elf-align.c dwfllines.c dwflmodtest.c dwflsyms.c \
|
||||
early-offscn.c ecp.c elfcopy.c elfgetchdr.c elfgetzdata.c \
|
||||
- elfputzdata.c elfshphehdr.c elfstrmerge.c elfstrtab.c \
|
||||
- emptyfile.c fillfile.c find-prologues.c funcretval.c \
|
||||
- funcscopes.c get-aranges.c get-files.c get-lines.c \
|
||||
- get-pubnames.c get-units-invalid.c get-units-split.c \
|
||||
- getsrc_die.c hash.c line2addr.c low_high_pc.c msg_tst.c \
|
||||
- newdata.c newfile.c newscn.c next-files.c next-lines.c \
|
||||
- next_cfi.c peel_type.c rdwrmmap.c rerequest_tag.c saridx.c \
|
||||
- scnnames.c sectiondump.c show-abbrev.c show-die-info.c \
|
||||
- showptable.c strptr.c system-elf-libelf-test.c \
|
||||
- test-elf_cntl_gelf_getshdr.c test-flag-nobits.c test-nlist.c \
|
||||
- typeiter.c typeiter2.c unit-info.c update1.c update2.c \
|
||||
- update3.c update4.c varlocs.c vdsosyms.c vendorelf.c \
|
||||
- xlate_notes.c zstrptr.c
|
||||
+ elfputzdata.c elfrdwrnop.c elfshphehdr.c elfstrmerge.c \
|
||||
+ elfstrtab.c emptyfile.c fillfile.c find-prologues.c \
|
||||
+ funcretval.c funcscopes.c get-aranges.c get-files.c \
|
||||
+ get-lines.c get-pubnames.c get-units-invalid.c \
|
||||
+ get-units-split.c getsrc_die.c hash.c line2addr.c \
|
||||
+ low_high_pc.c msg_tst.c newdata.c newfile.c newscn.c \
|
||||
+ next-files.c next-lines.c next_cfi.c peel_type.c rdwrmmap.c \
|
||||
+ rerequest_tag.c saridx.c scnnames.c sectiondump.c \
|
||||
+ show-abbrev.c show-die-info.c showptable.c strptr.c \
|
||||
+ system-elf-libelf-test.c test-elf_cntl_gelf_getshdr.c \
|
||||
+ test-flag-nobits.c test-nlist.c typeiter.c typeiter2.c \
|
||||
+ unit-info.c update1.c update2.c update3.c update4.c varlocs.c \
|
||||
+ vdsosyms.c vendorelf.c xlate_notes.c zstrptr.c
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
@@ -1405,6 +1409,7 @@
|
||||
run-unit-info.sh run-next-cfi.sh run-next-cfi-self.sh \
|
||||
testfile-riscv64.bz2 testfile-riscv64-s.bz2 \
|
||||
testfile-riscv64-core.bz2 \
|
||||
+ run-reverse-sections.sh run-reverse-sections-self.sh \
|
||||
run-copyadd-sections.sh run-copymany-sections.sh \
|
||||
run-typeiter-many.sh run-strip-test-many.sh \
|
||||
testfile-debug-rel-ppc64-g.o.bz2 \
|
||||
@@ -1566,6 +1571,7 @@
|
||||
elfcopy_LDADD = $(libelf)
|
||||
addsections_LDADD = $(libelf)
|
||||
xlate_notes_LDADD = $(libelf)
|
||||
+elfrdwrnop_LDADD = $(libelf)
|
||||
|
||||
# We want to test the libelf header against the system elf.h header.
|
||||
# Don't include any -I CPPFLAGS. Except when we install our own elf.h.
|
||||
@@ -1822,6 +1828,10 @@
|
||||
@rm -f elfputzdata$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(elfputzdata_OBJECTS) $(elfputzdata_LDADD) $(LIBS)
|
||||
|
||||
+elfrdwrnop$(EXEEXT): $(elfrdwrnop_OBJECTS) $(elfrdwrnop_DEPENDENCIES) $(EXTRA_elfrdwrnop_DEPENDENCIES)
|
||||
+ @rm -f elfrdwrnop$(EXEEXT)
|
||||
+ $(AM_V_CCLD)$(LINK) $(elfrdwrnop_OBJECTS) $(elfrdwrnop_LDADD) $(LIBS)
|
||||
+
|
||||
elfshphehdr$(EXEEXT): $(elfshphehdr_OBJECTS) $(elfshphehdr_DEPENDENCIES) $(EXTRA_elfshphehdr_DEPENDENCIES)
|
||||
@rm -f elfshphehdr$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(elfshphehdr_OBJECTS) $(elfshphehdr_LDADD) $(LIBS)
|
||||
@@ -2086,6 +2096,7 @@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfgetchdr.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfgetzdata.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfputzdata.Po@am__quote@ # am--include-marker
|
||||
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfrdwrnop.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfshphehdr.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfstrmerge.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfstrtab.Po@am__quote@ # am--include-marker
|
||||
@@ -3709,6 +3720,20 @@
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
+run-reverse-sections.sh.log: run-reverse-sections.sh
|
||||
+ @p='run-reverse-sections.sh'; \
|
||||
+ b='run-reverse-sections.sh'; \
|
||||
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
+ --log-file $$b.log --trs-file $$b.trs \
|
||||
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
+run-reverse-sections-self.sh.log: run-reverse-sections-self.sh
|
||||
+ @p='run-reverse-sections-self.sh'; \
|
||||
+ b='run-reverse-sections-self.sh'; \
|
||||
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
+ --log-file $$b.log --trs-file $$b.trs \
|
||||
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
run-copyadd-sections.sh.log: run-copyadd-sections.sh
|
||||
@p='run-copyadd-sections.sh'; \
|
||||
b='run-copyadd-sections.sh'; \
|
||||
@@ -3997,6 +4022,7 @@
|
||||
-rm -f ./$(DEPDIR)/elfgetchdr.Po
|
||||
-rm -f ./$(DEPDIR)/elfgetzdata.Po
|
||||
-rm -f ./$(DEPDIR)/elfputzdata.Po
|
||||
+ -rm -f ./$(DEPDIR)/elfrdwrnop.Po
|
||||
-rm -f ./$(DEPDIR)/elfshphehdr.Po
|
||||
-rm -f ./$(DEPDIR)/elfstrmerge.Po
|
||||
-rm -f ./$(DEPDIR)/elfstrtab.Po
|
||||
@@ -4147,6 +4173,7 @@
|
||||
-rm -f ./$(DEPDIR)/elfgetchdr.Po
|
||||
-rm -f ./$(DEPDIR)/elfgetzdata.Po
|
||||
-rm -f ./$(DEPDIR)/elfputzdata.Po
|
||||
+ -rm -f ./$(DEPDIR)/elfrdwrnop.Po
|
||||
-rm -f ./$(DEPDIR)/elfshphehdr.Po
|
||||
-rm -f ./$(DEPDIR)/elfstrmerge.Po
|
||||
-rm -f ./$(DEPDIR)/elfstrtab.Po
|
||||
@ -1,7 +1,7 @@
|
||||
Name: elfutils
|
||||
Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
|
||||
Version: 0.176
|
||||
%global baserelease 2
|
||||
%global baserelease 3
|
||||
URL: http://elfutils.org/
|
||||
%global source_url ftp://sourceware.org/pub/elfutils/%{version}/
|
||||
License: GPLv3+ and (GPLv2+ or LGPLv3+)
|
||||
@ -22,6 +22,7 @@ Source: %{?source_url}%{name}-%{version}.tar.bz2
|
||||
Patch1: elfutils-0.176-gcc-pr88835.patch
|
||||
Patch2: elfutils-0.176-pt-gnu-prop.patch
|
||||
Patch3: elfutils-0.176-xlate-note.patch
|
||||
Patch4: elfutils-0.176-elf-update.patch
|
||||
|
||||
Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
|
||||
Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
|
||||
@ -186,6 +187,7 @@ profiling) of processes.
|
||||
%patch1 -p1 -b .gcc-pr88835
|
||||
%patch2 -p1 -b .pt-gnu-prop
|
||||
%patch3 -p1 -b .xlate-note
|
||||
%patch4 -p1 -b .elf-update
|
||||
|
||||
# In case the above patches added any new test scripts, make sure they
|
||||
# are executable.
|
||||
@ -200,6 +202,7 @@ find . -name \*.sh ! -perm -0100 -print | xargs chmod +x
|
||||
RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-Wall/}"
|
||||
RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wformat"
|
||||
|
||||
|
||||
trap 'cat config.log' EXIT
|
||||
%configure CFLAGS="$RPM_OPT_FLAGS -fexceptions"
|
||||
trap '' EXIT
|
||||
@ -318,6 +321,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jun 3 2019 Mark Wielaard <mjw@fedoraproject.org> - 0.176-3
|
||||
- Add elfutils-0.176-elf-update.patch
|
||||
|
||||
* Tue Apr 30 2019 Mark Wielaard <mjw@fedoraproject.org> - 0.176-2
|
||||
- Update elfutils-0.176-gcc-pr88835.patch.
|
||||
- Add elfutils-0.176-pt-gnu-prop.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user