From 0c39d9c06ddb1d8315c2ebab06e4de96dbf63a6d Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 23 Mar 2015 15:18:46 +0100 Subject: [PATCH 1/5] 0.161-7 Add elfutils-0.161-aarch64relro.patch (#1201778) --- elfutils-0.161-aarch64relro.patch | 59 +++++++++++++++++++++++++++++++ elfutils.spec | 7 +++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 elfutils-0.161-aarch64relro.patch diff --git a/elfutils-0.161-aarch64relro.patch b/elfutils-0.161-aarch64relro.patch new file mode 100644 index 0000000..fca9e00 --- /dev/null +++ b/elfutils-0.161-aarch64relro.patch @@ -0,0 +1,59 @@ +commit aea89f2c1ad1cfa2ddd09fb5262f7a0616708baa +Author: Mark Wielaard +Date: Mon Mar 23 15:08:27 2015 +0100 + + backends: aarch64 can have _GLOBAL_OFFSET_TABLE_ point anywhere in .got. + + When building with relro aarch64 splits .got in a writable and read-only + part. _GLOBAL_OFFSET_TABLE_ points to the first writable symbol, not the + start of .got. + + https://bugzilla.redhat.com/show_bug.cgi?id=1201778 + + Signed-off-by: Mark Wielaard + +diff --git a/backends/aarch64_symbol.c b/backends/aarch64_symbol.c +index 3fdc9cf..76999e4 100644 +--- a/backends/aarch64_symbol.c ++++ b/backends/aarch64_symbol.c +@@ -1,5 +1,5 @@ + /* AArch64 specific symbolic name handling. +- Copyright (C) 2013 Red Hat, Inc. ++ Copyright (C) 2013, 2015 Red Hat, Inc. + This file is part of elfutils. + + This file is free software; you can redistribute it and/or modify +@@ -56,8 +56,11 @@ aarch64_reloc_simple_type (Ebl *ebl __attribute__ ((unused)), int type) + } + } + +-/* If this is the _GLOBAL_OFFSET_TABLE_ symbol, then it should point to +- .got[0] even if there is a .got.plt section. */ ++/* If this is the _GLOBAL_OFFSET_TABLE_ symbol, then it should point in ++ the .got even if there is a .got.plt section. ++ https://sourceware.org/ml/libc-ports/2013-06/msg00057.html ++ https://bugzilla.redhat.com/show_bug.cgi?id=1201778 ++ */ + bool + aarch64_check_special_symbol (Elf *elf, GElf_Ehdr *ehdr, const GElf_Sym *sym, + const char *name, const GElf_Shdr *destshdr) +@@ -66,7 +69,8 @@ aarch64_check_special_symbol (Elf *elf, GElf_Ehdr *ehdr, const GElf_Sym *sym, + && strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0) + { + const char *sname = elf_strptr (elf, ehdr->e_shstrndx, destshdr->sh_name); +- if (sname != NULL && strcmp (sname, ".got.plt") == 0) ++ if (sname != NULL ++ && (strcmp (sname, ".got") == 0 || strcmp (sname, ".got.plt") == 0)) + { + Elf_Scn *scn = NULL; + while ((scn = elf_nextscn (elf, scn)) != NULL) +@@ -77,7 +81,8 @@ aarch64_check_special_symbol (Elf *elf, GElf_Ehdr *ehdr, const GElf_Sym *sym, + { + sname = elf_strptr (elf, ehdr->e_shstrndx, shdr->sh_name); + if (sname != NULL && strcmp (sname, ".got") == 0) +- return sym->st_value == shdr->sh_addr; ++ return (sym->st_value >= shdr->sh_addr ++ && sym->st_value < shdr->sh_addr + shdr->sh_size); + } + } + } diff --git a/elfutils.spec b/elfutils.spec index dc65d51..b5717a2 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,7 +1,7 @@ Name: elfutils Summary: A collection of utilities and DSOs to handle compiled objects Version: 0.161 -%global baserelease 6 +%global baserelease 7 URL: https://fedorahosted.org/elfutils/ %global source_url http://fedorahosted.org/releases/e/l/elfutils/%{version}/ License: GPLv3+ and (GPLv2+ or LGPLv3+) @@ -52,6 +52,7 @@ Patch3: elfutils-0.161-formref-type.patch # rhbz#1189928 - Consider sh_addralign 0 as 1 Patch4: elfutils-0.161-addralign.patch Patch5: elfutils-0.161-copyreloc.patch +Patch6: elfutils-0.161-aarch64relro.patch %if !%{compat} Release: %{baserelease}%{?dist} @@ -218,6 +219,7 @@ sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c %patch3 -p1 -b .formref_type %patch4 -p1 -b .addralign %patch5 -p1 -b .copyreloc +%patch6 -p1 -b .aarch64relro find . -name \*.sh ! -perm -0100 -print | xargs chmod +x @@ -346,6 +348,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Mon Mar 23 2015 Mark Wielaard - 0.161-7 +- Add elfutils-0.161-aarch64relro.patch (#1201778) + * Mon Mar 09 2015 Mark Wielaard - 0.161-6 - Add elfutils-0.161-copyreloc.patch. From 832a74e9b901b44c468a8b93bffee2eb77795cc0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 13:28:16 +0200 Subject: [PATCH 2/5] Rebuilt for GCC 5 C++11 ABI change --- elfutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/elfutils.spec b/elfutils.spec index b5717a2..a480c16 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,7 +1,7 @@ Name: elfutils Summary: A collection of utilities and DSOs to handle compiled objects Version: 0.161 -%global baserelease 7 +%global baserelease 8 URL: https://fedorahosted.org/elfutils/ %global source_url http://fedorahosted.org/releases/e/l/elfutils/%{version}/ License: GPLv3+ and (GPLv2+ or LGPLv3+) @@ -348,6 +348,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Sat May 02 2015 Kalev Lember - 0.161-8 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Mar 23 2015 Mark Wielaard - 0.161-7 - Add elfutils-0.161-aarch64relro.patch (#1201778) From aa0f506f6b5d5fe9a06e669fd360e106c53d7578 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 11 Jun 2015 14:15:51 +0200 Subject: [PATCH 3/5] 0.162-1 - Update to 0.162 (#1170810, #1139815, #1129756, #1020842) - Include elfutils/known-dwarf.h - Drop BuildRequires glibc-headers (#1230468) - Removed integrated upstream patches: - elfutils-0.161-aarch64relro.patch - elfutils-0.161-copyreloc.patch - elfutils-0.161-addralign.patch - elfutils-0.161-ar-long-name.patch - elfutils-0.161-formref-type.patch --- .gitignore | 1 + elfutils-0.161-aarch64relro.patch | 59 -- elfutils-0.161-addralign.patch | 53 -- elfutils-0.161-ar-long-name.patch | 51 -- elfutils-0.161-copyreloc.patch | 233 ----- elfutils-0.161-formref-type.patch | 24 - ....patch => elfutils-portability-0.162.patch | 809 +++++++++++------- elfutils.spec | 32 +- sources | 2 +- 9 files changed, 514 insertions(+), 750 deletions(-) delete mode 100644 elfutils-0.161-aarch64relro.patch delete mode 100644 elfutils-0.161-addralign.patch delete mode 100644 elfutils-0.161-ar-long-name.patch delete mode 100644 elfutils-0.161-copyreloc.patch delete mode 100644 elfutils-0.161-formref-type.patch rename elfutils-portability-0.161.patch => elfutils-portability-0.162.patch (72%) diff --git a/.gitignore b/.gitignore index 94469a7..c20acfc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /elfutils-0.159.tar.bz2 /elfutils-0.160.tar.bz2 /elfutils-0.161.tar.bz2 +/elfutils-0.162.tar.bz2 diff --git a/elfutils-0.161-aarch64relro.patch b/elfutils-0.161-aarch64relro.patch deleted file mode 100644 index fca9e00..0000000 --- a/elfutils-0.161-aarch64relro.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit aea89f2c1ad1cfa2ddd09fb5262f7a0616708baa -Author: Mark Wielaard -Date: Mon Mar 23 15:08:27 2015 +0100 - - backends: aarch64 can have _GLOBAL_OFFSET_TABLE_ point anywhere in .got. - - When building with relro aarch64 splits .got in a writable and read-only - part. _GLOBAL_OFFSET_TABLE_ points to the first writable symbol, not the - start of .got. - - https://bugzilla.redhat.com/show_bug.cgi?id=1201778 - - Signed-off-by: Mark Wielaard - -diff --git a/backends/aarch64_symbol.c b/backends/aarch64_symbol.c -index 3fdc9cf..76999e4 100644 ---- a/backends/aarch64_symbol.c -+++ b/backends/aarch64_symbol.c -@@ -1,5 +1,5 @@ - /* AArch64 specific symbolic name handling. -- Copyright (C) 2013 Red Hat, Inc. -+ Copyright (C) 2013, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -56,8 +56,11 @@ aarch64_reloc_simple_type (Ebl *ebl __attribute__ ((unused)), int type) - } - } - --/* If this is the _GLOBAL_OFFSET_TABLE_ symbol, then it should point to -- .got[0] even if there is a .got.plt section. */ -+/* If this is the _GLOBAL_OFFSET_TABLE_ symbol, then it should point in -+ the .got even if there is a .got.plt section. -+ https://sourceware.org/ml/libc-ports/2013-06/msg00057.html -+ https://bugzilla.redhat.com/show_bug.cgi?id=1201778 -+ */ - bool - aarch64_check_special_symbol (Elf *elf, GElf_Ehdr *ehdr, const GElf_Sym *sym, - const char *name, const GElf_Shdr *destshdr) -@@ -66,7 +69,8 @@ aarch64_check_special_symbol (Elf *elf, GElf_Ehdr *ehdr, const GElf_Sym *sym, - && strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0) - { - const char *sname = elf_strptr (elf, ehdr->e_shstrndx, destshdr->sh_name); -- if (sname != NULL && strcmp (sname, ".got.plt") == 0) -+ if (sname != NULL -+ && (strcmp (sname, ".got") == 0 || strcmp (sname, ".got.plt") == 0)) - { - Elf_Scn *scn = NULL; - while ((scn = elf_nextscn (elf, scn)) != NULL) -@@ -77,7 +81,8 @@ aarch64_check_special_symbol (Elf *elf, GElf_Ehdr *ehdr, const GElf_Sym *sym, - { - sname = elf_strptr (elf, ehdr->e_shstrndx, shdr->sh_name); - if (sname != NULL && strcmp (sname, ".got") == 0) -- return sym->st_value == shdr->sh_addr; -+ return (sym->st_value >= shdr->sh_addr -+ && sym->st_value < shdr->sh_addr + shdr->sh_size); - } - } - } diff --git a/elfutils-0.161-addralign.patch b/elfutils-0.161-addralign.patch deleted file mode 100644 index bbe1332..0000000 --- a/elfutils-0.161-addralign.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 6f5934c1afa8f34bfb8f86b191ded9af854e757f -Author: Jan Kratochvil -Date: Sat Feb 7 15:08:20 2015 +0100 - - libelf: Consider sh_addralign 0 as 1 - - Currently the Koji build for arm32 fails with: - extracting debug info from /builddir/build/BUILDROOT/etcd-2.0.0-0.3.rc1.fc22.arm/usr/bin/etcd - Failed to write file: invalid section alignment - - This is because the binary etcd - http://people.redhat.com/jkratoch/etcdctl.xz - contains: - Section Headers: - [Nr] Name Type Addr Off Size ES Flg Lk Inf Al - [11] .rel.plt REL 00459ee0 449ee0 000088 08 A 13 0 0 - ^ - which corresponds to golang's code: - go/src/cmd/ld/elf.c - case EM_X86_64: - sh = elfshname(".rela.plt"); - sh->addralign = RegSize; - default: - sh = elfshname(".rel.plt"); - - - ELF spec says: - Values 0 and 1 mean the section has no alignment constraints. - and libelf/elf32_updatenull.c really parses it that way at line 204 - ElfW2(LIBELFBITS,Word) sh_align = shdr->sh_addralign ?: 1; - but unfortunately the later line being patched no longer does. - - libelf/ - 2015-02-07 Jan Kratochvil - - * elf32_updatenull.c (__elfw2(LIBELFBITS,updatenull_wrlock)): Consider - sh_addralign 0 as 1. - - Signed-off-by: Jan Kratochvil - -diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c -index be4cea0..5e809b7 100644 ---- a/libelf/elf32_updatenull.c -+++ b/libelf/elf32_updatenull.c -@@ -328,7 +328,7 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) - enough for the largest alignment required by a data - block. */ - if (unlikely (! powerof2 (shdr->sh_addralign)) -- || unlikely (shdr->sh_addralign < sh_align)) -+ || unlikely ((shdr->sh_addralign ?: 1) < sh_align)) - { - __libelf_seterrno (ELF_E_INVALID_ALIGN); - return -1; diff --git a/elfutils-0.161-ar-long-name.patch b/elfutils-0.161-ar-long-name.patch deleted file mode 100644 index 030efd9..0000000 --- a/elfutils-0.161-ar-long-name.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 147018e729e7c22eeabf15b82d26e4bf68a0d18e -Author: Alexander Cherepanov -Date: Sun Dec 28 19:57:19 2014 +0300 - - libelf: Fix dir traversal vuln in ar extraction. - - read_long_names terminates names at the first '/' found but then skips - one character without checking (it's supposed to be '\n'). Hence the - next name could start with any character including '/'. This leads to - a directory traversal vulnerability at the time the contents of the - archive is extracted. - - The danger is mitigated by the fact that only one '/' is possible in a - resulting filename and only in the leading position. Hence only files - in the root directory can be written via this vuln and only when ar is - executed as root. - - The fix for the vuln is to not skip any characters while looking - for '/'. - - Signed-off-by: Alexander Cherepanov - -diff --git a/libelf/ChangeLog b/libelf/ChangeLog -index 3b88d03..447c354 100644 ---- a/libelf/ChangeLog -+++ b/libelf/ChangeLog -@@ -1,3 +1,8 @@ -+2014-12-28 Alexander Cherepanov -+ -+ * elf_begin.c (read_long_names): Don't miss '/' right after -+ another '/'. Fixes a dir traversal vuln in ar extraction. -+ - 2014-12-18 Ulrich Drepper - - * Makefile.am: Suppress output of textrel_check command. -diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c -index 30abe0b..cd3756c 100644 ---- a/libelf/elf_begin.c -+++ b/libelf/elf_begin.c -@@ -749,10 +749,7 @@ read_long_names (Elf *elf) - } - - /* NUL-terminate the string. */ -- *runp = '\0'; -- -- /* Skip the NUL byte and the \012. */ -- runp += 2; -+ *runp++ = '\0'; - - /* A sanity check. Somebody might have generated invalid - archive. */ diff --git a/elfutils-0.161-copyreloc.patch b/elfutils-0.161-copyreloc.patch deleted file mode 100644 index 551d35f..0000000 --- a/elfutils-0.161-copyreloc.patch +++ /dev/null @@ -1,233 +0,0 @@ -commit cc4e10fb398d40fb90e15056d808a596ef893cc3 -Author: Mark Wielaard -Date: Mon Mar 9 22:43:08 2015 +0100 - - backends: COPY relocations can also happen in ET_DYN. - - In particular COPY relocations might happen in PIE executables, - which are ET_DYN. - - Found on Fedora Rawhide with run-elflint-self.sh. - - Signed-off-by: Mark Wielaard - -diff --git a/backends/aarch64_reloc.def b/backends/aarch64_reloc.def -index 36d29e6..2e16e98 100644 ---- a/backends/aarch64_reloc.def -+++ b/backends/aarch64_reloc.def -@@ -1,5 +1,5 @@ - /* List the relocation types for AArch64. -*- C -*- -- Copyright (C) 2013, 2014 Red Hat, Inc. -+ Copyright (C) 2013, 2014, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -30,7 +30,7 @@ - - RELOC_TYPE (ABS64, REL|EXEC|DYN) - RELOC_TYPE (ABS32, REL|EXEC|DYN) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (GLOB_DAT, EXEC|DYN) - RELOC_TYPE (JUMP_SLOT, EXEC|DYN) - RELOC_TYPE (RELATIVE, EXEC|DYN) -diff --git a/backends/arm_reloc.def b/backends/arm_reloc.def -index 4b7894b..113648e 100644 ---- a/backends/arm_reloc.def -+++ b/backends/arm_reloc.def -@@ -1,5 +1,5 @@ - /* List the relocation types for arm. -*- C -*- -- Copyright (C) 2005-2010, 2014 Red Hat, Inc. -+ Copyright (C) 2005-2010, 2014, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -48,7 +48,7 @@ RELOC_TYPE (THM_XPC22, REL) - RELOC_TYPE (TLS_DTPMOD32, EXEC|DYN) - RELOC_TYPE (TLS_DTPOFF32, EXEC|DYN) - RELOC_TYPE (TLS_TPOFF32, EXEC|DYN) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (GLOB_DAT, EXEC|DYN) - RELOC_TYPE (JUMP_SLOT, EXEC|DYN) - RELOC_TYPE (RELATIVE, EXEC|DYN) -diff --git a/backends/i386_reloc.def b/backends/i386_reloc.def -index bd273b3..de3575d 100644 ---- a/backends/i386_reloc.def -+++ b/backends/i386_reloc.def -@@ -1,5 +1,5 @@ - /* List the relocation types for i386. -*- C -*- -- Copyright (C) 2000, 2001, 2002, 2003, 2005, 2009 Red Hat, Inc. -+ Copyright (C) 2000, 2001, 2002, 2003, 2005, 2009, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -29,7 +29,7 @@ - /* NAME, REL|EXEC|DYN */ - - RELOC_TYPE (NONE, 0) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (32, REL|EXEC|DYN) - RELOC_TYPE (PC32, REL|EXEC|DYN) - RELOC_TYPE (GOT32, REL) -diff --git a/backends/ia64_reloc.def b/backends/ia64_reloc.def -index 9e058c8..2428925 100644 ---- a/backends/ia64_reloc.def -+++ b/backends/ia64_reloc.def -@@ -1,5 +1,5 @@ - /* List the relocation types for ia64. -*- C -*- -- Copyright (C) 2005, 2006 Red Hat, Inc. -+ Copyright (C) 2005, 2006, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -88,7 +88,7 @@ RELOC_TYPE (PCREL22, REL) - RELOC_TYPE (PCREL64I, REL) - RELOC_TYPE (IPLTMSB, REL|EXEC|DYN) - RELOC_TYPE (IPLTLSB, REL|EXEC|DYN) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (SUB, 0) - RELOC_TYPE (LTOFF22X, REL) - RELOC_TYPE (LDXMOV, REL) -diff --git a/backends/ppc64_reloc.def b/backends/ppc64_reloc.def -index 3a693cf..15a73ba 100644 ---- a/backends/ppc64_reloc.def -+++ b/backends/ppc64_reloc.def -@@ -1,5 +1,5 @@ - /* List the relocation types for ppc64. -*- C -*- -- Copyright (C) 2005 Red Hat, Inc. -+ Copyright (C) 2005, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -46,7 +46,7 @@ RELOC_TYPE (GOT16, REL) - RELOC_TYPE (GOT16_LO, REL) - RELOC_TYPE (GOT16_HI, REL) - RELOC_TYPE (GOT16_HA, REL) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (GLOB_DAT, EXEC|DYN) - RELOC_TYPE (JMP_SLOT, EXEC|DYN) - RELOC_TYPE (RELATIVE, EXEC|DYN) -diff --git a/backends/ppc_reloc.def b/backends/ppc_reloc.def -index dc963a0..3723a9c 100644 ---- a/backends/ppc_reloc.def -+++ b/backends/ppc_reloc.def -@@ -1,5 +1,5 @@ - /* List the relocation types for ppc. -*- C -*- -- Copyright (C) 2005 Red Hat, Inc. -+ Copyright (C) 2005, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -47,7 +47,7 @@ RELOC_TYPE (GOT16_LO, REL) - RELOC_TYPE (GOT16_HI, REL) - RELOC_TYPE (GOT16_HA, REL) - RELOC_TYPE (PLTREL24, REL) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (GLOB_DAT, EXEC|DYN) - RELOC_TYPE (JMP_SLOT, EXEC|DYN) - RELOC_TYPE (RELATIVE, EXEC|DYN) -diff --git a/backends/s390_reloc.def b/backends/s390_reloc.def -index b4686a3..cdef9eb 100644 ---- a/backends/s390_reloc.def -+++ b/backends/s390_reloc.def -@@ -1,5 +1,5 @@ - /* List the relocation types for s390. -*- C -*- -- Copyright (C) 2005, 2006 Red Hat, Inc. -+ Copyright (C) 2005, 2006, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -37,7 +37,7 @@ RELOC_TYPE (PC32, REL|EXEC|DYN) - RELOC_TYPE (GOT12, REL) - RELOC_TYPE (GOT32, REL) - RELOC_TYPE (PLT32, REL) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (GLOB_DAT, EXEC|DYN) - RELOC_TYPE (JMP_SLOT, EXEC|DYN) - RELOC_TYPE (RELATIVE, EXEC|DYN) -diff --git a/backends/sh_reloc.def b/backends/sh_reloc.def -index 66a5a9d..aded361 100644 ---- a/backends/sh_reloc.def -+++ b/backends/sh_reloc.def -@@ -1,5 +1,5 @@ - /* List the relocation types for SH. -*- C -*- -- Copyright (C) 2005 Red Hat, Inc. -+ Copyright (C) 2005, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -59,7 +59,7 @@ RELOC_TYPE (TLS_DTPOFF32, DYN) - RELOC_TYPE (TLS_TPOFF32, DYN) - RELOC_TYPE (GOT32, REL) - RELOC_TYPE (PLT32, REL) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (GLOB_DAT, EXEC|DYN) - RELOC_TYPE (JMP_SLOT, EXEC|DYN) - RELOC_TYPE (RELATIVE, EXEC|DYN) -diff --git a/backends/sparc_reloc.def b/backends/sparc_reloc.def -index c39b0fa..2aeb129 100644 ---- a/backends/sparc_reloc.def -+++ b/backends/sparc_reloc.def -@@ -1,5 +1,5 @@ - /* List the relocation types for sparc. -*- C -*- -- Copyright (C) 2009 Red Hat, Inc. -+ Copyright (C) 2009, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -47,7 +47,7 @@ RELOC_TYPE (GOT22, REL) - RELOC_TYPE (PC10, REL) - RELOC_TYPE (PC22, REL) - RELOC_TYPE (WPLT30, REL) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (GLOB_DAT, EXEC|DYN) - RELOC_TYPE (JMP_SLOT, EXEC|DYN) - RELOC_TYPE (RELATIVE, EXEC|DYN) -diff --git a/backends/tilegx_reloc.def b/backends/tilegx_reloc.def -index 9736286..1018110 100644 ---- a/backends/tilegx_reloc.def -+++ b/backends/tilegx_reloc.def -@@ -1,5 +1,6 @@ - /* List the relocation types for tilegx. -*- C -*- - Copyright (C) 2012 Tilera Corporation -+ Copyright (C) 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -44,7 +45,7 @@ RELOC_TYPE (HW3, REL) - RELOC_TYPE (HW0_LAST, REL) - RELOC_TYPE (HW1_LAST, REL) - RELOC_TYPE (HW2_LAST, REL) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (GLOB_DAT, EXEC|DYN) - RELOC_TYPE (JMP_SLOT, EXEC|DYN) - RELOC_TYPE (RELATIVE, EXEC|DYN) -diff --git a/backends/x86_64_reloc.def b/backends/x86_64_reloc.def -index 8ed98f6..ad84efa 100644 ---- a/backends/x86_64_reloc.def -+++ b/backends/x86_64_reloc.def -@@ -1,5 +1,5 @@ - /* List the relocation types for x86-64. -*- C -*- -- Copyright (C) 2000, 2001, 2002, 2003, 2005, 2009 Red Hat, Inc. -+ Copyright (C) 2000, 2001, 2002, 2003, 2005, 2009, 2015 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -33,7 +33,7 @@ RELOC_TYPE (64, REL|EXEC|DYN) - RELOC_TYPE (PC32, REL|EXEC|DYN) - RELOC_TYPE (GOT32, REL) - RELOC_TYPE (PLT32, REL) --RELOC_TYPE (COPY, EXEC) -+RELOC_TYPE (COPY, EXEC|DYN) - RELOC_TYPE (GLOB_DAT, EXEC|DYN) - RELOC_TYPE (JUMP_SLOT, EXEC|DYN) - RELOC_TYPE (RELATIVE, EXEC|DYN) diff --git a/elfutils-0.161-formref-type.patch b/elfutils-0.161-formref-type.patch deleted file mode 100644 index 6f11e17..0000000 --- a/elfutils-0.161-formref-type.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 7c71382294af69f075c891a3418906c842491e4c -Author: Jason P. Leasure -Date: Wed Jan 14 09:26:55 2015 -0500 - - libdw: fix offset for sig8 lookup in dwarf_formref_die - - The type_offset of a type unit header is relative to the beginning - of the type unit header. - - Signed-off-by: Jason P. Leasure - -diff --git a/libdw/dwarf_formref_die.c b/libdw/dwarf_formref_die.c -index 63f6697..8b92e22 100644 ---- a/libdw/dwarf_formref_die.c -+++ b/libdw/dwarf_formref_die.c -@@ -95,7 +95,7 @@ dwarf_formref_die (attr, result) - - datap = cu->dbg->sectiondata[IDX_debug_types]->d_buf; - size = cu->dbg->sectiondata[IDX_debug_types]->d_size; -- offset = cu->type_offset; -+ offset = cu->start + cu->type_offset; - } - else - { diff --git a/elfutils-portability-0.161.patch b/elfutils-portability-0.162.patch similarity index 72% rename from elfutils-portability-0.161.patch rename to elfutils-portability-0.162.patch index 7539f8b..d81334c 100644 --- a/elfutils-portability-0.161.patch +++ b/elfutils-portability-0.162.patch @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -433,6 +433,10 @@ +@@ -498,6 +498,10 @@ * ppc_attrs.c (ppc_check_object_attribute): Handle tag GNU_Power_ABI_Struct_Return. @@ -11,7 +11,7 @@ 2008-10-04 Ulrich Drepper * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and -@@ -760,6 +764,11 @@ +@@ -825,6 +829,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -23,7 +23,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -782,6 +791,9 @@ +@@ -847,6 +856,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -46,15 +46,17 @@ libebl_i386.so: $(cpu_i386) --- elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in -@@ -83,6 +83,7 @@ host_triplet = @host@ +@@ -83,7 +83,8 @@ host_triplet = @host@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ $(noinst_HEADERS) ChangeLog +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING subdir = backends ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -285,6 +286,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -289,6 +290,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -62,7 +64,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -316,6 +318,7 @@ SHELL = @SHELL@ +@@ -320,6 +322,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -70,24 +72,29 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -378,11 +381,11 @@ zip_LIBS = @zip_LIBS@ - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ - -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw +@@ -387,14 +390,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr + + # Warn about stack usage of more than 256K = 262144 bytes. + @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $($(*F)_CFLAGS) - +AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ + $($(*F)_no_Werror),,-Werror) $(if \ + $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ -+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ -+ $(am__append_1) ++ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(if \ ++ $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ ++ $($(*F)_CFLAGS) $(am__append_1) COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +-DEFS.os = -DPIC -DSHARED $(am__append_1) ++DEFS.os = -DPIC -DSHARED $(am__append_2) CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \ libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS)) -@@ -888,7 +891,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a + textrel_msg = echo "WARNING: TEXTREL found in '$@'" +@@ -900,7 +903,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a $(LINK) -shared -o $(@:.map=.so) \ -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ -Wl,--version-script,$(@:.so=.map) \ @@ -98,7 +105,7 @@ libebl_i386.so: $(cpu_i386) --- elfutils/ChangeLog +++ elfutils/ChangeLog -@@ -187,6 +187,8 @@ +@@ -253,6 +253,8 @@ 2012-01-24 Mark Wielaard @@ -107,7 +114,7 @@ * COPYING: Fix address. Updated version from gnulib. 2012-01-23 Mark Wielaard -@@ -205,6 +207,9 @@ +@@ -271,6 +273,9 @@ 2011-10-08 Mike Frysinger @@ -117,7 +124,7 @@ * configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly. 2011-10-02 Ulrich Drepper -@@ -226,6 +231,10 @@ +@@ -292,6 +297,10 @@ * configure.ac (LOCALEDIR, DATADIRNAME): Removed. @@ -128,7 +135,7 @@ 2009-09-21 Ulrich Drepper * configure.ac: Update for more modern autoconf. -@@ -234,6 +243,10 @@ +@@ -300,6 +309,10 @@ * configure.ac (zip_LIBS): Check for liblzma too. @@ -139,7 +146,7 @@ 2009-04-19 Roland McGrath * configure.ac (eu_version): Round down here, not in version.h macros. -@@ -245,6 +258,8 @@ +@@ -311,6 +324,8 @@ 2009-01-23 Roland McGrath @@ -148,7 +155,7 @@ * configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3. * configure.ac (__thread check): Use AC_LINK_IFELSE, in case of -@@ -325,6 +340,10 @@ +@@ -391,6 +406,10 @@ * configure.ac: Add dummy automake conditional to get dependencies for non-generic linker right. See src/Makefile.am. @@ -159,7 +166,7 @@ 2005-11-18 Roland McGrath * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. -@@ -372,6 +391,17 @@ +@@ -438,6 +457,17 @@ * Makefile.am (all_SUBDIRS): Add libdwfl. * configure.ac: Write libdwfl/Makefile. @@ -179,7 +186,7 @@ * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros. --- elfutils/config/ChangeLog +++ elfutils/config/ChangeLog -@@ -71,6 +71,10 @@ +@@ -106,6 +106,10 @@ * known-dwarf.awk: Use gawk. @@ -200,7 +207,7 @@ ## ## This file is part of elfutils. ## -@@ -29,13 +29,21 @@ +@@ -29,6 +29,9 @@ ## not, see . ## @@ -209,12 +216,18 @@ + DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. + +@@ -38,12 +41,17 @@ STACK_USAGE_WARNING=-Wstack-usage=262144 + else + STACK_USAGE_WARNING= + endif -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ +AM_CFLAGS = -std=gnu99 -Wall -Wshadow \ $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ + $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \ + $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ + $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ $($(*F)_CFLAGS) +if BUILD_WERROR @@ -223,10 +236,10 @@ + COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) - %.os: %.c %.o + DEFS.os = -DPIC -DSHARED --- elfutils/config/Makefile.in +++ elfutils/config/Makefile.in -@@ -147,6 +147,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -150,6 +150,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -234,7 +247,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -178,6 +179,7 @@ SHELL = @SHELL@ +@@ -181,6 +182,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -244,17 +257,20 @@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ --- elfutils/config.h.in +++ elfutils/config.h.in -@@ -3,6 +3,9 @@ +@@ -6,6 +6,12 @@ /* Should ar and ranlib use -D behavior by default? */ #undef DEFAULT_AR_DETERMINISTIC +/* Have __builtin_popcount. */ +#undef HAVE_BUILTIN_POPCOUNT ++ ++/* Define to 1 if you have the `futimens' function. */ ++#undef HAVE_FUTIMENS + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -@@ -102,4 +105,7 @@ +@@ -105,4 +111,7 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES @@ -264,7 +280,7 @@ #include --- elfutils/configure +++ elfutils/configure -@@ -663,6 +663,8 @@ ZLIB_TRUE +@@ -672,6 +672,8 @@ ZLIB_TRUE LIBEBL_SUBDIR TESTS_RPATH_FALSE TESTS_RPATH_TRUE @@ -273,7 +289,7 @@ BUILD_STATIC_FALSE BUILD_STATIC_TRUE USE_VALGRIND_FALSE -@@ -678,6 +680,8 @@ NEVER_TRUE +@@ -687,6 +689,8 @@ NEVER_TRUE base_cpu NATIVE_LD_FALSE NATIVE_LD_TRUE @@ -282,24 +298,117 @@ NM READELF ac_ct_AR -@@ -798,6 +802,7 @@ enable_debugpred - enable_gprof +@@ -807,6 +811,7 @@ enable_gprof enable_gcov + enable_sanitize_undefined enable_valgrind +enable_werror enable_tests_rpath enable_libebl_subdir with_zlib -@@ -1455,6 +1460,7 @@ Optional Features: - --enable-gprof build binaries with gprof support - --enable-gcov build binaries with gcov support +@@ -1467,6 +1472,7 @@ Optional Features: + --enable-sanitize-undefined + Use gcc undefined behaviour sanitizer --enable-valgrind run all tests under valgrind + --disable-werror do not build with -Werror --enable-tests-rpath build $ORIGIN-using rpath into tests --enable-libebl-subdir=DIR install libebl_CPU modules in $(libdir)/DIR -@@ -4843,6 +4849,130 @@ if test "x$ac_cv_c99" != xyes; then : - as_fn_error $? "gcc with C99 support required" "$LINENO" 5 +@@ -1665,6 +1671,73 @@ fi + + } # ac_fn_c_try_link + ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case declares $2. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ ++} # ac_fn_c_check_func ++ + # ac_fn_c_try_run LINENO + # ---------------------- + # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +@@ -4824,6 +4897,18 @@ else + fi + + ++for ac_func in futimens ++do : ++ ac_fn_c_check_func "$LINENO" "futimens" "ac_cv_func_futimens" ++if test "x$ac_cv_func_futimens" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_FUTIMENS 1 ++_ACEOF ++ ++fi ++done ++ ++ + # We use -std=gnu99 but have explicit checks for some language constructs + # and GNU extensions since some compilers claim GNU99 support, but don't + # really support all language extensions. In particular we need +@@ -4872,6 +4957,130 @@ if test "x$ac_cv_c99" != xyes; then : + as_fn_error $? "gcc with GNU99 support required" "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5 @@ -429,7 +538,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5 $as_echo_n "checking for __thread support... " >&6; } if ${ac_cv_tls+:} false; then : -@@ -4879,7 +5009,13 @@ fi +@@ -4909,7 +5118,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5 $as_echo "$ac_cv_tls" >&6; } if test "x$ac_cv_tls" != xyes; then : @@ -444,7 +553,7 @@ fi # Check whether --enable-largefile was given. -@@ -5246,6 +5382,22 @@ else +@@ -5317,6 +5532,22 @@ else fi @@ -467,16 +576,16 @@ # Check whether --enable-tests-rpath was given. if test "${enable_tests_rpath+set}" = set; then : enableval=$enable_tests_rpath; tests_use_rpath=$enableval -@@ -5983,7 +6135,7 @@ case "$eu_version" in +@@ -6198,7 +6429,7 @@ case "$eu_version" in esac # Round up to the next release API (x.y) version. -eu_version=$(( (eu_version + 999) / 1000 )) +eu_version=`expr \( $eu_version + 999 \) / 1000` - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -6729,6 +6881,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes + MODVERSION="Build for ${LIBEBL_SUBDIR} ${eu_version} ${ac_cv_build}" + +@@ -7087,6 +7318,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes as_fn_error $? "conditional \"BUILD_STATIC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -489,9 +598,18 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5 --- elfutils/configure.ac +++ elfutils/configure.ac -@@ -89,6 +89,54 @@ CFLAGS="$old_CFLAGS"]) +@@ -73,6 +73,8 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AC_CHECK_TOOL([READELF], [readelf]) + AC_CHECK_TOOL([NM], [nm]) + ++AC_CHECK_FUNCS([futimens]) ++ + # We use -std=gnu99 but have explicit checks for some language constructs + # and GNU extensions since some compilers claim GNU99 support, but don't + # really support all language extensions. In particular we need +@@ -106,6 +108,54 @@ CFLAGS="$old_CFLAGS"]) AS_IF([test "x$ac_cv_c99" != xyes], - AC_MSG_ERROR([gcc with C99 support required])) + AC_MSG_ERROR([gcc with GNU99 support required])) +AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl +old_CFLAGS="$CFLAGS" @@ -544,7 +662,7 @@ AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl # Use the same flags that we use for our DSOs, so the test is representative. # Some old compiler/linker/libc combinations fail some ways and not others. -@@ -104,7 +152,10 @@ static __thread int a; int foo (int b) { +@@ -122,7 +172,10 @@ static __thread int a; int foo (int b) { CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"]) AS_IF([test "x$ac_cv_tls" != xyes], @@ -556,7 +674,7 @@ dnl This test must come as early as possible after the compiler configuration dnl tests, because the choice of the file model can (in principle) affect -@@ -183,6 +234,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_ +@@ -224,6 +277,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_ AM_CONDITIONAL(BUILD_STATIC, [dnl test "$use_gprof" = yes -o "$use_gcov" = yes]) @@ -568,18 +686,18 @@ AC_ARG_ENABLE([tests-rpath], AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]), [tests_use_rpath=$enableval], [tests_use_rpath=no]) -@@ -302,7 +358,7 @@ case "$eu_version" in +@@ -388,7 +446,7 @@ case "$eu_version" in esac # Round up to the next release API (x.y) version. -eu_version=$(( (eu_version + 999) / 1000 )) +eu_version=`expr \( $eu_version + 999 \) / 1000` - AC_CHECK_SIZEOF(long) - + dnl Unique ID for this build. + MODVERSION="Build for ${LIBEBL_SUBDIR} ${eu_version} ${ac_cv_build}" --- elfutils/lib/ChangeLog +++ elfutils/lib/ChangeLog -@@ -65,6 +65,9 @@ +@@ -73,6 +73,9 @@ 2009-01-23 Roland McGrath @@ -589,7 +707,7 @@ * eu-config.h: Add multiple inclusion protection. 2009-01-17 Ulrich Drepper -@@ -121,6 +124,11 @@ +@@ -129,6 +132,11 @@ * Makefile.am (libeu_a_SOURCES): Add it. * system.h: Declare crc32_file. @@ -603,7 +721,7 @@ * Makefile.am: Use -ffunction-sections for xmalloc.c. --- elfutils/lib/eu-config.h +++ elfutils/lib/eu-config.h -@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr +@@ -163,6 +163,17 @@ asm (".section predict_data, \"aw\"; .pr /* This macro is used by the tests conditionalize for standalone building. */ #define ELFUTILS_HEADER(name) @@ -619,19 +737,21 @@ +#endif /* HAVE_BUILTIN_POPCOUNT */ + - #ifdef SHARED + #ifdef SYMBOL_VERSIONING # define OLD_VERSION(name, version) \ --- elfutils/lib/Makefile.in +++ elfutils/lib/Makefile.in -@@ -82,6 +82,7 @@ host_triplet = @host@ +@@ -82,7 +82,8 @@ host_triplet = @host@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ $(noinst_HEADERS) ChangeLog +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -197,6 +198,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -201,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -639,7 +759,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -228,6 +230,7 @@ SHELL = @SHELL@ +@@ -232,6 +234,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -647,20 +767,25 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -289,9 +292,11 @@ top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ - -I$(srcdir)/../libelf +@@ -298,13 +301,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr + + # Warn about stack usage of more than 256K = 262144 bytes. + @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \ +AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ -- $($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) -fpic +- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ + $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ -+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ -+ $(am__append_1) -fpic ++ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(if \ + $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ +- $($(*F)_CFLAGS) -fpic ++ $($(*F)_CFLAGS) $(am__append_1) -fpic COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +-DEFS.os = -DPIC -DSHARED $(am__append_1) ++DEFS.os = -DPIC -DSHARED $(am__append_2) CLEANFILES = *.gcno *.gcda textrel_msg = echo "WARNING: TEXTREL found in '$@'" + @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) --- elfutils/libasm/ChangeLog +++ elfutils/libasm/ChangeLog @@ -87,6 +87,11 @@ @@ -677,18 +802,20 @@ * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. --- elfutils/libasm/Makefile.in +++ elfutils/libasm/Makefile.in -@@ -83,8 +83,9 @@ host_triplet = @host@ +@@ -83,9 +83,10 @@ host_triplet = @host@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING noinst_PROGRAMS = $(am__EXEEXT_1) --@USE_LOCKS_TRUE@am__append_1 = -lpthread -+@USE_LOCKS_TRUE@am__append_2 = -lpthread +-@USE_LOCKS_TRUE@am__append_2 = -lpthread ++@USE_LOCKS_TRUE@am__append_3 = -lpthread subdir = libasm ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -248,6 +249,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -252,6 +253,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -696,7 +823,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -279,6 +281,7 @@ SHELL = @SHELL@ +@@ -283,6 +285,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -704,29 +831,34 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -341,11 +344,11 @@ zip_LIBS = @zip_LIBS@ - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \ - -I$(top_srcdir)/libdw +@@ -350,14 +353,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr + + # Warn about stack usage of more than 256K = 262144 bytes. + @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $($(*F)_CFLAGS) - +AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ + $($(*F)_no_Werror),,-Werror) $(if \ + $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ -+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ -+ $(am__append_1) ++ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(if \ ++ $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ ++ $($(*F)_CFLAGS) $(am__append_1) COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +-DEFS.os = -DPIC -DSHARED $(am__append_1) ++DEFS.os = -DPIC -DSHARED $(am__append_2) CLEANFILES = *.gcno *.gcda $(am_libasm_pic_a_OBJECTS) \ libasm.so.$(VERSION) -@@ -373,7 +376,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort + textrel_msg = echo "WARNING: TEXTREL found in '$@'" +@@ -384,7 +387,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort libasm_pic_a_SOURCES = am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) --libasm_so_LDLIBS = $(am__append_1) -+libasm_so_LDLIBS = $(am__append_2) +-libasm_so_LDLIBS = $(am__append_2) ++libasm_so_LDLIBS = $(am__append_3) libasm_so_SOURCES = noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map @@ -766,15 +898,17 @@ else --- elfutils/libcpu/Makefile.in +++ elfutils/libcpu/Makefile.in -@@ -84,6 +84,7 @@ DIST_COMMON = $(top_srcdir)/config/eu.am +@@ -84,7 +84,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.am i386_lex.c i386_parse.c \ $(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \ $(am__noinst_HEADERS_DIST) ChangeLog +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING @MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT) subdir = libcpu ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -223,6 +224,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -227,6 +228,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -782,7 +916,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = lex.$( * libdw.h (dwarf_offdie): Fix documentation to mention .debug_info. -@@ -1076,6 +1080,10 @@ +@@ -1248,6 +1252,10 @@ * dwarf_hasattr_integrate.c: Integrate DW_AT_specification too. @@ -829,7 +967,7 @@ 2009-08-10 Roland McGrath * dwarf_getscopevar.c: Use dwarf_diename. -@@ -1844,6 +1852,11 @@ +@@ -2016,6 +2024,11 @@ 2005-05-31 Roland McGrath @@ -860,7 +998,7 @@ #endif --- elfutils/libdw/libdw.h +++ elfutils/libdw/libdw.h -@@ -1003,7 +1003,7 @@ extern Dwarf_OOM dwarf_new_oom_handler ( +@@ -1004,7 +1004,7 @@ extern Dwarf_OOM dwarf_new_oom_handler ( /* Inline optimizations. */ @@ -871,17 +1009,19 @@ dwarf_whatattr (Dwarf_Attribute *attr) --- elfutils/libdw/Makefile.in +++ elfutils/libdw/Makefile.in -@@ -84,7 +84,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am +@@ -84,8 +84,9 @@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ $(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \ ChangeLog --@BUILD_STATIC_TRUE@am__append_1 = -fpic +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +-@BUILD_STATIC_TRUE@am__append_2 = -fpic +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) -+@BUILD_STATIC_TRUE@am__append_2 = -fpic ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING ++@BUILD_STATIC_TRUE@am__append_3 = -fpic noinst_PROGRAMS = $(am__EXEEXT_1) subdir = libdw ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -298,6 +299,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -302,6 +303,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -889,7 +1029,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -329,6 +331,7 @@ SHELL = @SHELL@ +@@ -333,6 +335,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -897,32 +1037,38 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -390,10 +393,11 @@ top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ - -I$(srcdir)/../libelf +@@ -399,13 +402,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr + + # Warn about stack usage of more than 256K = 262144 bytes. + @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \ +AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ -- $($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) \ -- $(am__append_1) +- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ + $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ -+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ -+ $(am__append_1) $(am__append_2) ++ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(if \ + $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ +- $($(*F)_CFLAGS) $(am__append_2) ++ $($(*F)_CFLAGS) $(am__append_1) $(am__append_3) COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +-DEFS.os = -DPIC -DSHARED $(am__append_1) ++DEFS.os = -DPIC -DSHARED $(am__append_2) CLEANFILES = *.gcno *.gcda textrel_msg = echo "WARNING: TEXTREL found in '$@'" + @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) --- elfutils/libdwelf/Makefile.in +++ elfutils/libdwelf/Makefile.in -@@ -82,6 +82,7 @@ host_triplet = @host@ +@@ -82,7 +82,8 @@ host_triplet = @host@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING subdir = libdwelf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -227,6 +228,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -231,6 +232,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -930,7 +1076,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -258,6 +260,7 @@ SHELL = @SHELL@ +@@ -262,6 +264,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -938,26 +1084,31 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -320,11 +323,11 @@ zip_LIBS = @zip_LIBS@ - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ - -I$(srcdir)/../libelf -I$(srcdir)/../libdw \ - -I$(srcdir)/../libdwfl -I$(srcdir)/../libebl +@@ -329,14 +332,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr + + # Warn about stack usage of more than 256K = 262144 bytes. + @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $($(*F)_CFLAGS) - +AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ + $($(*F)_no_Werror),,-Werror) $(if \ + $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ -+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ -+ $(am__append_1) ++ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(if \ ++ $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ ++ $($(*F)_CFLAGS) $(am__append_1) COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +-DEFS.os = -DPIC -DSHARED $(am__append_1) ++DEFS.os = -DPIC -DSHARED $(am__append_2) CLEANFILES = *.gcno *.gcda $(am_libdwelf_pic_a_OBJECTS) textrel_msg = echo "WARNING: TEXTREL found in '$@'" + @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -571,6 +571,21 @@ +@@ -704,6 +704,21 @@ (dwfl_module_addrsym) (i_to_symfile): New function. (dwfl_module_addrsym) (search_table): Use it. @@ -979,7 +1130,7 @@ 2013-11-07 Jan Kratochvil Mark Wielaard -@@ -2336,6 +2351,11 @@ +@@ -2469,6 +2484,11 @@ 2005-07-21 Roland McGrath @@ -1061,21 +1212,23 @@ static void --- elfutils/libdwfl/Makefile.in +++ elfutils/libdwfl/Makefile.in -@@ -82,9 +82,10 @@ host_triplet = @host@ +@@ -82,10 +82,11 @@ host_triplet = @host@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog --@ZLIB_TRUE@am__append_1 = gzip.c --@BZLIB_TRUE@am__append_2 = bzip2.c --@LZMA_TRUE@am__append_3 = lzma.c +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +-@ZLIB_TRUE@am__append_2 = gzip.c +-@BZLIB_TRUE@am__append_3 = bzip2.c +-@LZMA_TRUE@am__append_4 = lzma.c +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) -+@ZLIB_TRUE@am__append_2 = gzip.c -+@BZLIB_TRUE@am__append_3 = bzip2.c -+@LZMA_TRUE@am__append_4 = lzma.c ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING ++@ZLIB_TRUE@am__append_3 = gzip.c ++@BZLIB_TRUE@am__append_4 = bzip2.c ++@LZMA_TRUE@am__append_5 = lzma.c subdir = libdwfl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -286,6 +287,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -290,6 +291,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1083,7 +1236,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -317,6 +319,7 @@ SHELL = @SHELL@ +@@ -321,6 +323,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -1091,37 +1244,42 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -379,11 +382,11 @@ zip_LIBS = @zip_LIBS@ - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. -I$(srcdir) \ - -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf +@@ -388,14 +391,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr + + # Warn about stack usage of more than 256K = 262144 bytes. + @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $($(*F)_CFLAGS) - +AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ + $($(*F)_no_Werror),,-Werror) $(if \ + $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ -+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ -+ $(am__append_1) ++ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(if \ ++ $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ ++ $($(*F)_CFLAGS) $(am__append_1) COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +-DEFS.os = -DPIC -DSHARED $(am__append_1) ++DEFS.os = -DPIC -DSHARED $(am__append_2) CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS) textrel_msg = echo "WARNING: TEXTREL found in '$@'" -@@ -413,8 +416,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en + @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) +@@ -424,8 +427,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en dwfl_module_register_names.c dwfl_segment_report_module.c \ link_map.c core-file.c open.c image-header.c dwfl_frame.c \ frame_unwind.c dwfl_frame_pc.c linux-pid-attach.c \ -- linux-core-attach.c dwfl_frame_regs.c $(am__append_1) \ -- $(am__append_2) $(am__append_3) -+ linux-core-attach.c dwfl_frame_regs.c $(am__append_2) \ -+ $(am__append_3) $(am__append_4) +- linux-core-attach.c dwfl_frame_regs.c $(am__append_2) \ +- $(am__append_3) $(am__append_4) ++ linux-core-attach.c dwfl_frame_regs.c $(am__append_3) \ ++ $(am__append_4) $(am__append_5) libdwfl = $(libdw) libdw = ../libdw/libdw.so libelf = ../libelf/libelf.so --- elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog -@@ -765,6 +765,11 @@ +@@ -780,6 +780,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. @@ -1135,15 +1293,17 @@ * libebl_x86_64.map: Add x86_64_core_note. --- elfutils/libebl/Makefile.in +++ elfutils/libebl/Makefile.in -@@ -82,6 +82,7 @@ host_triplet = @host@ +@@ -82,7 +82,8 @@ host_triplet = @host@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING subdir = libebl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -249,6 +250,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -253,6 +254,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1151,7 +1311,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -280,6 +282,7 @@ SHELL = @SHELL@ +@@ -284,6 +286,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -1159,23 +1319,28 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -342,9 +345,11 @@ zip_LIBS = @zip_LIBS@ - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ - -I$(srcdir)/../libelf -I$(srcdir)/../libdw \ - -I$(srcdir)/../libasm +@@ -351,13 +354,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr + + # Warn about stack usage of more than 256K = 262144 bytes. + @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \ +AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ -- $($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) -fpic +- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ + $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ -+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ -+ $(am__append_1) -fpic ++ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(if \ + $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ +- $($(*F)_CFLAGS) -fpic ++ $($(*F)_CFLAGS) $(am__append_1) -fpic COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +-DEFS.os = -DPIC -DSHARED $(am__append_1) ++DEFS.os = -DPIC -DSHARED $(am__append_2) CLEANFILES = *.gcno *.gcda $(am_libebl_pic_a_OBJECTS) textrel_msg = echo "WARNING: TEXTREL found in '$@'" + @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -244,6 +244,11 @@ +@@ -398,6 +398,11 @@ * elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check. @@ -1187,7 +1352,7 @@ 2011-02-26 Mark Wielaard * elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini. -@@ -921,6 +926,11 @@ +@@ -1075,6 +1080,11 @@ * elf.h: Update from glibc. @@ -1241,20 +1406,22 @@ } --- elfutils/libelf/Makefile.in +++ elfutils/libelf/Makefile.in -@@ -84,9 +84,10 @@ DIST_COMMON = $(top_srcdir)/config/eu.am +@@ -84,10 +84,11 @@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ $(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \ ChangeLog --@BUILD_STATIC_TRUE@am__append_1 = -fpic +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +-@BUILD_STATIC_TRUE@am__append_2 = -fpic +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) -+@BUILD_STATIC_TRUE@am__append_2 = -fpic ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING ++@BUILD_STATIC_TRUE@am__append_3 = -fpic noinst_PROGRAMS = $(am__EXEEXT_1) --@USE_LOCKS_TRUE@am__append_2 = -lpthread -+@USE_LOCKS_TRUE@am__append_3 = -lpthread +-@USE_LOCKS_TRUE@am__append_3 = -lpthread ++@USE_LOCKS_TRUE@am__append_4 = -lpthread subdir = libelf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -291,6 +292,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -295,6 +296,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1262,7 +1429,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -322,6 +324,7 @@ SHELL = @SHELL@ +@@ -326,6 +328,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -1270,33 +1437,37 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -382,10 +385,11 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. +@@ -391,13 +394,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr + + # Warn about stack usage of more than 256K = 262144 bytes. + @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \ +AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ -- $($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) \ -- $(am__append_1) +- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ + $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ -+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ -+ $(am__append_1) $(am__append_2) ++ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(if \ + $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ +- $($(*F)_CFLAGS) $(am__append_2) ++ $($(*F)_CFLAGS) $(am__append_1) $(am__append_3) COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +-DEFS.os = -DPIC -DSHARED $(am__append_1) ++DEFS.os = -DPIC -DSHARED $(am__append_2) CLEANFILES = *.gcno *.gcda $(am_libelf_pic_a_OBJECTS) \ libelf.so.$(VERSION) -@@ -449,7 +453,7 @@ libelf_a_SOURCES = elf_version.c elf_has + textrel_msg = echo "WARNING: TEXTREL found in '$@'" +@@ -460,7 +464,7 @@ libelf_a_SOURCES = elf_version.c elf_has libelf_pic_a_SOURCES = am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) --libelf_so_LDLIBS = $(am__append_2) -+libelf_so_LDLIBS = $(am__append_3) +-libelf_so_LDLIBS = $(am__append_3) ++libelf_so_LDLIBS = $(am__append_4) libelf_so_SOURCES = noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \ version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h --- elfutils/m4/Makefile.in +++ elfutils/m4/Makefile.in -@@ -145,6 +145,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -148,6 +148,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1304,7 +1475,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -176,6 +177,7 @@ SHELL = @SHELL@ +@@ -179,6 +180,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1314,7 +1485,7 @@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ --- elfutils/Makefile.in +++ elfutils/Makefile.in -@@ -263,6 +263,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -266,6 +266,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1322,7 +1493,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -294,6 +295,7 @@ SHELL = @SHELL@ +@@ -297,6 +298,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1332,7 +1503,7 @@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ --- elfutils/src/addr2line.c +++ elfutils/src/addr2line.c -@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl +@@ -622,10 +622,10 @@ handle_address (const char *string, Dwfl bool parsed = false; int i, j; char *name = NULL; @@ -1345,9 +1516,26 @@ { default: break; +--- elfutils/src/ar.c ++++ elfutils/src/ar.c +@@ -685,7 +685,14 @@ do_oper_extract (int oper, const char *a + tv[1].tv_sec = arhdr->ar_date; + tv[1].tv_nsec = 0; + ++#ifdef HAVE_FUTIMENS + if (unlikely (futimens (xfd, tv) != 0)) ++#else ++ struct timeval times[2]; ++ TIMESPEC_TO_TIMEVAL (×[0], &tv[0]); ++ TIMESPEC_TO_TIMEVAL (×[1], &tv[1]); ++ if (unlikely (futimes (xfd, times) != 0)) ++#endif + { + error (0, errno, + gettext ("cannot change modification time of %s"), --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -1371,8 +1371,16 @@ +@@ -1598,8 +1598,16 @@ * readelf.c (attr_callback): Use print_block only when we don't use print_ops. @@ -1364,7 +1552,7 @@ * ar.c (do_oper_extract): Use pathconf instead of statfs. 2009-08-01 Ulrich Drepper -@@ -1536,6 +1544,8 @@ +@@ -1763,6 +1771,8 @@ * readelf.c (print_debug_frame_section): Use t instead of j formats for ptrdiff_t OFFSET. @@ -1373,7 +1561,7 @@ 2009-01-21 Ulrich Drepper * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section -@@ -1719,6 +1729,11 @@ +@@ -1946,6 +1956,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. @@ -1385,7 +1573,7 @@ 2008-02-29 Roland McGrath * readelf.c (print_attributes): Add a cast. -@@ -1970,6 +1985,8 @@ +@@ -2197,6 +2212,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -1394,7 +1582,7 @@ 2007-10-15 Roland McGrath * make-debug-archive.in: New file. -@@ -2409,6 +2426,10 @@ +@@ -2636,6 +2653,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . @@ -1405,7 +1593,7 @@ 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -2485,6 +2506,10 @@ +@@ -2712,6 +2733,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -1416,7 +1604,7 @@ 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -2833,6 +2858,11 @@ +@@ -3060,6 +3085,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -1462,50 +1650,52 @@ #endif /* ld.h */ --- elfutils/src/Makefile.am +++ elfutils/src/Makefile.am -@@ -89,6 +89,11 @@ endif - # XXX While the file is not finished, don't warn about this +@@ -90,6 +90,11 @@ endif ldgeneric_no_Wunused = yes + ldgeneric_no_Wstack_usage = yes +# Buggy old compilers or libc headers. +readelf_no_Werror = yes +strings_no_Werror = yes +addr2line_no_Wformat = yes + - readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl - nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \ - $(demanglelib) + # Bad, bad stack usage... + readelf_no_Wstack_usage = yes + nm_no_Wstack_usage = yes --- elfutils/src/Makefile.in +++ elfutils/src/Makefile.in -@@ -85,6 +85,7 @@ DIST_COMMON = $(top_srcdir)/config/eu.am +@@ -85,7 +85,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.am ldlex.c ldscript.c \ $(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \ $(noinst_HEADERS) ChangeLog +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \ strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \ findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \ -@@ -93,9 +94,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE +@@ -94,9 +95,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE @NATIVE_LD_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1) # We never build this library but we need to get the dependency files # of all the linker backends that might be used in a non-generic linker. --@NEVER_TRUE@am__append_1 = libdummy.a -+@NEVER_TRUE@am__append_2 = libdummy.a +-@NEVER_TRUE@am__append_2 = libdummy.a ++@NEVER_TRUE@am__append_3 = libdummy.a # -ldl is always needed for libebl. --@NATIVE_LD_TRUE@am__append_2 = libld_elf.a -+@NATIVE_LD_TRUE@am__append_3 = libld_elf.a +-@NATIVE_LD_TRUE@am__append_3 = libld_elf.a ++@NATIVE_LD_TRUE@am__append_4 = libld_elf.a @NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS = subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -159,7 +160,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$ - ldscript.$(OBJEXT) symbolhash.$(OBJEXT) sectionhash.$(OBJEXT) \ +@@ -164,7 +165,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$ versionhash.$(OBJEXT) ld_OBJECTS = $(am_ld_OBJECTS) --ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__append_2) -+ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__append_3) + ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__DEPENDENCIES_1) \ +- $(am__append_3) ++ $(am__append_4) ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \ $@ am_libld_elf_i386_so_OBJECTS = -@@ -340,6 +341,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -350,6 +351,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1513,7 +1703,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -371,6 +373,7 @@ SHELL = @SHELL@ +@@ -381,6 +383,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1521,57 +1711,63 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -434,11 +437,11 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr - -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \ - -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm +@@ -449,14 +452,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr + + # Warn about stack usage of more than 256K = 262144 bytes. + @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $($(*F)_CFLAGS) - +AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ + $($(*F)_no_Werror),,-Werror) $(if \ + $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ -+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ -+ $(am__append_1) ++ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(if \ ++ $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ ++ $($(*F)_CFLAGS) $(am__append_1) COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +-DEFS.os = -DPIC -DSHARED $(am__append_1) ++DEFS.os = -DPIC -DSHARED $(am__append_2) CLEANFILES = *.gcno *.gcda make-debug-archive none_ld.os \ $(ld_modules:.c=.os) *.gconv -@@ -452,8 +455,8 @@ AM_LFLAGS = -Pld -olex.yy.c + textrel_msg = echo "WARNING: TEXTREL found in '$@'" +@@ -469,8 +472,8 @@ AM_LFLAGS = -Pld -olex.yy.c native_ld = @native_ld@ ld_dsos = libld_elf_i386_pic.a @NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \ --@NATIVE_LD_FALSE@ $(am__append_1) --@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_1) -+@NATIVE_LD_FALSE@ $(am__append_2) -+@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_2) +-@NATIVE_LD_FALSE@ $(am__append_2) +-@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_2) ++@NATIVE_LD_FALSE@ $(am__append_3) ++@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_3) @NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu) @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \ -@@ -479,13 +482,18 @@ libeu = ../lib/libeu.a - - # XXX While the file is not finished, don't warn about this +@@ -498,6 +501,11 @@ libeu = ../lib/libeu.a ldgeneric_no_Wunused = yes -+ + ldgeneric_no_Wstack_usage = yes + +# Buggy old compilers or libc headers. +readelf_no_Werror = yes +strings_no_Werror = yes +addr2line_no_Wformat = yes - readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl - nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \ - $(demanglelib) - - size_LDADD = $(libelf) $(libeu) - strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl --ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(am__append_2) -+ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(am__append_3) ++ + # Bad, bad stack usage... + readelf_no_Wstack_usage = yes + nm_no_Wstack_usage = yes +@@ -517,7 +525,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf) + size_LDADD = $(libelf) $(libeu) $(argp_LDADD) + strip_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl + ld_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \ +- $(am__append_3) ++ $(am__append_4) ld_LDFLAGS = -rdynamic - elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl - findtextrel_LDADD = $(libdw) $(libelf) + elflint_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl + findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -4368,10 +4368,12 @@ listptr_base (struct listptr *p) +@@ -4364,10 +4364,12 @@ listptr_base (struct listptr *p) return base; } @@ -1586,7 +1782,7 @@ struct listptr *p1 = (void *) a; struct listptr *p2 = (void *) b; -@@ -4467,8 +4469,11 @@ static void +@@ -4463,8 +4465,11 @@ static void sort_listptr (struct listptr_table *table, const char *name) { if (table->n > 0) @@ -1600,7 +1796,7 @@ } static bool -@@ -9539,7 +9544,7 @@ dump_archive_index (Elf *elf, const char +@@ -9561,7 +9566,7 @@ dump_archive_index (Elf *elf, const char if (unlikely (elf_rand (elf, as_off) == 0) || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf)) == NULL)) @@ -1650,53 +1846,33 @@ if (unlikely (elfmap == MAP_FAILED)) --- elfutils/src/strip.c +++ elfutils/src/strip.c -@@ -45,6 +45,12 @@ - #include - #include - -+#ifdef HAVE_FUTIMES -+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp) -+#else -+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp) -+#endif -+ - typedef uint8_t GElf_Byte; - - /* Name and version of program. */ -@@ -318,8 +324,18 @@ process_file (const char *fname) - - /* If we have to preserve the timestamp, we need it in the - format utimes() understands. */ -+#ifdef HAVE_STRUCT_STAT_ST_ATIM - TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim); -+#else -+ tv[0].tv_sec = pre_st.st_atime; -+ tv[0].tv_usec = 0; -+#endif -+#ifdef HAVE_STRUCT_STAT_ST_MTIM - TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim); -+#else -+ tv[1].tv_sec = pre_st.st_atime; -+ tv[1].tv_usec = 0; -+#endif - } - - /* Open the file. */ -@@ -2091,7 +2107,7 @@ while computing checksum for debug infor +@@ -2191,7 +2191,14 @@ while computing checksum for debug infor /* If requested, preserve the timestamp. */ if (tvp != NULL) { -- if (futimes (fd, tvp) != 0) -+ if (FUTIMES (fd, output_fname, tvp) != 0) ++#ifdef HAVE_FUTIMENS + if (futimens (fd, tvp) != 0) ++#else ++ struct timeval times[2]; ++ TIMESPEC_TO_TIMEVAL (×[0], &tvp[0]); ++ TIMESPEC_TO_TIMEVAL (×[1], &tvp[1]); ++ if (futimes (fd, times) != 0) ++#endif { error (0, errno, gettext ("\ cannot set access and modification date of '%s'"), -@@ -2148,7 +2164,7 @@ handle_ar (int fd, Elf *elf, const char +@@ -2263,7 +2270,14 @@ handle_ar (int fd, Elf *elf, const char if (tvp != NULL) { -- if (unlikely (futimes (fd, tvp) != 0)) -+ if (unlikely (FUTIMES (fd, fname, tvp) != 0)) ++#ifdef HAVE_FUTIMENS + if (unlikely (futimens (fd, tvp) != 0)) ++#else ++ struct timeval times[2]; ++ TIMESPEC_TO_TIMEVAL (×[0], &tvp[0]); ++ TIMESPEC_TO_TIMEVAL (×[1], &tvp[1]); ++ if (unlikely (futimes (fd, times) != 0)) ++#endif { error (0, errno, gettext ("\ cannot set access and modification date of '%s'"), fname); @@ -1712,7 +1888,7 @@ #ifndef __linux__ --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -421,6 +421,13 @@ +@@ -609,6 +609,13 @@ 2013-12-02 Jan Kratochvil @@ -1726,7 +1902,7 @@ * Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child, backtrace-data and backtrace-dwarf. (BUILT_SOURCES, clean-local, backtrace-child-biarch): New. -@@ -1285,6 +1292,8 @@ +@@ -1473,6 +1480,8 @@ 2008-01-21 Roland McGrath @@ -1735,7 +1911,7 @@ * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. -@@ -1993,6 +2002,11 @@ +@@ -2181,6 +2190,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -1760,64 +1936,67 @@ case 0: --- elfutils/tests/Makefile.am +++ elfutils/tests/Makefile.am -@@ -365,6 +365,7 @@ get_lines_LDADD = $(libdw) $(libelf) +@@ -382,6 +382,7 @@ get_lines_LDADD = $(libdw) $(libelf) get_files_LDADD = $(libdw) $(libelf) get_aranges_LDADD = $(libdw) $(libelf) allfcts_LDADD = $(libdw) $(libelf) +line2addr_no_Wformat = yes - line2addr_LDADD = $(libdw) - addrscopes_LDADD = $(libdw) - funcscopes_LDADD = $(libdw) + line2addr_LDADD = $(libdw) $(argp_LDADD) + addrscopes_LDADD = $(libdw) $(argp_LDADD) + funcscopes_LDADD = $(libdw) $(argp_LDADD) --- elfutils/tests/Makefile.in +++ elfutils/tests/Makefile.in -@@ -80,13 +80,14 @@ host_triplet = @host@ +@@ -80,14 +80,15 @@ host_triplet = @host@ DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ $(top_srcdir)/config/test-driver ChangeLog --@STANDALONE_FALSE@am__append_1 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ +-@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +-@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) -+@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ ++@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING ++@STANDALONE_FALSE@am__append_3 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ @STANDALONE_FALSE@ -I$(top_srcdir)/libdwfl -I$(top_srcdir)/libdwelf \ @STANDALONE_FALSE@ -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \ @STANDALONE_FALSE@ -I$(top_srcdir)/lib -I.. --@STANDALONE_FALSE@am__append_2 = -Wl,-rpath-link,../libasm:../libdw:../libelf --@TESTS_RPATH_TRUE@am__append_3 = -Wl,-rpath,$(BUILD_RPATH) -+@STANDALONE_FALSE@am__append_3 = -Wl,-rpath-link,../libasm:../libdw:../libelf -+@TESTS_RPATH_TRUE@am__append_4 = -Wl,-rpath,$(BUILD_RPATH) +-@STANDALONE_FALSE@am__append_3 = -Wl,-rpath-link,../libasm:../libdw:../libelf +-@TESTS_RPATH_TRUE@am__append_4 = -Wl,-rpath,$(BUILD_RPATH) ++@STANDALONE_FALSE@am__append_4 = -Wl,-rpath-link,../libasm:../libdw:../libelf ++@TESTS_RPATH_TRUE@am__append_5 = -Wl,-rpath,$(BUILD_RPATH) check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \ newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \ sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \ -@@ -113,7 +114,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy - deleted$(EXEEXT) deleted-lib.so$(EXEEXT) \ - aggregate_size$(EXEEXT) vdsosyms$(EXEEXT) $(am__EXEEXT_1) \ - $(am__EXEEXT_2) $(am__EXEEXT_4) --@BIARCH_TRUE@am__append_4 = backtrace-child-biarch -+@BIARCH_TRUE@am__append_5 = backtrace-child-biarch +@@ -116,7 +117,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy + aggregate_size$(EXEEXT) vdsosyms$(EXEEXT) getsrc_die$(EXEEXT) \ + strptr$(EXEEXT) newdata$(EXEEXT) elfstrtab$(EXEEXT) \ + $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4) +-@BIARCH_TRUE@am__append_5 = backtrace-child-biarch ++@BIARCH_TRUE@am__append_6 = backtrace-child-biarch TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \ test-nlist$(EXEEXT) update1$(EXEEXT) update2$(EXEEXT) \ update3$(EXEEXT) update4$(EXEEXT) run-show-die-info.sh \ -@@ -159,14 +160,14 @@ TESTS = run-arextract.sh run-arsymtest.s - run-stack-i-test.sh run-readelf-dwz-multi.sh \ +@@ -166,14 +167,14 @@ TESTS = run-arextract.sh run-arsymtest.s run-allfcts-multi.sh run-deleted.sh run-linkmap-cut.sh \ run-aggregate-size.sh vdsosyms$(EXEEXT) run-readelf-A.sh \ -- $(am__EXEEXT_2) $(am__append_7) $(am__append_8) \ -+ $(am__EXEEXT_2) $(am__append_8) $(am__append_9) \ - $(am__EXEEXT_4) --@STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test - @STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test --@LZMA_TRUE@am__append_7 = run-readelf-s.sh run-dwflsyms.sh --@ZLIB_TRUE@am__append_8 = run-readelf-zdebug.sh --@HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS) -+@STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test -+@LZMA_TRUE@am__append_8 = run-readelf-s.sh run-dwflsyms.sh -+@ZLIB_TRUE@am__append_9 = run-readelf-zdebug.sh - @HAVE_LIBASM_TRUE@am__append_10 = $(asm_TESTS) -+@HAVE_LIBASM_TRUE@am__append_11 = $(asm_TESTS) + run-getsrc-die.sh run-strptr.sh newdata$(EXEEXT) \ +- elfstrtab$(EXEEXT) $(am__EXEEXT_2) $(am__append_8) \ +- $(am__append_9) $(am__EXEEXT_4) +-@STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test ++ elfstrtab$(EXEEXT) $(am__EXEEXT_2) $(am__append_9) \ ++ $(am__append_10) $(am__EXEEXT_4) + @STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test +-@LZMA_TRUE@am__append_8 = run-readelf-s.sh run-dwflsyms.sh +-@ZLIB_TRUE@am__append_9 = run-readelf-zdebug.sh +-@HAVE_LIBASM_TRUE@am__append_10 = $(asm_TESTS) ++@STANDALONE_FALSE@am__append_8 = msg_tst md5-sha1-test ++@LZMA_TRUE@am__append_9 = run-readelf-s.sh run-dwflsyms.sh ++@ZLIB_TRUE@am__append_10 = run-readelf-zdebug.sh + @HAVE_LIBASM_TRUE@am__append_11 = $(asm_TESTS) ++@HAVE_LIBASM_TRUE@am__append_12 = $(asm_TESTS) subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -787,6 +788,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -819,6 +820,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1825,7 +2004,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -818,6 +820,7 @@ SHELL = @SHELL@ +@@ -850,6 +852,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1833,39 +2012,47 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -877,12 +880,12 @@ top_build_prefix = @top_build_prefix@ +@@ -910,26 +913,26 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ --AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_1) +-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2) ++AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_3) + @ADD_STACK_USAGE_WARNING_FALSE@STACK_USAGE_WARNING = + + # Warn about stack usage of more than 256K = 262144 bytes. + @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $($(*F)_CFLAGS) - -+AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2) +AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ + $($(*F)_no_Werror),,-Werror) $(if \ + $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ -+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ -+ $(am__append_1) ++ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(if \ ++ $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ ++ $($(*F)_CFLAGS) $(am__append_1) COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +-DEFS.os = -DPIC -DSHARED $(am__append_1) ++DEFS.os = -DPIC -DSHARED $(am__append_2) CLEANFILES = *.gcno *.gcda textrel_msg = echo "WARNING: TEXTREL found in '$@'" -@@ -890,7 +893,7 @@ textrel_msg = echo "WARNING: TEXTREL fou + @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) @FATAL_TEXTREL_TRUE@textrel_found = $(textrel_msg); exit 1 textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then $(textrel_found); fi BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf --AM_LDFLAGS = $(am__append_2) $(am__append_3) -+AM_LDFLAGS = $(am__append_3) $(am__append_4) +-AM_LDFLAGS = $(am__append_3) $(am__append_4) ++AM_LDFLAGS = $(am__append_4) $(am__append_5) @TESTS_RPATH_FALSE@tests_rpath = no @TESTS_RPATH_TRUE@tests_rpath = yes asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \ -@@ -1106,6 +1109,7 @@ get_lines_LDADD = $(libdw) $(libelf) +@@ -1156,6 +1159,7 @@ get_lines_LDADD = $(libdw) $(libelf) get_files_LDADD = $(libdw) $(libelf) get_aranges_LDADD = $(libdw) $(libelf) allfcts_LDADD = $(libdw) $(libelf) +line2addr_no_Wformat = yes - line2addr_LDADD = $(libdw) - addrscopes_LDADD = $(libdw) - funcscopes_LDADD = $(libdw) + line2addr_LDADD = $(libdw) $(argp_LDADD) + addrscopes_LDADD = $(libdw) $(argp_LDADD) + funcscopes_LDADD = $(libdw) $(argp_LDADD) diff --git a/elfutils.spec b/elfutils.spec index a480c16..17ee491 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,7 +1,7 @@ Name: elfutils Summary: A collection of utilities and DSOs to handle compiled objects -Version: 0.161 -%global baserelease 8 +Version: 0.162 +%global baserelease 1 URL: https://fedorahosted.org/elfutils/ %global source_url http://fedorahosted.org/releases/e/l/elfutils/%{version}/ License: GPLv3+ and (GPLv2+ or LGPLv3+) @@ -46,14 +46,6 @@ Source: %{?source_url}%{name}-%{version}.tar.bz2 Patch1: %{?source_url}elfutils-portability-%{version}.patch -Patch2: elfutils-0.161-ar-long-name.patch -# libdw: fix offset for sig8 lookup in dwarf_formref_die -Patch3: elfutils-0.161-formref-type.patch -# rhbz#1189928 - Consider sh_addralign 0 as 1 -Patch4: elfutils-0.161-addralign.patch -Patch5: elfutils-0.161-copyreloc.patch -Patch6: elfutils-0.161-aarch64relro.patch - %if !%{compat} Release: %{baserelease}%{?dist} %else @@ -73,8 +65,6 @@ BuildRequires: flex >= 2.5.4a BuildRequires: bzip2 %if !%{compat} BuildRequires: gcc >= 3.4 -# Need that gives unsigned bswap_16 etc. -BuildRequires: glibc-headers >= 2.3.4-11 %else BuildRequires: gcc >= 3.2 %endif @@ -215,12 +205,6 @@ sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c %endif %endif -%patch2 -p1 -b .ar_long_name -%patch3 -p1 -b .formref_type -%patch4 -p1 -b .addralign -%patch5 -p1 -b .copyreloc -%patch6 -p1 -b .aarch64relro - find . -name \*.sh ! -perm -0100 -print | xargs chmod +x %build @@ -314,6 +298,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_includedir}/dwarf.h %dir %{_includedir}/elfutils %{_includedir}/elfutils/elf-knowledge.h +%{_includedir}/elfutils/known-dwarf.h %{_includedir}/elfutils/libasm.h %{_includedir}/elfutils/libebl.h %{_includedir}/elfutils/libdw.h @@ -348,6 +333,17 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Thu Jun 11 2015 Mark Wielaard - 0.162-1 +- Update to 0.162 (#1170810, #1139815, #1129756, #1020842) +- Include elfutils/known-dwarf.h +- Drop BuildRequires glibc-headers (#1230468) +- Removed integrated upstream patches: + - elfutils-0.161-aarch64relro.patch + - elfutils-0.161-copyreloc.patch + - elfutils-0.161-addralign.patch + - elfutils-0.161-ar-long-name.patch + - elfutils-0.161-formref-type.patch + * Sat May 02 2015 Kalev Lember - 0.161-8 - Rebuilt for GCC 5 C++11 ABI change diff --git a/sources b/sources index d5e1096..5837cff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1b9847c9a6a1ad340de8d47a863ec52 elfutils-0.161.tar.bz2 +9334cbcc0df7669b7bf07cf7fc3ad52c elfutils-0.162.tar.bz2 From eb0b633dd4c74228579731de166655458e42dfd0 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 16 Jun 2015 14:25:20 +0200 Subject: [PATCH 4/5] 0.162-2 - Add elfutils-0.162-ftruncate-allocate.patch (#1232206) --- elfutils-0.162-ftruncate-allocate.patch | 103 ++++++++++++++++++++++++ elfutils.spec | 10 ++- 2 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 elfutils-0.162-ftruncate-allocate.patch diff --git a/elfutils-0.162-ftruncate-allocate.patch b/elfutils-0.162-ftruncate-allocate.patch new file mode 100644 index 0000000..6f32fed --- /dev/null +++ b/elfutils-0.162-ftruncate-allocate.patch @@ -0,0 +1,103 @@ +From e4e846b67df12045ee6554bfb568a89b4ed80a71 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Tue, 16 Jun 2015 14:05:35 +0200 +Subject: [PATCH] libelf: Always call ftruncate before posix_fallocate to set + the right size. + +When elf_update.c (write_file) doesn't know the current maximum file length +it might have to reduce the file size. posix_fallocate can only extend the +file. So always call ftruncate before that to set the file size and making +sure the backing store is fully there. Add test cases for checking strip +in place (eu-strip without -o) actually reduces the file size. But only +for non-ET_REL files. We might not be able to strip ET_REL files (except +when they are kernel modules) because they might contain "dangling" symbol +table entries. + +https://bugzilla.redhat.com/show_bug.cgi?id=1232206 + +Signed-off-by: Mark Wielaard +--- + libelf/ChangeLog | 5 +++++ + libelf/elf_update.c | 7 +++++-- + tests/ChangeLog | 5 +++++ + tests/run-strip-test.sh | 13 +++++++++++++ + 4 files changed, 28 insertions(+), 2 deletions(-) + +diff --git a/libelf/ChangeLog b/libelf/ChangeLog +index 30017cd..2d24007 100644 +--- a/libelf/ChangeLog ++++ b/libelf/ChangeLog +@@ -1,3 +1,8 @@ ++2015-06-16 Mark Wielaard ++ ++ * elf_update.c (write_file): Always also use ftruncate before ++ posix_fallocate to make sure file has the right size. ++ + 2015-06-04 Mark Wielaard + + * elf_getdata.c (__libelf_type_aligns): Add entries for ELF_T_EHDR, +diff --git a/libelf/elf_update.c b/libelf/elf_update.c +index 9e34c46..9eb007b 100644 +--- a/libelf/elf_update.c ++++ b/libelf/elf_update.c +@@ -60,15 +60,18 @@ write_file (Elf *elf, off_t size, int change_bo, size_t shnum) + new file. We truncate the file later in this case. + + Note we use posix_fallocate to make sure the file content is really +- there. Using ftruncate might mean the file is extended, but space ++ there. Only using ftruncate might mean the file is extended, but space + isn't allocated yet. This might cause a SIGBUS once we write into + the mmapped space and the disk is full. Using fallocate might fail + on some file systems. posix_fallocate is required to extend the file + and allocate enough space even if the underlying filesystem would +- normally return EOPNOTSUPP. */ ++ normally return EOPNOTSUPP. Note that we do also need to ftruncate ++ in case the maximum_size isn't known and the file needs to be shorter ++ because posix_fallocate can only extend. */ + if (elf->parent == NULL + && (elf->maximum_size == ~((size_t) 0) + || (size_t) size > elf->maximum_size) ++ && unlikely (ftruncate (elf->fildes, size) != 0) + && unlikely (posix_fallocate (elf->fildes, 0, size) != 0)) + { + __libelf_seterrno (ELF_E_WRITE_ERROR); +diff --git a/tests/ChangeLog b/tests/ChangeLog +index 19878ac..34f89cc 100644 +--- a/tests/ChangeLog ++++ b/tests/ChangeLog +@@ -1,3 +1,8 @@ ++2015-06-16 Mark Wielaard ++ ++ * run-strip-test.sh: Add strip-in-place (eu-strip without -o) test ++ for non-ET_REL files. ++ + 2015-05-30 Mark Wielaard + + * backtrace-subr.sh (check_native_core): Notice core file couldn't be +diff --git a/tests/run-strip-test.sh b/tests/run-strip-test.sh +index c558e90..2ebb5a9 100755 +--- a/tests/run-strip-test.sh ++++ b/tests/run-strip-test.sh +@@ -49,6 +49,19 @@ testrun ${abs_top_builddir}/src/unstrip -o testfile.unstrip testfile.temp testfi + testrun ${abs_top_builddir}/src/elfcmp --hash-inexact $original testfile.unstrip + } + ++# Now strip in-place and make sure it is smaller. ++# Skip ET_REL files, they might have unexpected symbol table entries. ++is_ET_REL=0 ++testrun ${abs_top_builddir}/src/readelf -h $original 2>&1 \ ++ | fgrep 'REL (Relocatable file)' && is_ET_REL=1 ++if test $is_ET_REL -eq 0; then ++ SIZE_original=$(stat -c%s $original) ++ testrun ${abs_top_builddir}/src/strip $original ++ SIZE_stripped=$(stat -c%s $original) ++ test $SIZE_stripped -lt $SIZE_original || ++ { echo "*** failure in-place strip file not smaller $original"; status=1; } ++fi ++ + tempfiles testfile.sections + testrun ${abs_top_builddir}/src/readelf -S testfile.temp > testfile.sections || status=$? + fgrep ' .debug_' testfile.sections && status=1 +-- +1.8.3.1 + diff --git a/elfutils.spec b/elfutils.spec index 17ee491..37b2823 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,7 +1,7 @@ Name: elfutils Summary: A collection of utilities and DSOs to handle compiled objects Version: 0.162 -%global baserelease 1 +%global baserelease 2 URL: https://fedorahosted.org/elfutils/ %global source_url http://fedorahosted.org/releases/e/l/elfutils/%{version}/ License: GPLv3+ and (GPLv2+ or LGPLv3+) @@ -46,6 +46,9 @@ Source: %{?source_url}%{name}-%{version}.tar.bz2 Patch1: %{?source_url}elfutils-portability-%{version}.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1232206 +Patch2: elfutils-0.162-ftruncate-allocate.patch + %if !%{compat} Release: %{baserelease}%{?dist} %else @@ -205,6 +208,8 @@ sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c %endif %endif +%patch2 -p1 -b .ftruncate + find . -name \*.sh ! -perm -0100 -print | xargs chmod +x %build @@ -333,6 +338,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Tue Jun 16 2015 Mark Wielaard - 0.162-2 +- Add elfutils-0.162-ftruncate-allocate.patch (#1232206) + * Thu Jun 11 2015 Mark Wielaard - 0.162-1 - Update to 0.162 (#1170810, #1139815, #1129756, #1020842) - Include elfutils/known-dwarf.h From 246a47b0fc1211b4e7acc03e9dccc0557e36cb20 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 19 Jun 2015 15:30:55 +0200 Subject: [PATCH 5/5] Update to 0.163. --- .gitignore | 1 + elfutils-0.162-ftruncate-allocate.patch | 103 ------ ....patch => elfutils-portability-0.163.patch | 312 ++++++++++-------- elfutils.spec | 13 +- sources | 2 +- 5 files changed, 189 insertions(+), 242 deletions(-) delete mode 100644 elfutils-0.162-ftruncate-allocate.patch rename elfutils-portability-0.162.patch => elfutils-portability-0.163.patch (89%) diff --git a/.gitignore b/.gitignore index c20acfc..948e70d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /elfutils-0.160.tar.bz2 /elfutils-0.161.tar.bz2 /elfutils-0.162.tar.bz2 +/elfutils-0.163.tar.bz2 diff --git a/elfutils-0.162-ftruncate-allocate.patch b/elfutils-0.162-ftruncate-allocate.patch deleted file mode 100644 index 6f32fed..0000000 --- a/elfutils-0.162-ftruncate-allocate.patch +++ /dev/null @@ -1,103 +0,0 @@ -From e4e846b67df12045ee6554bfb568a89b4ed80a71 Mon Sep 17 00:00:00 2001 -From: Mark Wielaard -Date: Tue, 16 Jun 2015 14:05:35 +0200 -Subject: [PATCH] libelf: Always call ftruncate before posix_fallocate to set - the right size. - -When elf_update.c (write_file) doesn't know the current maximum file length -it might have to reduce the file size. posix_fallocate can only extend the -file. So always call ftruncate before that to set the file size and making -sure the backing store is fully there. Add test cases for checking strip -in place (eu-strip without -o) actually reduces the file size. But only -for non-ET_REL files. We might not be able to strip ET_REL files (except -when they are kernel modules) because they might contain "dangling" symbol -table entries. - -https://bugzilla.redhat.com/show_bug.cgi?id=1232206 - -Signed-off-by: Mark Wielaard ---- - libelf/ChangeLog | 5 +++++ - libelf/elf_update.c | 7 +++++-- - tests/ChangeLog | 5 +++++ - tests/run-strip-test.sh | 13 +++++++++++++ - 4 files changed, 28 insertions(+), 2 deletions(-) - -diff --git a/libelf/ChangeLog b/libelf/ChangeLog -index 30017cd..2d24007 100644 ---- a/libelf/ChangeLog -+++ b/libelf/ChangeLog -@@ -1,3 +1,8 @@ -+2015-06-16 Mark Wielaard -+ -+ * elf_update.c (write_file): Always also use ftruncate before -+ posix_fallocate to make sure file has the right size. -+ - 2015-06-04 Mark Wielaard - - * elf_getdata.c (__libelf_type_aligns): Add entries for ELF_T_EHDR, -diff --git a/libelf/elf_update.c b/libelf/elf_update.c -index 9e34c46..9eb007b 100644 ---- a/libelf/elf_update.c -+++ b/libelf/elf_update.c -@@ -60,15 +60,18 @@ write_file (Elf *elf, off_t size, int change_bo, size_t shnum) - new file. We truncate the file later in this case. - - Note we use posix_fallocate to make sure the file content is really -- there. Using ftruncate might mean the file is extended, but space -+ there. Only using ftruncate might mean the file is extended, but space - isn't allocated yet. This might cause a SIGBUS once we write into - the mmapped space and the disk is full. Using fallocate might fail - on some file systems. posix_fallocate is required to extend the file - and allocate enough space even if the underlying filesystem would -- normally return EOPNOTSUPP. */ -+ normally return EOPNOTSUPP. Note that we do also need to ftruncate -+ in case the maximum_size isn't known and the file needs to be shorter -+ because posix_fallocate can only extend. */ - if (elf->parent == NULL - && (elf->maximum_size == ~((size_t) 0) - || (size_t) size > elf->maximum_size) -+ && unlikely (ftruncate (elf->fildes, size) != 0) - && unlikely (posix_fallocate (elf->fildes, 0, size) != 0)) - { - __libelf_seterrno (ELF_E_WRITE_ERROR); -diff --git a/tests/ChangeLog b/tests/ChangeLog -index 19878ac..34f89cc 100644 ---- a/tests/ChangeLog -+++ b/tests/ChangeLog -@@ -1,3 +1,8 @@ -+2015-06-16 Mark Wielaard -+ -+ * run-strip-test.sh: Add strip-in-place (eu-strip without -o) test -+ for non-ET_REL files. -+ - 2015-05-30 Mark Wielaard - - * backtrace-subr.sh (check_native_core): Notice core file couldn't be -diff --git a/tests/run-strip-test.sh b/tests/run-strip-test.sh -index c558e90..2ebb5a9 100755 ---- a/tests/run-strip-test.sh -+++ b/tests/run-strip-test.sh -@@ -49,6 +49,19 @@ testrun ${abs_top_builddir}/src/unstrip -o testfile.unstrip testfile.temp testfi - testrun ${abs_top_builddir}/src/elfcmp --hash-inexact $original testfile.unstrip - } - -+# Now strip in-place and make sure it is smaller. -+# Skip ET_REL files, they might have unexpected symbol table entries. -+is_ET_REL=0 -+testrun ${abs_top_builddir}/src/readelf -h $original 2>&1 \ -+ | fgrep 'REL (Relocatable file)' && is_ET_REL=1 -+if test $is_ET_REL -eq 0; then -+ SIZE_original=$(stat -c%s $original) -+ testrun ${abs_top_builddir}/src/strip $original -+ SIZE_stripped=$(stat -c%s $original) -+ test $SIZE_stripped -lt $SIZE_original || -+ { echo "*** failure in-place strip file not smaller $original"; status=1; } -+fi -+ - tempfiles testfile.sections - testrun ${abs_top_builddir}/src/readelf -S testfile.temp > testfile.sections || status=$? - fgrep ' .debug_' testfile.sections && status=1 --- -1.8.3.1 - diff --git a/elfutils-portability-0.162.patch b/elfutils-portability-0.163.patch similarity index 89% rename from elfutils-portability-0.162.patch rename to elfutils-portability-0.163.patch index d81334c..f347ed1 100644 --- a/elfutils-portability-0.162.patch +++ b/elfutils-portability-0.163.patch @@ -1,3 +1,4 @@ +diffelfutils/backends/ChangeLog git-portable/backends/ChangeLog --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog @@ -498,6 +498,10 @@ @@ -33,6 +34,7 @@ * ppc_reloc.def: Update bits per Alan Modra . * ppc64_reloc.def: Likewise. +diffelfutils/backends/Makefile.am git-portable/backends/Makefile.am --- elfutils/backends/Makefile.am +++ elfutils/backends/Makefile.am @@ -119,7 +119,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a @@ -44,19 +46,20 @@ @$(textrel_check) libebl_i386.so: $(cpu_i386) +diffelfutils/backends/Makefile.in git-portable/backends/Makefile.in --- elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in -@@ -83,7 +83,8 @@ host_triplet = @host@ - DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ - $(noinst_HEADERS) ChangeLog +@@ -90,7 +90,8 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING subdir = backends ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -289,6 +290,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -300,6 +301,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -64,7 +67,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -320,6 +322,7 @@ SHELL = @SHELL@ +@@ -331,6 +333,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -72,7 +75,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -387,14 +390,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr +@@ -398,14 +401,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr # Warn about stack usage of more than 256K = 262144 bytes. @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 @@ -94,7 +97,7 @@ CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \ libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS)) textrel_msg = echo "WARNING: TEXTREL found in '$@'" -@@ -900,7 +903,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a +@@ -912,7 +915,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a $(LINK) -shared -o $(@:.map=.so) \ -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ -Wl,--version-script,$(@:.so=.map) \ @@ -103,9 +106,10 @@ @$(textrel_check) libebl_i386.so: $(cpu_i386) +diffelfutils/ChangeLog git-portable/ChangeLog --- elfutils/ChangeLog +++ elfutils/ChangeLog -@@ -253,6 +253,8 @@ +@@ -258,6 +258,8 @@ 2012-01-24 Mark Wielaard @@ -114,7 +118,7 @@ * COPYING: Fix address. Updated version from gnulib. 2012-01-23 Mark Wielaard -@@ -271,6 +273,9 @@ +@@ -276,6 +278,9 @@ 2011-10-08 Mike Frysinger @@ -124,7 +128,7 @@ * configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly. 2011-10-02 Ulrich Drepper -@@ -292,6 +297,10 @@ +@@ -297,6 +302,10 @@ * configure.ac (LOCALEDIR, DATADIRNAME): Removed. @@ -135,7 +139,7 @@ 2009-09-21 Ulrich Drepper * configure.ac: Update for more modern autoconf. -@@ -300,6 +309,10 @@ +@@ -305,6 +314,10 @@ * configure.ac (zip_LIBS): Check for liblzma too. @@ -146,7 +150,7 @@ 2009-04-19 Roland McGrath * configure.ac (eu_version): Round down here, not in version.h macros. -@@ -311,6 +324,8 @@ +@@ -316,6 +329,8 @@ 2009-01-23 Roland McGrath @@ -155,7 +159,7 @@ * configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3. * configure.ac (__thread check): Use AC_LINK_IFELSE, in case of -@@ -391,6 +406,10 @@ +@@ -396,6 +411,10 @@ * configure.ac: Add dummy automake conditional to get dependencies for non-generic linker right. See src/Makefile.am. @@ -166,7 +170,7 @@ 2005-11-18 Roland McGrath * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. -@@ -438,6 +457,17 @@ +@@ -443,6 +462,17 @@ * Makefile.am (all_SUBDIRS): Add libdwfl. * configure.ac: Write libdwfl/Makefile. @@ -184,9 +188,10 @@ 2005-05-19 Roland McGrath * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros. +diffelfutils/config/ChangeLog git-portable/config/ChangeLog --- elfutils/config/ChangeLog +++ elfutils/config/ChangeLog -@@ -106,6 +106,10 @@ +@@ -110,6 +110,10 @@ * known-dwarf.awk: Use gawk. @@ -197,6 +202,7 @@ 2010-07-02 Ulrich Drepper * elfutils.spec.in: Add more BuildRequires. +diffelfutils/config/eu.am git-portable/config/eu.am --- elfutils/config/eu.am +++ elfutils/config/eu.am @@ -1,6 +1,6 @@ @@ -237,9 +243,10 @@ COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) DEFS.os = -DPIC -DSHARED +diffelfutils/config/Makefile.in git-portable/config/Makefile.in --- elfutils/config/Makefile.in +++ elfutils/config/Makefile.in -@@ -150,6 +150,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -160,6 +160,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -247,7 +254,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -181,6 +182,7 @@ SHELL = @SHELL@ +@@ -191,6 +192,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -255,6 +262,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +diffelfutils/config.h.in git-portable/config.h.in --- elfutils/config.h.in +++ elfutils/config.h.in @@ -6,6 +6,12 @@ @@ -278,6 +286,7 @@ +#undef __thread + #include +diffelfutils/configure git-portable/configure --- elfutils/configure +++ elfutils/configure @@ -672,6 +672,8 @@ ZLIB_TRUE @@ -388,7 +397,7 @@ # ac_fn_c_try_run LINENO # ---------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -@@ -4824,6 +4897,18 @@ else +@@ -4825,6 +4898,18 @@ else fi @@ -407,7 +416,7 @@ # We use -std=gnu99 but have explicit checks for some language constructs # and GNU extensions since some compilers claim GNU99 support, but don't # really support all language extensions. In particular we need -@@ -4872,6 +4957,130 @@ if test "x$ac_cv_c99" != xyes; then : +@@ -4873,6 +4958,130 @@ if test "x$ac_cv_c99" != xyes; then : as_fn_error $? "gcc with GNU99 support required" "$LINENO" 5 fi @@ -538,7 +547,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5 $as_echo_n "checking for __thread support... " >&6; } if ${ac_cv_tls+:} false; then : -@@ -4909,7 +5118,13 @@ fi +@@ -4910,7 +5119,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5 $as_echo "$ac_cv_tls" >&6; } if test "x$ac_cv_tls" != xyes; then : @@ -553,7 +562,7 @@ fi # Check whether --enable-largefile was given. -@@ -5317,6 +5532,22 @@ else +@@ -5318,6 +5533,22 @@ else fi @@ -576,7 +585,7 @@ # Check whether --enable-tests-rpath was given. if test "${enable_tests_rpath+set}" = set; then : enableval=$enable_tests_rpath; tests_use_rpath=$enableval -@@ -6198,7 +6429,7 @@ case "$eu_version" in +@@ -6199,7 +6430,7 @@ case "$eu_version" in esac # Round up to the next release API (x.y) version. @@ -585,7 +594,7 @@ MODVERSION="Build for ${LIBEBL_SUBDIR} ${eu_version} ${ac_cv_build}" -@@ -7087,6 +7318,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes +@@ -7088,6 +7319,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes as_fn_error $? "conditional \"BUILD_STATIC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -596,6 +605,7 @@ if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then as_fn_error $? "conditional \"TESTS_RPATH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 +diffelfutils/configure.ac git-portable/configure.ac --- elfutils/configure.ac +++ elfutils/configure.ac @@ -73,6 +73,8 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -695,6 +705,7 @@ dnl Unique ID for this build. MODVERSION="Build for ${LIBEBL_SUBDIR} ${eu_version} ${ac_cv_build}" +diffelfutils/lib/ChangeLog git-portable/lib/ChangeLog --- elfutils/lib/ChangeLog +++ elfutils/lib/ChangeLog @@ -73,6 +73,9 @@ @@ -719,6 +730,7 @@ 2005-04-30 Ulrich Drepper * Makefile.am: Use -ffunction-sections for xmalloc.c. +diffelfutils/lib/eu-config.h git-portable/lib/eu-config.h --- elfutils/lib/eu-config.h +++ elfutils/lib/eu-config.h @@ -163,6 +163,17 @@ asm (".section predict_data, \"aw\"; .pr @@ -739,19 +751,20 @@ #ifdef SYMBOL_VERSIONING # define OLD_VERSION(name, version) \ +diffelfutils/lib/Makefile.in git-portable/lib/Makefile.in --- elfutils/lib/Makefile.in +++ elfutils/lib/Makefile.in -@@ -82,7 +82,8 @@ host_triplet = @host@ - DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ - $(noinst_HEADERS) ChangeLog +@@ -89,7 +89,8 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -201,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -212,6 +213,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -759,7 +772,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -232,6 +234,7 @@ SHELL = @SHELL@ +@@ -243,6 +245,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -767,7 +780,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -298,13 +301,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr +@@ -309,13 +312,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr # Warn about stack usage of more than 256K = 262144 bytes. @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 @@ -786,6 +799,7 @@ CLEANFILES = *.gcno *.gcda textrel_msg = echo "WARNING: TEXTREL found in '$@'" @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) +diffelfutils/libasm/ChangeLog git-portable/libasm/ChangeLog --- elfutils/libasm/ChangeLog +++ elfutils/libasm/ChangeLog @@ -87,6 +87,11 @@ @@ -800,12 +814,13 @@ 2005-02-15 Ulrich Drepper * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. +diffelfutils/libasm/Makefile.in git-portable/libasm/Makefile.in --- elfutils/libasm/Makefile.in +++ elfutils/libasm/Makefile.in -@@ -83,9 +83,10 @@ host_triplet = @host@ - DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ - $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog +@@ -90,9 +90,10 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING @@ -815,7 +830,7 @@ subdir = libasm ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -252,6 +253,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -263,6 +264,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -823,7 +838,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -283,6 +285,7 @@ SHELL = @SHELL@ +@@ -294,6 +296,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -831,7 +846,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -350,14 +353,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr +@@ -361,14 +364,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr # Warn about stack usage of more than 256K = 262144 bytes. @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 @@ -853,7 +868,7 @@ CLEANFILES = *.gcno *.gcda $(am_libasm_pic_a_OBJECTS) \ libasm.so.$(VERSION) textrel_msg = echo "WARNING: TEXTREL found in '$@'" -@@ -384,7 +387,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort +@@ -395,7 +398,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort libasm_pic_a_SOURCES = am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) @@ -862,6 +877,7 @@ libasm_so_SOURCES = noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map +diffelfutils/libcpu/ChangeLog git-portable/libcpu/ChangeLog --- elfutils/libcpu/ChangeLog +++ elfutils/libcpu/ChangeLog @@ -51,6 +51,9 @@ @@ -886,6 +902,7 @@ 2005-02-15 Ulrich Drepper * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. +diffelfutils/libcpu/i386_disasm.c git-portable/libcpu/i386_disasm.c --- elfutils/libcpu/i386_disasm.c +++ elfutils/libcpu/i386_disasm.c @@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con @@ -896,19 +913,20 @@ } } else +diffelfutils/libcpu/Makefile.in git-portable/libcpu/Makefile.in --- elfutils/libcpu/Makefile.in +++ elfutils/libcpu/Makefile.in -@@ -84,7 +84,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am - $(srcdir)/Makefile.am i386_lex.c i386_parse.c \ - $(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \ - $(am__noinst_HEADERS_DIST) ChangeLog +@@ -90,7 +90,8 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING @MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT) subdir = libcpu ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -227,6 +228,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -238,6 +239,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -916,7 +934,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = lex.$( * libdw.h (dwarf_offdie): Fix documentation to mention .debug_info. -@@ -1248,6 +1252,10 @@ +@@ -1263,6 +1267,10 @@ * dwarf_hasattr_integrate.c: Integrate DW_AT_specification too. @@ -967,7 +986,7 @@ 2009-08-10 Roland McGrath * dwarf_getscopevar.c: Use dwarf_diename. -@@ -2016,6 +2024,11 @@ +@@ -2031,6 +2039,11 @@ 2005-05-31 Roland McGrath @@ -979,6 +998,7 @@ * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to formref offset. +diffelfutils/libdw/dwarf_begin_elf.c git-portable/libdw/dwarf_begin_elf.c --- elfutils/libdw/dwarf_begin_elf.c +++ elfutils/libdw/dwarf_begin_elf.c @@ -47,6 +47,14 @@ @@ -996,6 +1016,7 @@ # include # undef crc32 #endif +diffelfutils/libdw/libdw.h git-portable/libdw/libdw.h --- elfutils/libdw/libdw.h +++ elfutils/libdw/libdw.h @@ -1004,7 +1004,7 @@ extern Dwarf_OOM dwarf_new_oom_handler ( @@ -1007,12 +1028,13 @@ /* Return attribute code of given attribute. */ __libdw_extern_inline unsigned int dwarf_whatattr (Dwarf_Attribute *attr) +diffelfutils/libdw/Makefile.in git-portable/libdw/Makefile.in --- elfutils/libdw/Makefile.in +++ elfutils/libdw/Makefile.in -@@ -84,8 +84,9 @@ DIST_COMMON = $(top_srcdir)/config/eu.am - $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ - $(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \ - ChangeLog +@@ -90,8 +90,9 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING -@BUILD_STATIC_TRUE@am__append_2 = -fpic +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) @@ -1021,7 +1043,7 @@ noinst_PROGRAMS = $(am__EXEEXT_1) subdir = libdw ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -302,6 +303,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -312,6 +313,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1029,7 +1051,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -333,6 +335,7 @@ SHELL = @SHELL@ +@@ -343,6 +345,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -1037,7 +1059,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -399,13 +402,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr +@@ -409,13 +412,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr # Warn about stack usage of more than 256K = 262144 bytes. @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 @@ -1056,19 +1078,20 @@ CLEANFILES = *.gcno *.gcda textrel_msg = echo "WARNING: TEXTREL found in '$@'" @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) +diffelfutils/libdwelf/Makefile.in git-portable/libdwelf/Makefile.in --- elfutils/libdwelf/Makefile.in +++ elfutils/libdwelf/Makefile.in -@@ -82,7 +82,8 @@ host_triplet = @host@ - DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ - $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog +@@ -89,7 +89,8 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING subdir = libdwelf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -231,6 +232,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -242,6 +243,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1076,7 +1099,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -262,6 +264,7 @@ SHELL = @SHELL@ +@@ -273,6 +275,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -1084,7 +1107,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -329,14 +332,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr +@@ -340,14 +343,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr # Warn about stack usage of more than 256K = 262144 bytes. @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 @@ -1106,9 +1129,10 @@ CLEANFILES = *.gcno *.gcda $(am_libdwelf_pic_a_OBJECTS) textrel_msg = echo "WARNING: TEXTREL found in '$@'" @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) +diffelfutils/libdwfl/ChangeLog git-portable/libdwfl/ChangeLog --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -704,6 +704,21 @@ +@@ -713,6 +713,21 @@ (dwfl_module_addrsym) (i_to_symfile): New function. (dwfl_module_addrsym) (search_table): Use it. @@ -1130,7 +1154,7 @@ 2013-11-07 Jan Kratochvil Mark Wielaard -@@ -2469,6 +2484,11 @@ +@@ -2478,6 +2493,11 @@ 2005-07-21 Roland McGrath @@ -1142,6 +1166,7 @@ * Makefile.am (noinst_HEADERS): Add loc2c.c. * test2.c (main): Check sscanf result to quiet warning. +diffelfutils/libdwfl/linux-core-attach.c git-portable/libdwfl/linux-core-attach.c --- elfutils/libdwfl/linux-core-attach.c +++ elfutils/libdwfl/linux-core-attach.c @@ -29,6 +29,35 @@ @@ -1180,6 +1205,7 @@ #include "../libdw/memory-access.h" +diffelfutils/libdwfl/linux-pid-attach.c git-portable/libdwfl/linux-pid-attach.c --- elfutils/libdwfl/linux-pid-attach.c +++ elfutils/libdwfl/linux-pid-attach.c @@ -255,6 +255,11 @@ void @@ -1210,12 +1236,13 @@ } static void +diffelfutils/libdwfl/Makefile.in git-portable/libdwfl/Makefile.in --- elfutils/libdwfl/Makefile.in +++ elfutils/libdwfl/Makefile.in -@@ -82,10 +82,11 @@ host_triplet = @host@ - DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ - $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog +@@ -89,10 +89,11 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING -@ZLIB_TRUE@am__append_2 = gzip.c -@BZLIB_TRUE@am__append_3 = bzip2.c @@ -1228,7 +1255,7 @@ subdir = libdwfl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -290,6 +291,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -301,6 +302,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1236,7 +1263,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -321,6 +323,7 @@ SHELL = @SHELL@ +@@ -332,6 +334,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -1244,7 +1271,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -388,14 +391,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr +@@ -399,14 +402,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr # Warn about stack usage of more than 256K = 262144 bytes. @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 @@ -1266,7 +1293,7 @@ CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS) textrel_msg = echo "WARNING: TEXTREL found in '$@'" @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) -@@ -424,8 +427,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en +@@ -435,8 +438,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en dwfl_module_register_names.c dwfl_segment_report_module.c \ link_map.c core-file.c open.c image-header.c dwfl_frame.c \ frame_unwind.c dwfl_frame_pc.c linux-pid-attach.c \ @@ -1277,9 +1304,10 @@ libdwfl = $(libdw) libdw = ../libdw/libdw.so libelf = ../libelf/libelf.so +diffelfutils/libebl/ChangeLog git-portable/libebl/ChangeLog --- elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog -@@ -780,6 +780,11 @@ +@@ -785,6 +785,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. @@ -1291,19 +1319,20 @@ 2005-05-21 Ulrich Drepper * libebl_x86_64.map: Add x86_64_core_note. +diffelfutils/libebl/Makefile.in git-portable/libebl/Makefile.in --- elfutils/libebl/Makefile.in +++ elfutils/libebl/Makefile.in -@@ -82,7 +82,8 @@ host_triplet = @host@ - DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ - $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog +@@ -89,7 +89,8 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING subdir = libebl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -253,6 +254,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -264,6 +265,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1311,7 +1340,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -284,6 +286,7 @@ SHELL = @SHELL@ +@@ -295,6 +297,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -1319,7 +1348,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -351,13 +354,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr +@@ -362,13 +365,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr # Warn about stack usage of more than 256K = 262144 bytes. @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 @@ -1338,9 +1367,10 @@ CLEANFILES = *.gcno *.gcda $(am_libebl_pic_a_OBJECTS) textrel_msg = echo "WARNING: TEXTREL found in '$@'" @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg) +diffelfutils/libelf/ChangeLog git-portable/libelf/ChangeLog --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -398,6 +398,11 @@ +@@ -412,6 +412,11 @@ * elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check. @@ -1352,7 +1382,7 @@ 2011-02-26 Mark Wielaard * elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini. -@@ -1075,6 +1080,11 @@ +@@ -1089,6 +1094,11 @@ * elf.h: Update from glibc. @@ -1364,6 +1394,7 @@ 2005-05-08 Roland McGrath * elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now. +diffelfutils/libelf/common.h git-portable/libelf/common.h --- elfutils/libelf/common.h +++ elfutils/libelf/common.h @@ -139,7 +139,7 @@ libelf_release_all (Elf *elf) @@ -1384,6 +1415,7 @@ : (sizeof (Var) == 4 \ ? bswap_32 (Var) \ : bswap_64 (Var)))) +diffelfutils/libelf/gnuhash_xlate.h git-portable/libelf/gnuhash_xlate.h --- elfutils/libelf/gnuhash_xlate.h +++ elfutils/libelf/gnuhash_xlate.h @@ -1,5 +1,5 @@ @@ -1404,12 +1436,13 @@ len -= 4; } } +diffelfutils/libelf/Makefile.in git-portable/libelf/Makefile.in --- elfutils/libelf/Makefile.in +++ elfutils/libelf/Makefile.in -@@ -84,10 +84,11 @@ DIST_COMMON = $(top_srcdir)/config/eu.am - $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ - $(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \ - ChangeLog +@@ -90,10 +90,11 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING -@BUILD_STATIC_TRUE@am__append_2 = -fpic +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) @@ -1421,7 +1454,7 @@ subdir = libelf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -295,6 +296,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -305,6 +306,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1429,7 +1462,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -326,6 +328,7 @@ SHELL = @SHELL@ +@@ -336,6 +338,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -1437,7 +1470,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -391,13 +394,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr +@@ -401,13 +404,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr # Warn about stack usage of more than 256K = 262144 bytes. @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 @@ -1456,7 +1489,7 @@ CLEANFILES = *.gcno *.gcda $(am_libelf_pic_a_OBJECTS) \ libelf.so.$(VERSION) textrel_msg = echo "WARNING: TEXTREL found in '$@'" -@@ -460,7 +464,7 @@ libelf_a_SOURCES = elf_version.c elf_has +@@ -470,7 +474,7 @@ libelf_a_SOURCES = elf_version.c elf_has libelf_pic_a_SOURCES = am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) @@ -1465,9 +1498,10 @@ libelf_so_SOURCES = noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \ version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h +diffelfutils/m4/Makefile.in git-portable/m4/Makefile.in --- elfutils/m4/Makefile.in +++ elfutils/m4/Makefile.in -@@ -148,6 +148,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -159,6 +159,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1475,7 +1509,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -179,6 +180,7 @@ SHELL = @SHELL@ +@@ -190,6 +191,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1483,9 +1517,10 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +diffelfutils/Makefile.in git-portable/Makefile.in --- elfutils/Makefile.in +++ elfutils/Makefile.in -@@ -266,6 +266,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -277,6 +277,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1493,7 +1528,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -297,6 +298,7 @@ SHELL = @SHELL@ +@@ -308,6 +309,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1501,6 +1536,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +diffelfutils/src/addr2line.c git-portable/src/addr2line.c --- elfutils/src/addr2line.c +++ elfutils/src/addr2line.c @@ -622,10 +622,10 @@ handle_address (const char *string, Dwfl @@ -1516,6 +1552,7 @@ { default: break; +diffelfutils/src/ar.c git-portable/src/ar.c --- elfutils/src/ar.c +++ elfutils/src/ar.c @@ -685,7 +685,14 @@ do_oper_extract (int oper, const char *a @@ -1533,9 +1570,10 @@ { error (0, errno, gettext ("cannot change modification time of %s"), +diffelfutils/src/ChangeLog git-portable/src/ChangeLog --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -1598,8 +1598,16 @@ +@@ -1626,8 +1626,16 @@ * readelf.c (attr_callback): Use print_block only when we don't use print_ops. @@ -1552,7 +1590,7 @@ * ar.c (do_oper_extract): Use pathconf instead of statfs. 2009-08-01 Ulrich Drepper -@@ -1763,6 +1771,8 @@ +@@ -1791,6 +1799,8 @@ * readelf.c (print_debug_frame_section): Use t instead of j formats for ptrdiff_t OFFSET. @@ -1561,7 +1599,7 @@ 2009-01-21 Ulrich Drepper * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section -@@ -1946,6 +1956,11 @@ +@@ -1974,6 +1984,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. @@ -1573,7 +1611,7 @@ 2008-02-29 Roland McGrath * readelf.c (print_attributes): Add a cast. -@@ -2197,6 +2212,8 @@ +@@ -2225,6 +2240,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -1582,7 +1620,7 @@ 2007-10-15 Roland McGrath * make-debug-archive.in: New file. -@@ -2636,6 +2653,10 @@ +@@ -2664,6 +2681,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . @@ -1593,7 +1631,7 @@ 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -2712,6 +2733,10 @@ +@@ -2740,6 +2761,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -1604,7 +1642,7 @@ 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -3060,6 +3085,11 @@ +@@ -3088,6 +3113,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -1616,9 +1654,10 @@ 2005-05-30 Roland McGrath * readelf.c (print_debug_line_section): Print section offset of each +diffelfutils/src/findtextrel.c git-portable/src/findtextrel.c --- elfutils/src/findtextrel.c +++ elfutils/src/findtextrel.c -@@ -502,7 +502,11 @@ ptrcompare (const void *p1, const void * +@@ -503,7 +503,11 @@ ptrcompare (const void *p1, const void * static void @@ -1631,6 +1670,7 @@ GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw, const char *fname, bool more_than_one, void **knownsrcs) { +diffelfutils/src/ld.h git-portable/src/ld.h --- elfutils/src/ld.h +++ elfutils/src/ld.h @@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void); @@ -1648,6 +1688,7 @@ +#endif /* Optimizing and not GCC 4.2. */ #endif /* ld.h */ +diffelfutils/src/Makefile.am git-portable/src/Makefile.am --- elfutils/src/Makefile.am +++ elfutils/src/Makefile.am @@ -90,6 +90,11 @@ endif @@ -1662,19 +1703,20 @@ # Bad, bad stack usage... readelf_no_Wstack_usage = yes nm_no_Wstack_usage = yes +diffelfutils/src/Makefile.in git-portable/src/Makefile.in --- elfutils/src/Makefile.in +++ elfutils/src/Makefile.in -@@ -85,7 +85,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am - $(srcdir)/Makefile.am ldlex.c ldscript.c \ - $(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \ - $(noinst_HEADERS) ChangeLog +@@ -91,7 +91,8 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \ strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \ findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \ -@@ -94,9 +95,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE +@@ -100,9 +101,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE @NATIVE_LD_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1) # We never build this library but we need to get the dependency files # of all the linker backends that might be used in a non-generic linker. @@ -1686,7 +1728,7 @@ @NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS = subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -164,7 +165,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$ +@@ -172,7 +173,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$ versionhash.$(OBJEXT) ld_OBJECTS = $(am_ld_OBJECTS) ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__DEPENDENCIES_1) \ @@ -1695,7 +1737,7 @@ ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \ $@ am_libld_elf_i386_so_OBJECTS = -@@ -350,6 +351,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -361,6 +362,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1703,7 +1745,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -381,6 +383,7 @@ SHELL = @SHELL@ +@@ -392,6 +394,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1711,7 +1753,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -449,14 +452,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr +@@ -460,14 +463,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr # Warn about stack usage of more than 256K = 262144 bytes. @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144 @@ -1733,7 +1775,7 @@ CLEANFILES = *.gcno *.gcda make-debug-archive none_ld.os \ $(ld_modules:.c=.os) *.gconv textrel_msg = echo "WARNING: TEXTREL found in '$@'" -@@ -469,8 +472,8 @@ AM_LFLAGS = -Pld -olex.yy.c +@@ -480,8 +483,8 @@ AM_LFLAGS = -Pld -olex.yy.c native_ld = @native_ld@ ld_dsos = libld_elf_i386_pic.a @NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \ @@ -1744,7 +1786,7 @@ @NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu) @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \ -@@ -498,6 +501,11 @@ libeu = ../lib/libeu.a +@@ -509,6 +512,11 @@ libeu = ../lib/libeu.a ldgeneric_no_Wunused = yes ldgeneric_no_Wstack_usage = yes @@ -1756,7 +1798,7 @@ # Bad, bad stack usage... readelf_no_Wstack_usage = yes nm_no_Wstack_usage = yes -@@ -517,7 +525,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf) +@@ -528,7 +536,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf) size_LDADD = $(libelf) $(libeu) $(argp_LDADD) strip_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl ld_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \ @@ -1765,9 +1807,10 @@ ld_LDFLAGS = -rdynamic elflint_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) +diffelfutils/src/readelf.c git-portable/src/readelf.c --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -4364,10 +4364,12 @@ listptr_base (struct listptr *p) +@@ -4366,10 +4366,12 @@ listptr_base (struct listptr *p) return base; } @@ -1782,7 +1825,7 @@ struct listptr *p1 = (void *) a; struct listptr *p2 = (void *) b; -@@ -4463,8 +4465,11 @@ static void +@@ -4465,8 +4467,11 @@ static void sort_listptr (struct listptr_table *table, const char *name) { if (table->n > 0) @@ -1796,7 +1839,7 @@ } static bool -@@ -9561,7 +9566,7 @@ dump_archive_index (Elf *elf, const char +@@ -9563,7 +9568,7 @@ dump_archive_index (Elf *elf, const char if (unlikely (elf_rand (elf, as_off) == 0) || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf)) == NULL)) @@ -1805,6 +1848,7 @@ while (1) #endif error (EXIT_FAILURE, 0, +diffelfutils/src/strings.c git-portable/src/strings.c --- elfutils/src/strings.c +++ elfutils/src/strings.c @@ -43,6 +43,10 @@ @@ -1844,6 +1888,7 @@ } if (unlikely (elfmap == MAP_FAILED)) +diffelfutils/src/strip.c git-portable/src/strip.c --- elfutils/src/strip.c +++ elfutils/src/strip.c @@ -2191,7 +2191,14 @@ while computing checksum for debug infor @@ -1876,6 +1921,7 @@ { error (0, errno, gettext ("\ cannot set access and modification date of '%s'"), fname); +diffelfutils/tests/backtrace.c git-portable/tests/backtrace.c --- elfutils/tests/backtrace.c +++ elfutils/tests/backtrace.c @@ -36,6 +36,7 @@ @@ -1886,9 +1932,10 @@ #include ELFUTILS_HEADER(dwfl) #ifndef __linux__ +diffelfutils/tests/ChangeLog git-portable/tests/ChangeLog --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -609,6 +609,13 @@ +@@ -614,6 +614,13 @@ 2013-12-02 Jan Kratochvil @@ -1902,7 +1949,7 @@ * Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child, backtrace-data and backtrace-dwarf. (BUILT_SOURCES, clean-local, backtrace-child-biarch): New. -@@ -1473,6 +1480,8 @@ +@@ -1478,6 +1485,8 @@ 2008-01-21 Roland McGrath @@ -1911,7 +1958,7 @@ * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. -@@ -2181,6 +2190,11 @@ +@@ -2186,6 +2195,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -1923,6 +1970,7 @@ 2005-05-24 Ulrich Drepper * get-files.c (main): Use correct format specifier. +diffelfutils/tests/line2addr.c git-portable/tests/line2addr.c --- elfutils/tests/line2addr.c +++ elfutils/tests/line2addr.c @@ -124,7 +124,7 @@ main (int argc, char *argv[]) @@ -1934,6 +1982,7 @@ { default: case 0: +diffelfutils/tests/Makefile.am git-portable/tests/Makefile.am --- elfutils/tests/Makefile.am +++ elfutils/tests/Makefile.am @@ -382,6 +382,7 @@ get_lines_LDADD = $(libdw) $(libelf) @@ -1944,12 +1993,13 @@ line2addr_LDADD = $(libdw) $(argp_LDADD) addrscopes_LDADD = $(libdw) $(argp_LDADD) funcscopes_LDADD = $(libdw) $(argp_LDADD) +diffelfutils/tests/Makefile.in git-portable/tests/Makefile.in --- elfutils/tests/Makefile.in +++ elfutils/tests/Makefile.in -@@ -80,14 +80,15 @@ host_triplet = @host@ - DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/test-driver ChangeLog +@@ -87,14 +87,15 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING -@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror) @@ -1966,7 +2016,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \ newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \ sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \ -@@ -116,7 +117,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy +@@ -123,7 +124,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy aggregate_size$(EXEEXT) vdsosyms$(EXEEXT) getsrc_die$(EXEEXT) \ strptr$(EXEEXT) newdata$(EXEEXT) elfstrtab$(EXEEXT) \ $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4) @@ -1975,7 +2025,7 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \ test-nlist$(EXEEXT) update1$(EXEEXT) update2$(EXEEXT) \ update3$(EXEEXT) update4$(EXEEXT) run-show-die-info.sh \ -@@ -166,14 +167,14 @@ TESTS = run-arextract.sh run-arsymtest.s +@@ -173,14 +174,14 @@ TESTS = run-arextract.sh run-arsymtest.s run-allfcts-multi.sh run-deleted.sh run-linkmap-cut.sh \ run-aggregate-size.sh vdsosyms$(EXEEXT) run-readelf-A.sh \ run-getsrc-die.sh run-strptr.sh newdata$(EXEEXT) \ @@ -1996,7 +2046,7 @@ subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \ -@@ -819,6 +820,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -830,6 +831,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -2004,7 +2054,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -850,6 +852,7 @@ SHELL = @SHELL@ +@@ -861,6 +863,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -2012,7 +2062,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -910,26 +913,26 @@ top_build_prefix = @top_build_prefix@ +@@ -921,26 +924,26 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ @@ -2048,7 +2098,7 @@ @TESTS_RPATH_FALSE@tests_rpath = no @TESTS_RPATH_TRUE@tests_rpath = yes asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \ -@@ -1156,6 +1159,7 @@ get_lines_LDADD = $(libdw) $(libelf) +@@ -1167,6 +1170,7 @@ get_lines_LDADD = $(libdw) $(libelf) get_files_LDADD = $(libdw) $(libelf) get_aranges_LDADD = $(libdw) $(libelf) allfcts_LDADD = $(libdw) $(libelf) diff --git a/elfutils.spec b/elfutils.spec index 37b2823..06684a6 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,7 +1,7 @@ Name: elfutils Summary: A collection of utilities and DSOs to handle compiled objects -Version: 0.162 -%global baserelease 2 +Version: 0.163 +%global baserelease 1 URL: https://fedorahosted.org/elfutils/ %global source_url http://fedorahosted.org/releases/e/l/elfutils/%{version}/ License: GPLv3+ and (GPLv2+ or LGPLv3+) @@ -46,9 +46,6 @@ Source: %{?source_url}%{name}-%{version}.tar.bz2 Patch1: %{?source_url}elfutils-portability-%{version}.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1232206 -Patch2: elfutils-0.162-ftruncate-allocate.patch - %if !%{compat} Release: %{baserelease}%{?dist} %else @@ -208,8 +205,6 @@ sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c %endif %endif -%patch2 -p1 -b .ftruncate - find . -name \*.sh ! -perm -0100 -print | xargs chmod +x %build @@ -338,6 +333,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Fri Jun 19 2015 Mark Wielaard - 0.163-1 +- Update to 0.163 + - Drop elfutils-0.162-ftruncate-allocate.patch + * Tue Jun 16 2015 Mark Wielaard - 0.162-2 - Add elfutils-0.162-ftruncate-allocate.patch (#1232206) diff --git a/sources b/sources index 5837cff..5b9fbad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9334cbcc0df7669b7bf07cf7fc3ad52c elfutils-0.162.tar.bz2 +77ce87f259987d2e54e4d87b86cbee41 elfutils-0.163.tar.bz2