elfutils 0.178
This commit is contained in:
parent
f49aa7b56a
commit
9c6a7b3265
1
.gitignore
vendored
1
.gitignore
vendored
@ -18,3 +18,4 @@
|
|||||||
/elfutils-0.175.tar.bz2
|
/elfutils-0.175.tar.bz2
|
||||||
/elfutils-0.176.tar.bz2
|
/elfutils-0.176.tar.bz2
|
||||||
/elfutils-0.177.tar.bz2
|
/elfutils-0.177.tar.bz2
|
||||||
|
/elfutils-0.178.tar.bz2
|
||||||
|
@ -1,664 +0,0 @@
|
|||||||
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
|
|
||||||
diff --git a/tests/elfcopy.c b/tests/elfcopy.c
|
|
||||||
index d457bad..4542222 100644
|
|
||||||
--- a/tests/elfcopy.c
|
|
||||||
+++ b/tests/elfcopy.c
|
|
||||||
@@ -225,6 +225,7 @@ copy_elf (const char *in, const char *out, bool use_mmap, bool reverse_offs)
|
|
||||||
&& shdr.sh_addralign == 1
|
|
||||||
&& last_shdr.sh_type != SHT_NOBITS
|
|
||||||
&& shdr.sh_type != SHT_NOBITS
|
|
||||||
+ && last_shdr.sh_offset + last_shdr.sh_size == shdr.sh_offset
|
|
||||||
&& (phnum == 0
|
|
||||||
|| ((shdr.sh_flags & SHF_ALLOC) == 0
|
|
||||||
&& (last_shdr.sh_flags & SHF_ALLOC) == 0)))
|
|
@ -1,29 +0,0 @@
|
|||||||
Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88835
|
|
||||||
|
|
||||||
diff --git a/tests/backtrace.c b/tests/backtrace.c
|
|
||||||
index 05e8ef8..d621fbf 100644
|
|
||||||
--- a/tests/backtrace.c
|
|
||||||
+++ b/tests/backtrace.c
|
|
||||||
@@ -185,7 +185,7 @@ frame_callback (Dwfl_Frame *state, void *frame_arg)
|
|
||||||
symname = dwfl_module_addrname (mod, pc_adjusted);
|
|
||||||
|
|
||||||
printf ("#%2d %#" PRIx64 "%4s\t%s\n", *framenop, (uint64_t) pc,
|
|
||||||
- ! isactivation ? "- 1" : "", symname);
|
|
||||||
+ ! isactivation ? "- 1" : "", symname ?: "<null>");
|
|
||||||
pid_t tid = dwfl_thread_tid (thread);
|
|
||||||
callback_verify (tid, *framenop, pc, symname, dwfl);
|
|
||||||
(*framenop)++;
|
|
||||||
|
|
||||||
diff --git a/tests/backtrace-dwarf.c b/tests/backtrace-dwarf.c
|
|
||||||
index dfbf185..f446bc3 100644
|
|
||||||
--- a/tests/backtrace-dwarf.c
|
|
||||||
+++ b/tests/backtrace-dwarf.c
|
|
||||||
@@ -101,7 +101,7 @@ frame_callback (Dwfl_Frame *state, void *frame_arg)
|
|
||||||
if (mod)
|
|
||||||
symname = dwfl_module_addrname (mod, pc_adjusted);
|
|
||||||
|
|
||||||
- printf ("%#" PRIx64 "\t%s\n", (uint64_t) pc, symname);
|
|
||||||
+ printf ("%#" PRIx64 "\t%s\n", (uint64_t) pc, symname ?: "<null>");
|
|
||||||
|
|
||||||
if (symname && (strcmp (symname, "main") == 0
|
|
||||||
|| strcmp (symname, ".main") == 0))
|
|
@ -1,26 +0,0 @@
|
|||||||
commit f03ac75239e0981deaf4aa18f66f423bcc5ce051
|
|
||||||
Author: Mark Wielaard <mark@klomp.org>
|
|
||||||
Date: Wed Mar 27 21:54:06 2019 +0100
|
|
||||||
|
|
||||||
strip: Files with symbols referring to non-existing sections are illformed
|
|
||||||
|
|
||||||
The check added in commit 4540ea98c "strip: Fix check test for SHN_XINDEX
|
|
||||||
symbol" was not complete. The (extended) section index should also exist.
|
|
||||||
If it doesn't exist, mark the file as illformed.
|
|
||||||
|
|
||||||
https://sourceware.org/bugzilla/show_bug.cgi?id=24385
|
|
||||||
|
|
||||||
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
|
||||||
|
|
||||||
diff --git a/src/strip.c b/src/strip.c
|
|
||||||
index a73009d9..4cd87506 100644
|
|
||||||
--- a/src/strip.c
|
|
||||||
+++ b/src/strip.c
|
|
||||||
@@ -1975,6 +1975,7 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname,
|
|
||||||
&& shndxdata->d_buf != NULL);
|
|
||||||
size_t sidx = (sym->st_shndx != SHN_XINDEX
|
|
||||||
? sym->st_shndx : xshndx);
|
|
||||||
+ elf_assert (sidx < shnum);
|
|
||||||
sec = shdr_info[sidx].idx;
|
|
||||||
|
|
||||||
if (sec != 0)
|
|
@ -1,486 +0,0 @@
|
|||||||
commit 28b5f578ae772bb2404c3847e4e22ad1c407af54
|
|
||||||
Author: Mark Wielaard <mark@klomp.org>
|
|
||||||
Date: Tue Apr 30 13:00:17 2019 +0200
|
|
||||||
|
|
||||||
libelf: If xlate can only convert the ELF note header, just do that.
|
|
||||||
|
|
||||||
When we started parsing new style ELF_T_NHDR8 notes we added extra
|
|
||||||
checks on alignment and padding. When those failed we would stop
|
|
||||||
converting and just return the rest of the ELF Note unconverted.
|
|
||||||
In the case were we just had enough data for just the ELF Note header
|
|
||||||
and the destionation and source weren't the same we would then
|
|
||||||
accidentially throw away the Note header conversion we just did.
|
|
||||||
|
|
||||||
Fix that by indicating we did correctly convert just the header.
|
|
||||||
|
|
||||||
Adds testcase that compares parsing ELF notes with gelf_getnote
|
|
||||||
and parsing the raw data by hand using elf32_xlatetom using just
|
|
||||||
the Note header and ignoring the (raw) note data.
|
|
||||||
|
|
||||||
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
|
||||||
|
|
||||||
diff --git a/libelf/note_xlate.h b/libelf/note_xlate.h
|
|
||||||
index bc9950f..7e2784b 100644
|
|
||||||
--- a/libelf/note_xlate.h
|
|
||||||
+++ b/libelf/note_xlate.h
|
|
||||||
@@ -47,13 +47,25 @@ elf_cvt_note (void *dest, const void *src, size_t len, int encode,
|
|
||||||
note_len += n->n_namesz;
|
|
||||||
note_len = nhdr8 ? NOTE_ALIGN8 (note_len) : NOTE_ALIGN4 (note_len);
|
|
||||||
if (note_len > len || note_len < sizeof *n)
|
|
||||||
- break;
|
|
||||||
+ {
|
|
||||||
+ /* Header was translated, nothing else. */
|
|
||||||
+ len -= sizeof *n;
|
|
||||||
+ src += sizeof *n;
|
|
||||||
+ dest += sizeof *n;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* data as a whole needs to be aligned. */
|
|
||||||
note_len += n->n_descsz;
|
|
||||||
note_len = nhdr8 ? NOTE_ALIGN8 (note_len) : NOTE_ALIGN4 (note_len);
|
|
||||||
if (note_len > len || note_len < sizeof *n)
|
|
||||||
- break;
|
|
||||||
+ {
|
|
||||||
+ /* Header was translated, nothing else. */
|
|
||||||
+ len -= sizeof *n;
|
|
||||||
+ src += sizeof *n;
|
|
||||||
+ dest += sizeof *n;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* Copy or skip the note data. */
|
|
||||||
size_t note_data_len = note_len - sizeof *n;
|
|
||||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
||||||
index 1b0c7d3..498c1db 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
|
|
||||||
+ elfcopy addsections xlate_notes
|
|
||||||
|
|
||||||
asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
|
|
||||||
asm-tst6 asm-tst7 asm-tst8 asm-tst9
|
|
||||||
@@ -159,7 +159,7 @@ TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile test-nlist \
|
|
||||||
run-next-cfi.sh run-next-cfi-self.sh \
|
|
||||||
run-copyadd-sections.sh run-copymany-sections.sh \
|
|
||||||
run-typeiter-many.sh run-strip-test-many.sh \
|
|
||||||
- run-strip-version.sh
|
|
||||||
+ run-strip-version.sh run-xlate-note.sh
|
|
||||||
|
|
||||||
if !BIARCH
|
|
||||||
export ELFUTILS_DISABLE_BIARCH = 1
|
|
||||||
@@ -423,7 +423,8 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \
|
|
||||||
testfile-debug-rel-ppc64-g.o.bz2 \
|
|
||||||
testfile-debug-rel-ppc64-z.o.bz2 \
|
|
||||||
testfile-debug-rel-ppc64.o.bz2 \
|
|
||||||
- run-strip-version.sh testfile-version.bz2
|
|
||||||
+ run-strip-version.sh testfile-version.bz2 \
|
|
||||||
+ run-xlate-note.sh
|
|
||||||
|
|
||||||
if USE_VALGRIND
|
|
||||||
valgrind_cmd='valgrind -q --leak-check=full --error-exitcode=1'
|
|
||||||
@@ -593,6 +594,7 @@ unit_info_LDADD = $(libdw)
|
|
||||||
next_cfi_LDADD = $(libelf) $(libdw)
|
|
||||||
elfcopy_LDADD = $(libelf)
|
|
||||||
addsections_LDADD = $(libelf)
|
|
||||||
+xlate_notes_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/run-xlate-note.sh b/tests/run-xlate-note.sh
|
|
||||||
new file mode 100755
|
|
||||||
index 0000000..a907418
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/run-xlate-note.sh
|
|
||||||
@@ -0,0 +1,93 @@
|
|
||||||
+# 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
|
|
||||||
+
|
|
||||||
+testfiles testfileppc32
|
|
||||||
+testrun_compare ${abs_top_builddir}/tests/xlate_notes testfileppc32 << EOF
|
|
||||||
+Notes in section 2:
|
|
||||||
+type: 1,1, namesz: 4,4, descsz: 16,16
|
|
||||||
+Notes in section 3:
|
|
||||||
+type: 3,3, namesz: 4,4, descsz: 20,20
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+testfiles testfileppc64
|
|
||||||
+testrun_compare ${abs_top_builddir}/tests/xlate_notes testfileppc64 << EOF
|
|
||||||
+Notes in section 2:
|
|
||||||
+type: 1,1, namesz: 4,4, descsz: 16,16
|
|
||||||
+Notes in section 3:
|
|
||||||
+type: 3,3, namesz: 4,4, descsz: 20,20
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+testfiles testfiles390
|
|
||||||
+testrun_compare ${abs_top_builddir}/tests/xlate_notes testfiles390 << EOF
|
|
||||||
+Notes in section 2:
|
|
||||||
+type: 1,1, namesz: 4,4, descsz: 16,16
|
|
||||||
+Notes in section 3:
|
|
||||||
+type: 3,3, namesz: 4,4, descsz: 20,20
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+testfiles testfiles390x
|
|
||||||
+testrun_compare ${abs_top_builddir}/tests/xlate_notes testfiles390x << EOF
|
|
||||||
+Notes in section 2:
|
|
||||||
+type: 1,1, namesz: 4,4, descsz: 16,16
|
|
||||||
+Notes in section 3:
|
|
||||||
+type: 3,3, namesz: 4,4, descsz: 20,20
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+testfiles testfileaarch64
|
|
||||||
+testrun_compare ${abs_top_builddir}/tests/xlate_notes testfileaarch64 << EOF
|
|
||||||
+Notes in section 2:
|
|
||||||
+type: 1,1, namesz: 4,4, descsz: 16,16
|
|
||||||
+Notes in section 3:
|
|
||||||
+type: 3,3, namesz: 4,4, descsz: 20,20
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+testfiles testfilearm
|
|
||||||
+testrun_compare ${abs_top_builddir}/tests/xlate_notes testfilearm << EOF
|
|
||||||
+Notes in section 2:
|
|
||||||
+type: 1,1, namesz: 4,4, descsz: 16,16
|
|
||||||
+Notes in section 3:
|
|
||||||
+type: 3,3, namesz: 4,4, descsz: 20,20
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+testfiles testfile_gnu_props.32be.o
|
|
||||||
+testrun_compare ${abs_top_builddir}/tests/xlate_notes testfile_gnu_props.32be.o << EOF
|
|
||||||
+Notes in section 4:
|
|
||||||
+type: 5,5, namesz: 4,4, descsz: 12,12
|
|
||||||
+type: 5,5, namesz: 4,4, descsz: 8,8
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+testfiles testfile_gnu_props.32le.o
|
|
||||||
+testrun_compare ${abs_top_builddir}/tests/xlate_notes testfile_gnu_props.32le.o << EOF
|
|
||||||
+Notes in section 4:
|
|
||||||
+type: 5,5, namesz: 4,4, descsz: 12,12
|
|
||||||
+type: 5,5, namesz: 4,4, descsz: 8,8
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+testfiles testfile_gnu_props.64be.o
|
|
||||||
+testrun_compare ${abs_top_builddir}/tests/xlate_notes testfile_gnu_props.64be.o << EOF
|
|
||||||
+Notes in section 4:
|
|
||||||
+type: 5,5, namesz: 4,4, descsz: 16,16
|
|
||||||
+type: 5,5, namesz: 4,4, descsz: 8,8
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+testfiles testfile_gnu_props.64le.o
|
|
||||||
+testrun_compare ${abs_top_builddir}/tests/xlate_notes testfile_gnu_props.64le.o << EOF
|
|
||||||
+Notes in section 4:
|
|
||||||
+type: 5,5, namesz: 4,4, descsz: 16,16
|
|
||||||
+type: 5,5, namesz: 4,4, descsz: 8,8
|
|
||||||
+EOF
|
|
||||||
diff --git a/tests/xlate_notes.c b/tests/xlate_notes.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..90a4ae2
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/xlate_notes.c
|
|
||||||
@@ -0,0 +1,157 @@
|
|
||||||
+/* Test program for extracting ELF Note headers and getting whole notes.
|
|
||||||
+ 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 <stdio.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#include <string.h>
|
|
||||||
+#include <unistd.h>
|
|
||||||
+
|
|
||||||
+#include ELFUTILS_HEADER(elf)
|
|
||||||
+#include <gelf.h>
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+main (int argc, char *argv[])
|
|
||||||
+{
|
|
||||||
+ if (argc != 2)
|
|
||||||
+ {
|
|
||||||
+ printf ("No ELF file given as argument\n");
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ const char *fname = argv[1];
|
|
||||||
+
|
|
||||||
+ // Initialize libelf.
|
|
||||||
+ elf_version (EV_CURRENT);
|
|
||||||
+
|
|
||||||
+ /* Read the ELF from disk now. */
|
|
||||||
+ int fd = open (fname, O_RDONLY);
|
|
||||||
+ if (fd == -1)
|
|
||||||
+ {
|
|
||||||
+ printf ("cannot open '%s': %s\n", fname, strerror (errno));
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ Elf *elf = elf_begin (fd, ELF_C_READ, NULL);
|
|
||||||
+ if (elf == NULL)
|
|
||||||
+ {
|
|
||||||
+ printf ("cannot create ELF descriptor: %s\n", elf_errmsg (-1));
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ GElf_Ehdr ehdr;
|
|
||||||
+ if (gelf_getehdr (elf, &ehdr) == NULL)
|
|
||||||
+ {
|
|
||||||
+ printf ("cannot get Ehdr: %s\n", elf_errmsg (-1));
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Search for all SHT_NOTE sections. */
|
|
||||||
+ Elf_Scn *scn = NULL;
|
|
||||||
+ while ((scn = elf_nextscn (elf, scn)) != NULL)
|
|
||||||
+ {
|
|
||||||
+ /* Get the header. */
|
|
||||||
+ GElf_Shdr shdr;
|
|
||||||
+ if (gelf_getshdr (scn, &shdr) == NULL)
|
|
||||||
+ {
|
|
||||||
+ printf ("couldn't get shdr: %s\n", elf_errmsg (-1));
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (shdr.sh_type == SHT_NOTE)
|
|
||||||
+ {
|
|
||||||
+ printf ("Notes in section %zd:\n", elf_ndxscn (scn));
|
|
||||||
+
|
|
||||||
+ Elf_Data *raw = elf_rawdata (scn, NULL);
|
|
||||||
+ if (raw == NULL)
|
|
||||||
+ {
|
|
||||||
+ printf ("couldn't get raw data: %s\n", elf_errmsg (-1));
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ Elf_Data *data = elf_getdata (scn, NULL);
|
|
||||||
+ if (data == NULL)
|
|
||||||
+ {
|
|
||||||
+ printf ("couldn't get data: %s\n", elf_errmsg (-1));
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ size_t off = 0;
|
|
||||||
+ size_t next;
|
|
||||||
+ GElf_Nhdr nhdr;
|
|
||||||
+ size_t n_off;
|
|
||||||
+ size_t d_off;
|
|
||||||
+ while ((next = gelf_getnote (data, off, &nhdr, &n_off, &d_off)) > 0)
|
|
||||||
+ {
|
|
||||||
+ /* Now just get the note header "raw" (don't
|
|
||||||
+ copy/translate the note data). This only handles
|
|
||||||
+ traditional GNU ELF Notes, so we still use the next
|
|
||||||
+ from gelf_getnote (padding is different for new style
|
|
||||||
+ ELF_T_NHDR8 notes). */
|
|
||||||
+ Elf32_Nhdr nh;
|
|
||||||
+ Elf_Data src =
|
|
||||||
+ {
|
|
||||||
+ .d_version = EV_CURRENT, .d_type = ELF_T_NHDR,
|
|
||||||
+ .d_size = sizeof nh
|
|
||||||
+ };
|
|
||||||
+ Elf_Data dst = src;
|
|
||||||
+ src.d_buf = raw->d_buf + off;
|
|
||||||
+ dst.d_buf = &nh;
|
|
||||||
+
|
|
||||||
+ if (elf32_xlatetom (&dst, &src, ehdr.e_ident[EI_DATA]) == NULL)
|
|
||||||
+ {
|
|
||||||
+ printf ("couldn't xlate note: %s\n", elf_errmsg (-1));
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ printf ("type: %" PRId32 ",%" PRId32
|
|
||||||
+ ", namesz: %" PRId32 ",%" PRId32
|
|
||||||
+ ", descsz: %" PRId32 ",%" PRId32 "\n",
|
|
||||||
+ nhdr.n_type, nh.n_type,
|
|
||||||
+ nhdr.n_namesz, nh.n_namesz,
|
|
||||||
+ nhdr.n_descsz, nh.n_descsz);
|
|
||||||
+
|
|
||||||
+ if (nhdr.n_type != nh.n_type
|
|
||||||
+ || nhdr.n_namesz != nh.n_namesz
|
|
||||||
+ || nhdr.n_descsz != nh.n_descsz)
|
|
||||||
+ {
|
|
||||||
+ printf ("Nhdrs not equal!\n");
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ off = next;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (elf_end (elf) != 0)
|
|
||||||
+ {
|
|
||||||
+ printf ("failure in elf_end: %s\n", elf_errmsg (-1));
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ close (fd);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
diff -ur elfutils-0.176.orig/tests/Makefile.in elfutils-0.176/tests/Makefile.in
|
|
||||||
--- elfutils-0.176.orig/tests/Makefile.in 2019-04-30 22:42:49.534655124 +0200
|
|
||||||
+++ elfutils-0.176/tests/Makefile.in 2019-04-30 22:46:30.046656790 +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) $(am__EXEEXT_1) $(am__EXEEXT_2) \
|
|
||||||
- $(am__EXEEXT_4)
|
|
||||||
+ addsections$(EXEEXT) xlate_notes$(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) \
|
|
||||||
@@ -211,8 +211,8 @@
|
|
||||||
run-unit-info.sh run-reloc-bpf.sh run-next-cfi.sh \
|
|
||||||
run-next-cfi-self.sh run-copyadd-sections.sh \
|
|
||||||
run-copymany-sections.sh run-typeiter-many.sh \
|
|
||||||
- run-strip-test-many.sh run-strip-version.sh $(am__EXEEXT_2) \
|
|
||||||
- $(am__append_8) $(am__EXEEXT_5)
|
|
||||||
+ run-strip-test-many.sh run-strip-version.sh run-xlate-note.sh \
|
|
||||||
+ $(am__EXEEXT_2) $(am__append_8) $(am__EXEEXT_5)
|
|
||||||
@STANDALONE_FALSE@am__append_6 = msg_tst system-elf-libelf-test
|
|
||||||
@STANDALONE_FALSE@am__append_7 = msg_tst system-elf-libelf-test
|
|
||||||
@LZMA_TRUE@am__append_8 = run-readelf-s.sh run-dwflsyms.sh
|
|
||||||
@@ -606,6 +606,9 @@
|
|
||||||
vendorelf_SOURCES = vendorelf.c
|
|
||||||
vendorelf_OBJECTS = vendorelf.$(OBJEXT)
|
|
||||||
vendorelf_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
|
||||||
+xlate_notes_SOURCES = xlate_notes.c
|
|
||||||
+xlate_notes_OBJECTS = xlate_notes.$(OBJEXT)
|
|
||||||
+xlate_notes_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
|
||||||
zstrptr_SOURCES = zstrptr.c
|
|
||||||
zstrptr_OBJECTS = zstrptr.$(OBJEXT)
|
|
||||||
zstrptr_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
|
||||||
@@ -683,7 +686,7 @@
|
|
||||||
./$(DEPDIR)/update2.Po ./$(DEPDIR)/update3.Po \
|
|
||||||
./$(DEPDIR)/update4.Po ./$(DEPDIR)/varlocs.Po \
|
|
||||||
./$(DEPDIR)/vdsosyms.Po ./$(DEPDIR)/vendorelf.Po \
|
|
||||||
- ./$(DEPDIR)/zstrptr.Po
|
|
||||||
+ ./$(DEPDIR)/xlate_notes.Po ./$(DEPDIR)/zstrptr.Po
|
|
||||||
am__mv = mv -f
|
|
||||||
AM_V_lt = $(am__v_lt_@AM_V@)
|
|
||||||
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
|
||||||
@@ -726,7 +729,8 @@
|
|
||||||
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 zstrptr.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 \
|
|
||||||
@@ -752,7 +756,8 @@
|
|
||||||
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 zstrptr.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,7 +1410,8 @@
|
|
||||||
testfile-debug-rel-ppc64-g.o.bz2 \
|
|
||||||
testfile-debug-rel-ppc64-z.o.bz2 \
|
|
||||||
testfile-debug-rel-ppc64.o.bz2 \
|
|
||||||
- run-strip-version.sh testfile-version.bz2
|
|
||||||
+ run-strip-version.sh testfile-version.bz2 \
|
|
||||||
+ run-xlate-note.sh
|
|
||||||
|
|
||||||
@USE_VALGRIND_TRUE@valgrind_cmd = 'valgrind -q --leak-check=full --error-exitcode=1'
|
|
||||||
installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir); \
|
|
||||||
@@ -1559,6 +1565,7 @@
|
|
||||||
next_cfi_LDADD = $(libelf) $(libdw)
|
|
||||||
elfcopy_LDADD = $(libelf)
|
|
||||||
addsections_LDADD = $(libelf)
|
|
||||||
+xlate_notes_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.
|
|
||||||
@@ -2011,6 +2018,10 @@
|
|
||||||
@rm -f vendorelf$(EXEEXT)
|
|
||||||
$(AM_V_CCLD)$(LINK) $(vendorelf_OBJECTS) $(vendorelf_LDADD) $(LIBS)
|
|
||||||
|
|
||||||
+xlate_notes$(EXEEXT): $(xlate_notes_OBJECTS) $(xlate_notes_DEPENDENCIES) $(EXTRA_xlate_notes_DEPENDENCIES)
|
|
||||||
+ @rm -f xlate_notes$(EXEEXT)
|
|
||||||
+ $(AM_V_CCLD)$(LINK) $(xlate_notes_OBJECTS) $(xlate_notes_LDADD) $(LIBS)
|
|
||||||
+
|
|
||||||
zstrptr$(EXEEXT): $(zstrptr_OBJECTS) $(zstrptr_DEPENDENCIES) $(EXTRA_zstrptr_DEPENDENCIES)
|
|
||||||
@rm -f zstrptr$(EXEEXT)
|
|
||||||
$(AM_V_CCLD)$(LINK) $(zstrptr_OBJECTS) $(zstrptr_LDADD) $(LIBS)
|
|
||||||
@@ -2124,6 +2135,7 @@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/varlocs.Po@am__quote@ # am--include-marker
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vdsosyms.Po@am__quote@ # am--include-marker
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vendorelf.Po@am__quote@ # am--include-marker
|
|
||||||
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlate_notes.Po@am__quote@ # am--include-marker
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zstrptr.Po@am__quote@ # am--include-marker
|
|
||||||
|
|
||||||
$(am__depfiles_remade):
|
|
||||||
@@ -3732,6 +3744,13 @@
|
|
||||||
--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-xlate-note.sh.log: run-xlate-note.sh
|
|
||||||
+ @p='run-xlate-note.sh'; \
|
|
||||||
+ b='run-xlate-note.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)
|
|
||||||
msg_tst.log: msg_tst$(EXEEXT)
|
|
||||||
@p='msg_tst$(EXEEXT)'; \
|
|
||||||
b='msg_tst'; \
|
|
||||||
@@ -4027,6 +4046,7 @@
|
|
||||||
-rm -f ./$(DEPDIR)/varlocs.Po
|
|
||||||
-rm -f ./$(DEPDIR)/vdsosyms.Po
|
|
||||||
-rm -f ./$(DEPDIR)/vendorelf.Po
|
|
||||||
+ -rm -f ./$(DEPDIR)/xlate_notes.Po
|
|
||||||
-rm -f ./$(DEPDIR)/zstrptr.Po
|
|
||||||
-rm -f Makefile
|
|
||||||
distclean-am: clean-am distclean-compile distclean-generic \
|
|
||||||
@@ -4176,6 +4196,7 @@
|
|
||||||
-rm -f ./$(DEPDIR)/varlocs.Po
|
|
||||||
-rm -f ./$(DEPDIR)/vdsosyms.Po
|
|
||||||
-rm -f ./$(DEPDIR)/vendorelf.Po
|
|
||||||
+ -rm -f ./$(DEPDIR)/xlate_notes.Po
|
|
||||||
-rm -f ./$(DEPDIR)/zstrptr.Po
|
|
||||||
-rm -f Makefile
|
|
||||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
|
188
elfutils.spec
188
elfutils.spec
@ -1,11 +1,11 @@
|
|||||||
Name: elfutils
|
Name: elfutils
|
||||||
Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
|
Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
|
||||||
Version: 0.177
|
Version: 0.178
|
||||||
%global baserelease 1
|
%global baserelease 1
|
||||||
URL: http://elfutils.org/
|
URL: http://elfutils.org/
|
||||||
%global source_url ftp://sourceware.org/pub/elfutils/%{version}/
|
%global source_url ftp://sourceware.org/pub/elfutils/%{version}/
|
||||||
License: GPLv3+ and (GPLv2+ or LGPLv3+)
|
License: GPLv3+ and (GPLv2+ or LGPLv3+) and GFDL
|
||||||
|
Source: %{?source_url}%{name}-%{version}.tar.bz2
|
||||||
Release: %{baserelease}%{?dist}
|
Release: %{baserelease}%{?dist}
|
||||||
|
|
||||||
%global provide_yama_scope 0
|
%global provide_yama_scope 0
|
||||||
@ -16,36 +16,45 @@ Release: %{baserelease}%{?dist}
|
|||||||
|
|
||||||
%global depsuffix %{?_isa}%{!?_isa:-%{_arch}}
|
%global depsuffix %{?_isa}%{!?_isa:-%{_arch}}
|
||||||
|
|
||||||
Source: %{?source_url}%{name}-%{version}.tar.bz2
|
|
||||||
|
|
||||||
# Patches
|
# Patches
|
||||||
Patch1: elfutils-0.177-pt-gnu-prop.patch
|
Patch1: elfutils-0.178-pt-gnu-prop.patch
|
||||||
|
|
||||||
Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
|
Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
|
||||||
Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
|
Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
|
||||||
|
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
|
||||||
|
Recommends: elfutils-debuginfod-client
|
||||||
|
%else
|
||||||
|
Requires: elfutils-debuginfod-client
|
||||||
|
%endif
|
||||||
|
|
||||||
BuildRequires: gettext
|
BuildRequires: gcc
|
||||||
BuildRequires: bison >= 1.875
|
|
||||||
BuildRequires: flex >= 2.5.4a
|
|
||||||
BuildRequires: bzip2
|
|
||||||
BuildRequires: gcc >= 4.4
|
|
||||||
# For libstdc++ demangle support
|
# For libstdc++ demangle support
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
|
||||||
BuildRequires: zlib-devel >= 1.2.2.3
|
BuildRequires: gettext
|
||||||
|
BuildRequires: bison
|
||||||
|
BuildRequires: flex
|
||||||
|
|
||||||
|
# Compression support
|
||||||
|
BuildRequires: zlib-devel
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: xz-devel
|
BuildRequires: xz-devel
|
||||||
|
|
||||||
|
# For debuginfod
|
||||||
|
BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33
|
||||||
|
BuildRequires: pkgconfig(libcurl) >= 7.29.0
|
||||||
|
BuildRequires: pkgconfig(sqlite3) >= 3.7.17
|
||||||
|
BuildRequires: pkgconfig(libarchive) >= 3.1.2
|
||||||
|
|
||||||
|
# For tests need to bunzip2 test files.
|
||||||
|
BuildRequires: bzip2
|
||||||
|
# For the run-debuginfod-find.sh test case in %check for /usr/sbin/ss
|
||||||
|
BuildRequires: iproute
|
||||||
|
BuildRequires: curl
|
||||||
|
|
||||||
%global _gnu %{nil}
|
%global _gnu %{nil}
|
||||||
%global _program_prefix eu-
|
%global _program_prefix eu-
|
||||||
|
|
||||||
# The lib[64]/elfutils directory contains the private ebl backend
|
|
||||||
# libraries. They must not be exposed as global provides. We don't
|
|
||||||
# need to filter the requires since they are only loaded with dlopen.
|
|
||||||
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
|
|
||||||
%global __provides_exclude ^libebl_.*\\.so.*$
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Elfutils is a collection of utilities, including stack (to show
|
Elfutils is a collection of utilities, including stack (to show
|
||||||
backtraces), nm (for listing symbols from object files), size
|
backtraces), nm (for listing symbols from object files), size
|
||||||
@ -54,7 +63,6 @@ strip (for discarding symbols), readelf (to see the raw ELF file
|
|||||||
structures), elflint (to check for well-formed ELF files) and
|
structures), elflint (to check for well-formed ELF files) and
|
||||||
elfcompress (to compress or decompress ELF sections).
|
elfcompress (to compress or decompress ELF sections).
|
||||||
|
|
||||||
|
|
||||||
%package libs
|
%package libs
|
||||||
Summary: Libraries to handle compiled objects
|
Summary: Libraries to handle compiled objects
|
||||||
License: GPLv2+ or LGPLv3+
|
License: GPLv2+ or LGPLv3+
|
||||||
@ -65,12 +73,18 @@ Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
|
|||||||
%if %{provide_yama_scope}
|
%if %{provide_yama_scope}
|
||||||
Requires: default-yama-scope
|
Requires: default-yama-scope
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
|
||||||
|
Recommends: elfutils-debuginfod-client
|
||||||
|
%else
|
||||||
|
Requires: elfutils-debuginfod-client
|
||||||
|
%endif
|
||||||
|
|
||||||
%description libs
|
%description libs
|
||||||
The elfutils-libs package contains libraries which implement DWARF, ELF,
|
The elfutils-libs package contains libraries which implement DWARF, ELF,
|
||||||
and machine-specific ELF handling. These libraries are used by the programs
|
and machine-specific ELF handling and process introspection. These
|
||||||
in the elfutils package. The elfutils-devel package enables building
|
libraries are used by the programs in the elfutils package. The
|
||||||
other programs using these libraries.
|
elfutils-devel package enables building other programs using these
|
||||||
|
libraries.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development libraries to handle compiled objects
|
Summary: Development libraries to handle compiled objects
|
||||||
@ -80,12 +94,16 @@ Provides: elfutils-devel%{depsuffix} = %{version}-%{release}
|
|||||||
%endif
|
%endif
|
||||||
Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
|
Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
|
||||||
Requires: elfutils-libelf-devel%{depsuffix} = %{version}-%{release}
|
Requires: elfutils-libelf-devel%{depsuffix} = %{version}-%{release}
|
||||||
|
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
|
||||||
|
Recommends: elfutils-debuginfod-client-devel
|
||||||
|
%else
|
||||||
|
Requires: elfutils-debuginfod-client-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The elfutils-devel package contains the libraries to create
|
The elfutils-devel package contains the libraries to create
|
||||||
applications for handling compiled objects. libebl provides some
|
applications for handling compiled objects. libdw provides access
|
||||||
higher-level ELF access functionality. libdw provides access to
|
to the DWARF debugging information. libasm provides a programmable
|
||||||
the DWARF debugging information. libasm provides a programmable
|
|
||||||
assembler interface.
|
assembler interface.
|
||||||
|
|
||||||
%package devel-static
|
%package devel-static
|
||||||
@ -177,6 +195,42 @@ interprocess services, communication and introspection
|
|||||||
profiling) of processes.
|
profiling) of processes.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%package debuginfod-client
|
||||||
|
Summary: Library and command line client for build-id HTTP ELF/DWARF server
|
||||||
|
License: GPLv3+ and (GPLv2+ or LGPLv3+)
|
||||||
|
|
||||||
|
%package debuginfod-client-devel
|
||||||
|
Summary: Libraries and headers to build debuginfod client applications
|
||||||
|
License: GPLv2+ or LGPLv3+
|
||||||
|
|
||||||
|
%package debuginfod
|
||||||
|
Summary: HTTP ELF/DWARF file server addressed by build-id
|
||||||
|
License: GPLv3+
|
||||||
|
BuildRequires: systemd
|
||||||
|
Requires(post): systemd
|
||||||
|
Requires(preun): systemd
|
||||||
|
Requires(postun): systemd
|
||||||
|
Requires(pre): shadow-utils
|
||||||
|
# For /usr/bin/cpio2rpm
|
||||||
|
Requires: rpm
|
||||||
|
|
||||||
|
%description debuginfod-client
|
||||||
|
The elfutils-debuginfod-client package contains shared libraries
|
||||||
|
dynamically loaded from -ldw, which use a debuginfod service
|
||||||
|
to look up debuginfo and associated data. Also includes a
|
||||||
|
command-line frontend.
|
||||||
|
|
||||||
|
%description debuginfod-client-devel
|
||||||
|
The elfutils-debuginfod-client-devel package contains the libraries
|
||||||
|
to create applications to use the debuginfod service.
|
||||||
|
|
||||||
|
%description debuginfod
|
||||||
|
The elfutils-debuginfod package contains the debuginfod binary
|
||||||
|
and control files for a service that can provide ELF/DWARF
|
||||||
|
files to remote clients, based on build-id identification.
|
||||||
|
The ELF/DWARF file searching functions in libdwfl can query
|
||||||
|
such servers to download those files on demand.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
@ -207,7 +261,6 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
make -s install DESTDIR=${RPM_BUILD_ROOT}
|
make -s install DESTDIR=${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so*
|
chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so*
|
||||||
chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so*
|
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
@ -215,9 +268,14 @@ chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so*
|
|||||||
install -Dm0644 config/10-default-yama-scope.conf ${RPM_BUILD_ROOT}%{_sysctldir}/10-default-yama-scope.conf
|
install -Dm0644 config/10-default-yama-scope.conf ${RPM_BUILD_ROOT}%{_sysctldir}/10-default-yama-scope.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
install -Dm0644 config/debuginfod.service ${RPM_BUILD_ROOT}%{_unitdir}/debuginfod.service
|
||||||
|
install -Dm0644 config/debuginfod.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/debuginfod
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/debuginfod
|
||||||
|
touch ${RPM_BUILD_ROOT}%{_localstatedir}/cache/debuginfod/debuginfod.sqlite
|
||||||
|
|
||||||
%check
|
%check
|
||||||
# Record some build root versions in build.log
|
# Record some build root versions in build.log
|
||||||
uname -r; rpm -q glibc
|
uname -r; rpm -q binutils gcc glibc
|
||||||
|
|
||||||
make -s %{?_smp_mflags} check || (cat tests/test-suite.log; false)
|
make -s %{?_smp_mflags} check || (cat tests/test-suite.log; false)
|
||||||
|
|
||||||
@ -226,11 +284,14 @@ make -s %{?_smp_mflags} check || (cat tests/test-suite.log; false)
|
|||||||
%if 0%{?ldconfig_scriptlets:1}
|
%if 0%{?ldconfig_scriptlets:1}
|
||||||
%ldconfig_scriptlets libs
|
%ldconfig_scriptlets libs
|
||||||
%ldconfig_scriptlets libelf
|
%ldconfig_scriptlets libelf
|
||||||
|
%ldconfig_scriptlets debuginfod-client
|
||||||
%else
|
%else
|
||||||
%post libs -p /sbin/ldconfig
|
%post libs -p /sbin/ldconfig
|
||||||
%postun libs -p /sbin/ldconfig
|
%postun libs -p /sbin/ldconfig
|
||||||
%post libelf -p /sbin/ldconfig
|
%post libelf -p /sbin/ldconfig
|
||||||
%postun libelf -p /sbin/ldconfig
|
%postun libelf -p /sbin/ldconfig
|
||||||
|
%post debuginfod-client -p /sbin/ldconfig
|
||||||
|
%postun debuginfod-client -p /sbin/ldconfig
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{provide_yama_scope}
|
%if %{provide_yama_scope}
|
||||||
@ -244,13 +305,16 @@ fi
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
%license COPYING COPYING-GPLV2 COPYING-LGPLV3
|
%license COPYING COPYING-GPLV2 COPYING-LGPLV3 doc/COPYING-GFDL
|
||||||
%doc README TODO CONTRIBUTING
|
%doc README TODO CONTRIBUTING
|
||||||
%{_bindir}/eu-addr2line
|
%{_bindir}/eu-addr2line
|
||||||
%{_bindir}/eu-ar
|
%{_bindir}/eu-ar
|
||||||
|
%{_bindir}/eu-elfclassify
|
||||||
%{_bindir}/eu-elfcmp
|
%{_bindir}/eu-elfcmp
|
||||||
|
%{_bindir}/eu-elfcompress
|
||||||
%{_bindir}/eu-elflint
|
%{_bindir}/eu-elflint
|
||||||
%{_bindir}/eu-findtextrel
|
%{_bindir}/eu-findtextrel
|
||||||
|
%{_bindir}/eu-make-debug-archive
|
||||||
%{_bindir}/eu-nm
|
%{_bindir}/eu-nm
|
||||||
%{_bindir}/eu-objdump
|
%{_bindir}/eu-objdump
|
||||||
%{_bindir}/eu-ranlib
|
%{_bindir}/eu-ranlib
|
||||||
@ -260,19 +324,15 @@ fi
|
|||||||
%{_bindir}/eu-strings
|
%{_bindir}/eu-strings
|
||||||
%{_bindir}/eu-strip
|
%{_bindir}/eu-strip
|
||||||
%{_bindir}/eu-unstrip
|
%{_bindir}/eu-unstrip
|
||||||
%{_bindir}/eu-make-debug-archive
|
%{_mandir}/man1/eu-*.1*
|
||||||
%{_bindir}/eu-elfcompress
|
|
||||||
%{_bindir}/eu-elfclassify
|
|
||||||
|
|
||||||
%files libs
|
%files libs
|
||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
%license COPYING-GPLV2 COPYING-LGPLV3
|
%license COPYING-GPLV2 COPYING-LGPLV3
|
||||||
%{_libdir}/libasm-%{version}.so
|
%{_libdir}/libasm-%{version}.so
|
||||||
%{_libdir}/libasm.so.*
|
|
||||||
%{_libdir}/libdw-%{version}.so
|
%{_libdir}/libdw-%{version}.so
|
||||||
|
%{_libdir}/libasm.so.*
|
||||||
%{_libdir}/libdw.so.*
|
%{_libdir}/libdw.so.*
|
||||||
%dir %{_libdir}/elfutils
|
|
||||||
%{_libdir}/elfutils/lib*.so
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/dwarf.h
|
%{_includedir}/dwarf.h
|
||||||
@ -280,19 +340,17 @@ fi
|
|||||||
%{_includedir}/elfutils/elf-knowledge.h
|
%{_includedir}/elfutils/elf-knowledge.h
|
||||||
%{_includedir}/elfutils/known-dwarf.h
|
%{_includedir}/elfutils/known-dwarf.h
|
||||||
%{_includedir}/elfutils/libasm.h
|
%{_includedir}/elfutils/libasm.h
|
||||||
%{_includedir}/elfutils/libebl.h
|
|
||||||
%{_includedir}/elfutils/libdw.h
|
%{_includedir}/elfutils/libdw.h
|
||||||
%{_includedir}/elfutils/libdwfl.h
|
%{_includedir}/elfutils/libdwfl.h
|
||||||
%{_includedir}/elfutils/libdwelf.h
|
%{_includedir}/elfutils/libdwelf.h
|
||||||
%{_includedir}/elfutils/version.h
|
%{_includedir}/elfutils/version.h
|
||||||
%{_libdir}/libebl.a
|
|
||||||
%{_libdir}/libasm.so
|
%{_libdir}/libasm.so
|
||||||
%{_libdir}/libdw.so
|
%{_libdir}/libdw.so
|
||||||
%{_libdir}/pkgconfig/libdw.pc
|
%{_libdir}/pkgconfig/libdw.pc
|
||||||
|
|
||||||
%files devel-static
|
%files devel-static
|
||||||
%{_libdir}/libasm.a
|
|
||||||
%{_libdir}/libdw.a
|
%{_libdir}/libdw.a
|
||||||
|
%{_libdir}/libasm.a
|
||||||
|
|
||||||
%files -f %{name}.lang libelf
|
%files -f %{name}.lang libelf
|
||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
@ -306,6 +364,7 @@ fi
|
|||||||
%{_includedir}/nlist.h
|
%{_includedir}/nlist.h
|
||||||
%{_libdir}/libelf.so
|
%{_libdir}/libelf.so
|
||||||
%{_libdir}/pkgconfig/libelf.pc
|
%{_libdir}/pkgconfig/libelf.pc
|
||||||
|
%{_mandir}/man3/elf_*.3*
|
||||||
|
|
||||||
%files libelf-devel-static
|
%files libelf-devel-static
|
||||||
%{_libdir}/libelf.a
|
%{_libdir}/libelf.a
|
||||||
@ -315,7 +374,60 @@ fi
|
|||||||
%{_sysctldir}/10-default-yama-scope.conf
|
%{_sysctldir}/10-default-yama-scope.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%files debuginfod-client
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_libdir}/libdebuginfod-%{version}.so
|
||||||
|
%{_bindir}/debuginfod-find
|
||||||
|
%{_mandir}/man1/debuginfod-find.1*
|
||||||
|
|
||||||
|
%files debuginfod-client-devel
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_libdir}/pkgconfig/libdebuginfod.pc
|
||||||
|
%{_mandir}/man3/debuginfod_*.3*
|
||||||
|
%{_includedir}/elfutils/debuginfod.h
|
||||||
|
%{_libdir}/libdebuginfod.so*
|
||||||
|
|
||||||
|
%files debuginfod
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_bindir}/debuginfod
|
||||||
|
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/debuginfod
|
||||||
|
%{_unitdir}/debuginfod.service
|
||||||
|
%{_sysconfdir}/sysconfig/debuginfod
|
||||||
|
%{_mandir}/man8/debuginfod.8*
|
||||||
|
|
||||||
|
%dir %attr(0700,debuginfod,debuginfod) %{_localstatedir}/cache/debuginfod
|
||||||
|
%verify(not md5 size mtime) %attr(0600,debuginfod,debuginfod) %{_localstatedir}/cache/debuginfod/debuginfod.sqlite
|
||||||
|
|
||||||
|
%pre debuginfod
|
||||||
|
getent group debuginfod >/dev/null || groupadd -r debuginfod
|
||||||
|
getent passwd debuginfod >/dev/null || \
|
||||||
|
useradd -r -g debuginfod -d /var/cache/debuginfod -s /sbin/nologin \
|
||||||
|
-c "elfutils debuginfo server" debuginfod
|
||||||
|
exit 0
|
||||||
|
|
||||||
|
%post debuginfod
|
||||||
|
%systemd_post debuginfod.service
|
||||||
|
|
||||||
|
%postun debuginfod
|
||||||
|
%systemd_postun_with_restart debuginfod.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 26 2019 Mark Wielaard <mjw@fedoraproject.org> - 0.178-1
|
||||||
|
- New upstream release.
|
||||||
|
- debuginfod: New server, client tool and library to index and fetch
|
||||||
|
ELF/DWARF files addressed by build-id through HTTP.
|
||||||
|
- doc: There are now some manual pages for functions and tools.
|
||||||
|
- backends: The libebl libraries are no longer dynamically loaded
|
||||||
|
through dlopen, but are now compiled into libdw.so directly.
|
||||||
|
- readelf: -n, --notes now takes an optional "SECTION" argument.
|
||||||
|
-p and -x now also handle section numbers.
|
||||||
|
New option --dyn-sym to show just the dynamic symbol table.
|
||||||
|
- libcpu: Add RISC-V disassembler.
|
||||||
|
- libdw: Abbrevs and DIEs can now be read concurrently by multiple
|
||||||
|
threads through the same Dwarf handle.
|
||||||
|
- libdwfl: Will try to use debuginfod when installed as fallback to
|
||||||
|
retrieve ELF and DWARF debug data files by build-id.
|
||||||
|
|
||||||
* Wed Aug 14 2019 Mark Wielaard <mjw@fedoraproject.org> - 0.177-1
|
* Wed Aug 14 2019 Mark Wielaard <mjw@fedoraproject.org> - 0.177-1
|
||||||
- New upstream release.
|
- New upstream release.
|
||||||
- elfclassify: New tool to analyze ELF objects.
|
- elfclassify: New tool to analyze ELF objects.
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (elfutils-0.177.tar.bz2) = 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
|
SHA512 (elfutils-0.178.tar.bz2) = 356656ad0db8f6877b461de1a11280de16a9cc5d8dde4381a938a212e828e32755135e5e3171d311c4c9297b728fbd98123048e2e8fbf7fe7de68976a2daabe5
|
||||||
|
Loading…
Reference in New Issue
Block a user