diff options
| author | Roland McGrath <roland@redhat.com> | 2010-02-24 03:06:47 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2010-02-24 03:06:47 +0000 |
| commit | 50cdcf8ad0c6e4402f319fbd9f391b3b0506be35 (patch) | |
| tree | 3a590c25ab7db9379558c6803ad85459ec3d3754 | |
| parent | b35baa53df420c2d0816c6a65ef71deec0760836 (diff) | |
| download | elfutils-0.145-1.tar.gz | |
0.145-10.145-1
- Update to 0.145
- Fix build with --disable-dependency-tracking. (#564646)
- Fix build with most recent glibc headers.
- libdw: Fix CFI decoding. (#563528)
- libdwfl: Fix address bias returned by CFI accessors. (#563528)
Fix core file module layout identification. (#559836)
- readelf: Fix CFI decoding.
63 files changed, 1749 insertions, 2104 deletions
diff --git a/.gear/rules b/.gear/rules index ccb23a5c..63cd5f7d 100644 --- a/.gear/rules +++ b/.gear/rules @@ -1,2 +1,2 @@ copy: *.patch -tar.bz2: elfutils name=elfutils-0.144 +tar.bz2: elfutils name=elfutils-0.145 diff --git a/elfutils-0.144-sloppy-include.patch b/elfutils-0.144-sloppy-include.patch deleted file mode 100644 index 361af835..00000000 --- a/elfutils-0.144-sloppy-include.patch +++ /dev/null @@ -1,114 +0,0 @@ -From b337b1fd5f3b3410fe522a690ccee70bce8519ee Mon Sep 17 00:00:00 2001 -From: Roland McGrath <roland@redhat.com> -Date: Fri, 15 Jan 2010 01:02:27 -0800 -Subject: [PATCH] Fix sloppy #include use, breaks with latest glibc. - ---- - src/ChangeLog | 8 ++++++++ - src/ar.c | 3 ++- - src/elflint.c | 1 + - src/readelf.c | 1 + - src/strip.c | 3 ++- - src/unstrip.c | 3 ++- - 6 files changed, 16 insertions(+), 3 deletions(-) - -diff --git a/src/ChangeLog b/src/ChangeLog -index c4b5b05..ee1b733 100644 ---- a/src/ChangeLog -+++ b/src/ChangeLog -@@ -1,3 +1,11 @@ -+2010-01-15 Roland McGrath <roland@redhat.com> -+ -+ * ar.c: Include <sys/stat.h>. -+ * elflint.c: Likewise. -+ * readelf.c: Likewise. -+ * strip.c: Likewise. -+ * unstrip.c: Likewise -+ - 2010-01-07 Roland McGrath <roland@redhat.com> - - * readelf.c (print_ehdr): Handle PN_XNUM. -diff --git a/src/ar.c b/src/ar.c -index 5d7a6e7..149d116 100644 ---- a/src/ar.c -+++ b/src/ar.c -@@ -1,5 +1,5 @@ - /* Create, modify, and extract from archives. -- Copyright (C) 2005, 2007, 2009 Red Hat, Inc. -+ Copyright (C) 2005-2010 Red Hat, Inc. - Written by Ulrich Drepper <drepper@redhat.com>, 2005. - - Red Hat elfutils is free software; you can redistribute it and/or modify -@@ -45,6 +45,7 @@ - #include <time.h> - #include <unistd.h> - #include <sys/mman.h> -+#include <sys/stat.h> - #include <sys/time.h> - - #include <system.h> -diff --git a/src/elflint.c b/src/elflint.c -index 63d8389..531122b 100644 ---- a/src/elflint.c -+++ b/src/elflint.c -@@ -42,6 +42,7 @@ - #include <stdlib.h> - #include <string.h> - #include <unistd.h> -+#include <sys/stat.h> - #include <sys/param.h> - - #include <elf-knowledge.h> -diff --git a/src/readelf.c b/src/readelf.c -index 4464866..6ba259c 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -49,6 +49,7 @@ - #include <time.h> - #include <unistd.h> - #include <sys/param.h> -+#include <sys/stat.h> - - #include <system.h> - #include "../libelf/libelfP.h" -diff --git a/src/strip.c b/src/strip.c -index 32cf0d7..7b2b889 100644 ---- a/src/strip.c -+++ b/src/strip.c -@@ -1,5 +1,5 @@ - /* Discard section not used at runtime from object files. -- Copyright (C) 2000-2008, 2009 Red Hat, Inc. -+ Copyright (C) 2000-2010 Red Hat, Inc. - This file is part of Red Hat elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -46,6 +46,7 @@ - #include <string.h> - #include <unistd.h> - #include <sys/param.h> -+#include <sys/stat.h> - #include <sys/time.h> - - #include <elf-knowledge.h> -diff --git a/src/unstrip.c b/src/unstrip.c -index 284607b..0984e6b 100644 ---- a/src/unstrip.c -+++ b/src/unstrip.c -@@ -1,5 +1,5 @@ - /* Combine stripped files with separate symbols and debug information. -- Copyright (C) 2007, 2009 Red Hat, Inc. -+ Copyright (C) 2007-2010 Red Hat, Inc. - This file is part of Red Hat elfutils. - Written by Roland McGrath <roland@redhat.com>, 2007. - -@@ -52,6 +52,7 @@ - #include <stdlib.h> - #include <string.h> - #include <unistd.h> -+#include <sys/stat.h> - - #include <gelf.h> - #include <libebl.h> --- -1.6.2.5 - diff --git a/elfutils-portability.patch b/elfutils-portability.patch index 8649d5e9..94874ed6 100644 --- a/elfutils-portability.patch +++ b/elfutils-portability.patch @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -78,6 +78,10 @@ +@@ -88,6 +88,10 @@ * ppc_attrs.c (ppc_check_object_attribute): Handle tag GNU_Power_ABI_Struct_Return. @@ -11,7 +11,7 @@ 2008-10-04 Ulrich Drepper <drepper@redhat.com> * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and -@@ -405,6 +409,11 @@ +@@ -415,6 +419,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -23,7 +23,7 @@ 2005-11-19 Roland McGrath <roland@redhat.com> * ppc64_reloc.def: REL30 -> ADDR30. -@@ -427,6 +436,9 @@ +@@ -437,6 +446,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -35,34 +35,18 @@ --- elfutils/backends/Makefile.am +++ elfutils/backends/Makefile.am -@@ -25,12 +25,14 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\" -+WEXTRA = @WEXTRA@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ -+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \ - -std=gnu99 - INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ -@@ -115,7 +117,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map - $(LINK) -shared -o $@ -Wl,--whole-archive,$<\ - $(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \ - -Wl,--version-script,$(word 2,$^) \ +@@ -103,7 +103,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) \ - -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap) + -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap) $(textrel_check) - # XXX Should not be needed... + libebl_i386.so: $(cpu_i386) --- elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in -@@ -163,6 +163,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -164,6 +164,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -70,7 +54,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -192,6 +193,7 @@ SHELL = @SHELL@ +@@ -193,6 +194,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -78,27 +62,24 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -250,9 +252,9 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ - @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ --@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99 -+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99 - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ --@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99 -+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 - INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ - -I$(top_srcdir)/lib -I.. -@@ -680,7 +682,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map - $(LINK) -shared -o $@ -Wl,--whole-archive,$<\ - $(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \ - -Wl,--version-script,$(word 2,$^) \ +@@ -255,7 +257,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw + 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) $($(*F)_CFLAGS) \ + $(am__append_1) + @MUDFLAP_FALSE@libmudflap = +@@ -693,7 +695,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) \ - -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap) + -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap) $(textrel_check) - # XXX Should not be needed... + libebl_i386.so: $(cpu_i386) --- elfutils/ChangeLog +++ elfutils/ChangeLog @@ -1,3 +1,7 @@ @@ -158,6 +139,24 @@ 2005-05-19 Roland McGrath <roland@redhat.com> * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros. +--- elfutils/config/eu.am ++++ elfutils/config/eu.am +@@ -25,11 +25,14 @@ + ## <http://www.openinventionnetwork.com>. + ## + ++WEXTRA = @WEXTRA@ ++LD_AS_NEEDED = @LD_AS_NEEDED@ ++ + DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H + INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. + 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) \ + $($(*F)_CFLAGS) + --- elfutils/config/Makefile.in +++ elfutils/config/Makefile.in @@ -76,6 +76,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -539,7 +538,7 @@ AC_OUTPUT --- elfutils/lib/ChangeLog +++ elfutils/lib/ChangeLog -@@ -4,6 +4,9 @@ +@@ -8,6 +8,9 @@ 2009-01-23 Roland McGrath <roland@redhat.com> @@ -549,7 +548,7 @@ * eu-config.h: Add multiple inclusion protection. 2009-01-17 Ulrich Drepper <drepper@redhat.com> -@@ -60,6 +63,11 @@ +@@ -64,6 +67,11 @@ * Makefile.am (libeu_a_SOURCES): Add it. * system.h: Declare crc32_file. @@ -581,26 +580,9 @@ #ifdef SHARED # define OLD_VERSION(name, version) \ ---- elfutils/lib/Makefile.am -+++ elfutils/lib/Makefile.am -@@ -25,12 +25,13 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS) -+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) $($(*F)_CFLAGS) - INCLUDES = -I$(srcdir)/../libelf -I.. - - noinst_LIBRARIES = libeu.a --- elfutils/lib/Makefile.in +++ elfutils/lib/Makefile.in -@@ -98,6 +98,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -99,6 +99,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -608,7 +590,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -127,6 +128,7 @@ SHELL = @SHELL@ +@@ -128,6 +129,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -616,21 +598,18 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -185,9 +187,9 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ - @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ --@MUDFLAP_FALSE@ -Wextra $($(*F)_CFLAGS) -+@MUDFLAP_FALSE@ $(WEXTRA) $($(*F)_CFLAGS) - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ --@MUDFLAP_TRUE@ -Wunused -Wextra $($(*F)_CFLAGS) -+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) $($(*F)_CFLAGS) - INCLUDES = -I$(srcdir)/../libelf -I.. - noinst_LIBRARIES = libeu.a - libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \ +@@ -189,7 +191,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libelf + 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) $($(*F)_CFLAGS) \ + $(am__append_1) -fpic + @MUDFLAP_FALSE@libmudflap = --- elfutils/libasm/ChangeLog +++ elfutils/libasm/ChangeLog -@@ -63,6 +63,11 @@ +@@ -67,6 +67,11 @@ * asm_error.c: Add new error ASM_E_IOERROR. * libasmP.h: Add ASM_E_IOERROR definition. @@ -642,26 +621,9 @@ 2005-02-15 Ulrich Drepper <drepper@redhat.com> * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. ---- elfutils/libasm/Makefile.am -+++ elfutils/libasm/Makefile.am -@@ -25,12 +25,13 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -+AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 - INCLUDES = -I. -I$(srcdir) -I.. \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ - -I$(top_srcdir)/lib --- elfutils/libasm/Makefile.in +++ elfutils/libasm/Makefile.in -@@ -145,6 +145,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -147,6 +147,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -669,7 +631,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -174,6 +175,7 @@ SHELL = @SHELL@ +@@ -176,6 +177,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -677,21 +639,18 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -232,9 +234,9 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ - @MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \ --@MUDFLAP_FALSE@ -Wextra -Wformat=2 -+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \ --@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 - INCLUDES = -I. -I$(srcdir) -I.. \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ - -I$(top_srcdir)/lib +@@ -238,7 +240,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(top_srcdir)/libdw + 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) $($(*F)_CFLAGS) \ + $(am__append_1) + @MUDFLAP_FALSE@libmudflap = --- elfutils/libcpu/ChangeLog +++ elfutils/libcpu/ChangeLog -@@ -5,6 +5,9 @@ +@@ -9,6 +9,9 @@ 2009-01-23 Roland McGrath <roland@redhat.com> @@ -701,7 +660,7 @@ * Makefile.am (i386_parse_CFLAGS): Use quotes around command substitution that can produce leading whitespace. -@@ -334,6 +337,11 @@ +@@ -338,6 +341,11 @@ * defs/i386.doc: New file. * defs/x86_64: New file. @@ -723,21 +682,9 @@ } } else ---- elfutils/libcpu/Makefile.am -+++ elfutils/libcpu/Makefile.am -@@ -30,7 +30,8 @@ AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fpic \ -+WEXTRA = @WEXTRA@ -+AM_CFLAGS += -Wall -Wshadow -Wunused $(WEXTRA) -std=gnu99 -fpic \ - -fdollars-in-identifiers \ - $($(*F)_CFLAGS) \ - $(if $($(*F)_no_Werror),,-Werror) --- elfutils/libcpu/Makefile.in +++ elfutils/libcpu/Makefile.in -@@ -114,6 +114,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -116,6 +116,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -745,7 +692,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = lex.$(<F:lex.l=) -@@ -143,6 +144,7 @@ SHELL = @SHELL@ +@@ -145,6 +146,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -753,25 +700,18 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -200,10 +202,11 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ --@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 \ --@MUDFLAP_FALSE@ -fpic -fdollars-in-identifiers $($(*F)_CFLAGS) \ --@MUDFLAP_FALSE@ $(if $($(*F)_no_Werror),,-Werror) --@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused -Wextra \ -+@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \ -+@MUDFLAP_FALSE@ -std=gnu99 -fpic -fdollars-in-identifiers \ -+@MUDFLAP_FALSE@ $($(*F)_CFLAGS) $(if \ -+@MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) -+@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused $(WEXTRA) \ - @MUDFLAP_TRUE@ -std=gnu99 -fpic -fdollars-in-identifiers \ - @MUDFLAP_TRUE@ $($(*F)_CFLAGS) $(if \ - @MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) +@@ -207,7 +209,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libdw -I$(srcdir)/../libasm + 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) $($(*F)_CFLAGS) \ + $(am__append_1) -fpic -fdollars-in-identifiers + @MUDFLAP_FALSE@libmudflap = --- elfutils/libdw/ChangeLog +++ elfutils/libdw/ChangeLog -@@ -49,6 +49,10 @@ +@@ -57,6 +57,10 @@ * dwarf_hasattr_integrate.c: Integrate DW_AT_specification too. @@ -782,7 +722,7 @@ 2009-08-10 Roland McGrath <roland@redhat.com> * dwarf_getscopevar.c: Use dwarf_diename. -@@ -817,6 +821,11 @@ +@@ -825,6 +829,11 @@ 2005-05-31 Roland McGrath <roland@redhat.com> @@ -805,28 +745,9 @@ /* Return attribute code of given attribute. */ __libdw_extern_inline unsigned int dwarf_whatattr (Dwarf_Attribute *attr) ---- elfutils/libdw/Makefile.am -+++ elfutils/libdw/Makefile.am -@@ -25,6 +25,7 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else -@@ -33,7 +34,7 @@ endif - if BUILD_STATIC - AM_CFLAGS += -fpic - endif --AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 -+AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99 - INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib - VERSION = 1 - --- elfutils/libdw/Makefile.in +++ elfutils/libdw/Makefile.in -@@ -187,6 +187,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -188,6 +188,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -834,7 +755,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -216,6 +217,7 @@ SHELL = @SHELL@ +@@ -217,6 +218,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -842,22 +763,18 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -274,9 +276,10 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ - @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \ --@MUDFLAP_FALSE@ -Wunused -Wformat=2 -Wextra -std=gnu99 -+@MUDFLAP_FALSE@ -Wunused -Wformat=2 $(WEXTRA) -std=gnu99 - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Werror \ --@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 -+@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 $(WEXTRA) \ -+@MUDFLAP_TRUE@ -std=gnu99 - INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib - COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) +@@ -278,7 +280,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libelf + 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) $($(*F)_CFLAGS) \ + $(am__append_1) $(am__append_2) + @MUDFLAP_FALSE@libmudflap = --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -1165,6 +1165,11 @@ +@@ -1184,6 +1184,11 @@ 2005-07-21 Roland McGrath <roland@redhat.com> @@ -869,26 +786,9 @@ * Makefile.am (noinst_HEADERS): Add loc2c.c. * test2.c (main): Check sscanf result to quiet warning. ---- elfutils/libdwfl/Makefile.am -+++ elfutils/libdwfl/Makefile.am -@@ -27,12 +27,13 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 -+AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99 - INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib - VERSION = 1 --- elfutils/libdwfl/Makefile.in +++ elfutils/libdwfl/Makefile.in -@@ -179,6 +179,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -181,6 +181,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -896,7 +796,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -208,6 +209,7 @@ SHELL = @SHELL@ +@@ -210,6 +211,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -904,21 +804,18 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -266,9 +268,9 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ - @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \ --@MUDFLAP_FALSE@ -Wextra -std=gnu99 -+@MUDFLAP_FALSE@ $(WEXTRA) -std=gnu99 - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \ --@MUDFLAP_TRUE@ -Wformat=2 -Wextra -std=gnu99 -+@MUDFLAP_TRUE@ -Wformat=2 $(WEXTRA) -std=gnu99 - INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib - +@@ -272,7 +274,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libdw + 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) $($(*F)_CFLAGS) \ + $(am__append_1) + @MUDFLAP_FALSE@libmudflap = --- elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog -@@ -620,6 +620,11 @@ +@@ -624,6 +624,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. @@ -930,26 +827,9 @@ 2005-05-21 Ulrich Drepper <drepper@redhat.com> * libebl_x86_64.map: Add x86_64_core_note. ---- elfutils/libebl/Makefile.am -+++ elfutils/libebl/Makefile.am -@@ -25,12 +25,13 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\" -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ -+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \ - -std=gnu99 - - INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ --- elfutils/libebl/Makefile.in +++ elfutils/libebl/Makefile.in -@@ -141,6 +141,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -143,6 +143,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -957,7 +837,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -170,6 +171,7 @@ SHELL = @SHELL@ +@@ -172,6 +173,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -965,21 +845,18 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -228,9 +230,9 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ - @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ --@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99 -+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99 - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ --@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99 -+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 - INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ - -I$(top_srcdir)/lib -I.. -I$(srcdir)/../libasm - +@@ -234,7 +236,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libasm + 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) $($(*F)_CFLAGS) \ + $(am__append_1) -fpic + @MUDFLAP_FALSE@libmudflap = --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -614,6 +614,11 @@ +@@ -624,6 +624,11 @@ * elf.h: Update from glibc. @@ -1011,28 +888,9 @@ : (sizeof (Var) == 4 \ ? bswap_32 (Var) \ : bswap_64 (Var)))) ---- elfutils/libelf/Makefile.am -+++ elfutils/libelf/Makefile.am -@@ -25,6 +25,7 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else -@@ -33,7 +34,7 @@ endif - if BUILD_STATIC - AM_CFLAGS += -fpic - endif --AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ -+AM_CFLAGS += -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \ - $($(*F)_CFLAGS) - INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. - GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) --- elfutils/libelf/Makefile.in +++ elfutils/libelf/Makefile.in -@@ -188,6 +188,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -189,6 +189,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1040,7 +898,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -217,6 +218,7 @@ SHELL = @SHELL@ +@@ -218,6 +219,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -1048,19 +906,15 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -275,10 +277,10 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ - @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \ --@MUDFLAP_FALSE@ -Wunused -Wextra -Wformat=2 -std=gnu99 \ -+@MUDFLAP_FALSE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \ - @MUDFLAP_FALSE@ $($(*F)_CFLAGS) - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Wshadow \ --@MUDFLAP_TRUE@ -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ -+@MUDFLAP_TRUE@ -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \ - @MUDFLAP_TRUE@ $($(*F)_CFLAGS) - INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. - GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) +@@ -278,7 +280,7 @@ zip_LIBS = @zip_LIBS@ + INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. + 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) $($(*F)_CFLAGS) \ + $(am__append_1) $(am__append_2) + @MUDFLAP_FALSE@libmudflap = --- elfutils/m4/Makefile.in +++ elfutils/m4/Makefile.in @@ -75,6 +75,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -1114,7 +968,7 @@ /* It was symbol+offset. */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -59,8 +59,16 @@ +@@ -82,8 +82,16 @@ * readelf.c (attr_callback): Use print_block only when we don't use print_ops. @@ -1131,7 +985,7 @@ * ar.c (do_oper_extract): Use pathconf instead of statfs. 2009-08-01 Ulrich Drepper <drepper@redhat.com> -@@ -224,6 +232,8 @@ +@@ -247,6 +255,8 @@ * readelf.c (print_debug_frame_section): Use t instead of j formats for ptrdiff_t OFFSET. @@ -1140,7 +994,7 @@ 2009-01-21 Ulrich Drepper <drepper@redhat.com> * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section -@@ -407,6 +417,11 @@ +@@ -430,6 +440,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. @@ -1152,7 +1006,7 @@ 2008-02-29 Roland McGrath <roland@redhat.com> * readelf.c (print_attributes): Add a cast. -@@ -658,6 +673,8 @@ +@@ -681,6 +696,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -1161,7 +1015,7 @@ 2007-10-15 Roland McGrath <roland@redhat.com> * make-debug-archive.in: New file. -@@ -1097,6 +1114,10 @@ +@@ -1120,6 +1137,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger <Greek0@gmx.net>. @@ -1172,7 +1026,7 @@ 2006-08-08 Ulrich Drepper <drepper@redhat.com> * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -1173,6 +1194,10 @@ +@@ -1196,6 +1217,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -1183,7 +1037,7 @@ 2006-06-12 Ulrich Drepper <drepper@redhat.com> * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -1521,6 +1546,11 @@ +@@ -1544,6 +1569,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -1229,24 +1083,7 @@ #endif /* ld.h */ --- elfutils/src/Makefile.am +++ elfutils/src/Makefile.am -@@ -26,6 +26,7 @@ - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \ - -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else -@@ -33,7 +34,7 @@ AM_CFLAGS = - endif - AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \ - $(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) $(CFLAGS_$(*F)) - - INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ -@@ -112,6 +113,9 @@ addr2line_no_Wformat = yes +@@ -99,6 +99,9 @@ addr2line_no_Wformat = yes # XXX While the file is not finished, don't warn about this ldgeneric_no_Wunused = yes @@ -1258,7 +1095,7 @@ size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/Makefile.in +++ elfutils/src/Makefile.in -@@ -226,6 +226,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -228,6 +228,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1266,7 +1103,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -255,6 +256,7 @@ SHELL = @SHELL@ +@@ -257,6 +258,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1274,22 +1111,15 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -d -@@ -315,13 +317,13 @@ zip_LIBS = @zip_LIBS@ - @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \ - @MUDFLAP_FALSE@ $(native_ld_cflags) $(if \ - @MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \ --@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ -+@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ - @MUDFLAP_FALSE@ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ - @MUDFLAP_FALSE@ $(CFLAGS_$(*F)) - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \ - @MUDFLAP_TRUE@ $(native_ld_cflags) $(if \ - @MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) $(if \ --@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ -+@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ - @MUDFLAP_TRUE@ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ - @MUDFLAP_TRUE@ $(CFLAGS_$(*F)) - INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ +@@ -320,7 +322,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libasm + 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) $($(*F)_CFLAGS) \ + $(am__append_1) + @MUDFLAP_FALSE@libmudflap = @@ -367,6 +369,9 @@ strings_no_Wformat = yes addr2line_no_Wformat = yes # XXX While the file is not finished, don't warn about this @@ -1302,7 +1132,7 @@ size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -7661,7 +7661,7 @@ dump_archive_index (Elf *elf, const char +@@ -7644,7 +7644,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)) @@ -1352,7 +1182,7 @@ if (unlikely (elfmap == MAP_FAILED)) --- elfutils/src/strip.c +++ elfutils/src/strip.c -@@ -52,6 +52,12 @@ +@@ -53,6 +53,12 @@ #include <libebl.h> #include <system.h> @@ -1365,7 +1195,7 @@ /* Name and version of program. */ static void print_version (FILE *stream, struct argp_state *state); -@@ -300,8 +306,18 @@ process_file (const char *fname) +@@ -301,8 +307,18 @@ process_file (const char *fname) /* If we have to preserve the timestamp, we need it in the format utimes() understands. */ @@ -1384,7 +1214,7 @@ } /* Open the file. */ -@@ -1746,7 +1762,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1747,7 +1763,7 @@ handle_elf (int fd, Elf *elf, const char /* If requested, preserve the timestamp. */ if (tvp != NULL) { @@ -1393,7 +1223,7 @@ { error (0, errno, gettext ("\ cannot set access and modification date of '%s'"), -@@ -1803,7 +1819,7 @@ handle_ar (int fd, Elf *elf, const char +@@ -1804,7 +1820,7 @@ handle_ar (int fd, Elf *elf, const char if (tvp != NULL) { @@ -1404,7 +1234,7 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -124,6 +124,8 @@ +@@ -130,6 +130,8 @@ 2008-01-21 Roland McGrath <roland@redhat.com> @@ -1413,7 +1243,7 @@ * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. -@@ -832,6 +834,11 @@ +@@ -838,6 +840,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -1436,27 +1266,9 @@ { default: case 0: ---- elfutils/tests/Makefile.am -+++ elfutils/tests/Makefile.am -@@ -25,12 +25,13 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE -+WEXTRA = @WEXTRA@ - if MUDFLAP --AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ -+AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\ - $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - BUILD_RPATH = \$$ORIGIN/../backends - else --AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ -+AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \ - $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf - endif --- elfutils/tests/Makefile.in +++ elfutils/tests/Makefile.in -@@ -359,6 +359,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -367,6 +367,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1464,7 +1276,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -388,6 +389,7 @@ SHELL = @SHELL@ +@@ -396,6 +397,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1472,16 +1284,12 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -445,10 +447,10 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zip_LIBS = @zip_LIBS@ --@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ -+@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \ - @MUDFLAP_FALSE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - --@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ -+@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\ - @MUDFLAP_TRUE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - - @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends +@@ -456,7 +458,7 @@ zip_LIBS = @zip_LIBS@ + INCLUDES = -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_Wunused),,-Wunused $(WEXTRA)) $(if \ + $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ + $(am__append_1) + @MUDFLAP_FALSE@libmudflap = diff --git a/elfutils-robustify.patch b/elfutils-robustify.patch index 10741aaa..8e6f5455 100644 --- a/elfutils-robustify.patch +++ b/elfutils-robustify.patch @@ -1,6 +1,6 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -606,6 +606,49 @@ +@@ -616,6 +616,49 @@ If section content hasn't been read yet, do it before looking for the block size. If no section data present, infer size of section header. @@ -220,7 +220,7 @@ for (size_t cnt = 0; cnt < scncnt; ++cnt) { -@@ -409,13 +440,28 @@ file_read_elf (int fildes, void *map_add +@@ -412,13 +443,28 @@ file_read_elf (int fildes, void *map_add { /* We can use the mmapped memory. */ elf->state.elf64.ehdr = ehdr; @@ -905,7 +905,7 @@ #endif /* libelfP.h */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -1509,6 +1509,16 @@ +@@ -1532,6 +1532,16 @@ object symbols or symbols with unknown type. (check_rel): Likewise. @@ -922,7 +922,7 @@ 2005-06-08 Roland McGrath <roland@redhat.com> * readelf.c (print_ops): Add consts. -@@ -1554,6 +1564,19 @@ +@@ -1577,6 +1587,19 @@ * readelf.c (dwarf_tag_string): Add new tags. @@ -944,7 +944,7 @@ * strip.c (handle_elf): Don't translate hash and versym data formats, --- elfutils/src/elflint.c +++ elfutils/src/elflint.c -@@ -130,6 +130,10 @@ static uint32_t shstrndx; +@@ -131,6 +131,10 @@ static uint32_t shstrndx; /* Array to count references in section groups. */ static int *scnref; @@ -955,7 +955,7 @@ int main (int argc, char *argv[]) -@@ -318,10 +322,19 @@ section_name (Ebl *ebl, int idx) +@@ -319,10 +323,19 @@ section_name (Ebl *ebl, int idx) { GElf_Shdr shdr_mem; GElf_Shdr *shdr; @@ -976,7 +976,7 @@ } -@@ -343,11 +356,6 @@ static const int valid_e_machine[] = +@@ -344,11 +357,6 @@ static const int valid_e_machine[] = (sizeof (valid_e_machine) / sizeof (valid_e_machine[0])) @@ -988,7 +988,7 @@ static void check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size) { -@@ -631,7 +639,8 @@ section [%2d] '%s': symbol table cannot +@@ -632,7 +640,8 @@ section [%2d] '%s': symbol table cannot } } @@ -998,7 +998,7 @@ ERROR (gettext ("\ section [%2u] '%s': entry size is does not match ElfXX_Sym\n"), idx, section_name (ebl, idx)); -@@ -669,7 +678,7 @@ section [%2d] '%s': XINDEX for zeroth en +@@ -670,7 +679,7 @@ section [%2d] '%s': XINDEX for zeroth en xndxscnidx, section_name (ebl, xndxscnidx)); } @@ -1007,7 +1007,7 @@ { sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx); if (sym == NULL) -@@ -689,7 +698,8 @@ section [%2d] '%s': symbol %zu: invalid +@@ -690,7 +699,8 @@ section [%2d] '%s': symbol %zu: invalid else { name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name); @@ -1017,7 +1017,7 @@ } if (sym->st_shndx == SHN_XINDEX) -@@ -1037,9 +1047,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e +@@ -1038,9 +1048,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e { GElf_Shdr rcshdr_mem; const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem); @@ -1031,7 +1031,7 @@ { /* Found the dynamic section. Look through it. */ Elf_Data *d = elf_getdata (scn, NULL); -@@ -1049,7 +1061,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e +@@ -1050,7 +1062,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e { GElf_Dyn dyn_mem; GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem); @@ -1042,7 +1042,7 @@ if (dyn->d_tag == DT_RELCOUNT) { -@@ -1063,7 +1077,9 @@ section [%2d] '%s': DT_RELCOUNT used for +@@ -1064,7 +1078,9 @@ section [%2d] '%s': DT_RELCOUNT used for /* Does the number specified number of relative relocations exceed the total number of relocations? */ @@ -1053,7 +1053,7 @@ ERROR (gettext ("\ section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"), idx, section_name (ebl, idx), -@@ -1223,7 +1239,8 @@ section [%2d] '%s': no relocations for m +@@ -1224,7 +1240,8 @@ section [%2d] '%s': no relocations for m } } @@ -1063,7 +1063,7 @@ ERROR (gettext (reltype == ELF_T_RELA ? "\ section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\ section [%2d] '%s': section entry size does not match ElfXX_Rel\n"), -@@ -1446,7 +1463,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G +@@ -1447,7 +1464,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G Elf_Data *symdata = elf_getdata (symscn, NULL); enum load_state state = state_undecided; @@ -1073,7 +1073,7 @@ { GElf_Rela rela_mem; GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem); -@@ -1496,7 +1514,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE +@@ -1497,7 +1515,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE Elf_Data *symdata = elf_getdata (symscn, NULL); enum load_state state = state_undecided; @@ -1083,7 +1083,7 @@ { GElf_Rel rel_mem; GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem); -@@ -1599,7 +1618,8 @@ section [%2d] '%s': referenced as string +@@ -1600,7 +1619,8 @@ section [%2d] '%s': referenced as string shdr->sh_link, section_name (ebl, shdr->sh_link), idx, section_name (ebl, idx)); @@ -1093,7 +1093,7 @@ ERROR (gettext ("\ section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"), idx, section_name (ebl, idx)); -@@ -1609,7 +1629,7 @@ section [%2d] '%s': section entry size d +@@ -1610,7 +1630,7 @@ section [%2d] '%s': section entry size d idx, section_name (ebl, idx)); bool non_null_warned = false; @@ -1102,7 +1102,7 @@ { GElf_Dyn dyn_mem; GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem); -@@ -1890,6 +1910,8 @@ section [%2d] '%s': entry size does not +@@ -1891,6 +1911,8 @@ section [%2d] '%s': entry size does not idx, section_name (ebl, idx)); if (symshdr != NULL @@ -1111,7 +1111,7 @@ && (shdr->sh_size / shdr->sh_entsize < symshdr->sh_size / symshdr->sh_entsize)) ERROR (gettext ("\ -@@ -1916,6 +1938,12 @@ section [%2d] '%s': extended section ind +@@ -1917,6 +1939,12 @@ section [%2d] '%s': extended section ind } Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL); @@ -1124,7 +1124,7 @@ if (*((Elf32_Word *) data->d_buf) != 0) ERROR (gettext ("symbol 0 should have zero extended section index\n")); -@@ -1958,7 +1986,7 @@ section [%2d] '%s': hash table section i +@@ -1959,7 +1987,7 @@ section [%2d] '%s': hash table section i size_t maxidx = nchain; @@ -1133,7 +1133,7 @@ { size_t symsize = symshdr->sh_size / symshdr->sh_entsize; -@@ -1969,18 +1997,28 @@ section [%2d] '%s': hash table section i +@@ -1970,18 +1998,28 @@ section [%2d] '%s': hash table section i maxidx = symsize; } @@ -1164,7 +1164,7 @@ } -@@ -2010,18 +2048,28 @@ section [%2d] '%s': hash table section i +@@ -2011,18 +2049,28 @@ section [%2d] '%s': hash table section i maxidx = symsize; } @@ -1196,7 +1196,7 @@ } -@@ -2046,7 +2094,7 @@ section [%2d] '%s': bitmask size not pow +@@ -2047,7 +2095,7 @@ section [%2d] '%s': bitmask size not pow if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)) { ERROR (gettext ("\ @@ -1205,7 +1205,7 @@ idx, section_name (ebl, idx), (long int) shdr->sh_size, (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))); return; -@@ -2718,8 +2766,9 @@ section [%2d] '%s' refers in sh_link to +@@ -2719,8 +2767,9 @@ section [%2d] '%s' refers in sh_link to /* The number of elements in the version symbol table must be the same as the number of symbols. */ @@ -1219,7 +1219,7 @@ idx, section_name (ebl, idx), --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -1169,6 +1169,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1170,6 +1170,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G Elf32_Word *grpref = (Elf32_Word *) data->d_buf; GElf_Sym sym_mem; @@ -1228,7 +1228,7 @@ printf ((grpref[0] & GRP_COMDAT) ? ngettext ("\ \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n", -@@ -1181,8 +1183,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1182,8 +1184,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G data->d_size / sizeof (Elf32_Word) - 1), elf_ndxscn (scn), elf_strptr (ebl->elf, shstrndx, shdr->sh_name), @@ -1239,7 +1239,7 @@ ?: gettext ("<INVALID SYMBOL>"), data->d_size / sizeof (Elf32_Word) - 1); -@@ -1333,7 +1335,8 @@ static void +@@ -1334,7 +1336,8 @@ static void handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr) { int class = gelf_getclass (ebl->elf); @@ -1249,7 +1249,7 @@ Elf_Data *data; size_t cnt; size_t shstrndx; -@@ -1348,6 +1351,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1349,6 +1352,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1261,7 +1261,7 @@ printf (ngettext ("\ \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -1357,9 +1365,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1358,9 +1366,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (int) shdr->sh_link, @@ -1272,7 +1272,7 @@ fputs_unlocked (gettext (" Type Value\n"), stdout); for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -@@ -1942,6 +1948,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1943,6 +1949,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1286,7 +1286,7 @@ /* Now we can compute the number of entries in the section. */ unsigned int nsyms = data->d_size / (class == ELFCLASS32 ? sizeof (Elf32_Sym) -@@ -1952,15 +1965,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1953,15 +1966,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G nsyms), (unsigned int) elf_ndxscn (scn), elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms); @@ -1303,7 +1303,7 @@ fputs_unlocked (class == ELFCLASS32 ? gettext ("\ -@@ -2196,7 +2206,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2197,7 +2207,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1318,7 +1318,7 @@ printf (ngettext ("\ \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2207,9 +2223,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2208,9 +2224,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1329,7 +1329,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2262,8 +2276,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2263,8 +2277,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1345,7 +1345,7 @@ printf (ngettext ("\ \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2275,9 +2295,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2276,9 +2296,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1356,7 +1356,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2539,8 +2557,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2540,8 +2558,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G filename = NULL; } @@ -1372,7 +1372,7 @@ printf (ngettext ("\ \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'", "\ -@@ -2552,9 +2576,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2553,9 +2577,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1383,7 +1383,7 @@ /* Now we can finally look at the actual contents of this section. */ for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -@@ -2606,7 +2628,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2607,7 +2629,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt) ++counts[lengths[cnt]]; @@ -1402,7 +1402,7 @@ printf (ngettext ("\ \nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2619,9 +2651,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2620,9 +2652,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1413,7 +1413,7 @@ if (extrastr != NULL) fputs (extrastr, stdout); -@@ -4262,6 +4292,16 @@ print_debug_aranges_section (Dwfl_Module +@@ -4263,6 +4293,16 @@ print_debug_aranges_section (Dwfl_Module return; } @@ -1432,7 +1432,7 @@ "\ --- elfutils/src/strip.c +++ elfutils/src/strip.c -@@ -544,6 +544,11 @@ handle_elf (int fd, Elf *elf, const char +@@ -545,6 +545,11 @@ handle_elf (int fd, Elf *elf, const char goto fail_close; } @@ -1444,7 +1444,7 @@ /* Storage for section information. We leave room for two more entries since we unconditionally create a section header string table. Maybe some weird tool created an ELF file without one. -@@ -565,7 +570,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -566,7 +571,7 @@ handle_elf (int fd, Elf *elf, const char { /* This should always be true (i.e., there should not be any holes in the numbering). */ @@ -1453,7 +1453,7 @@ shdr_info[cnt].scn = scn; -@@ -578,6 +583,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -579,6 +584,7 @@ handle_elf (int fd, Elf *elf, const char shdr_info[cnt].shdr.sh_name); if (shdr_info[cnt].name == NULL) { @@ -1461,7 +1461,7 @@ error (0, 0, gettext ("illformed file '%s'"), fname); goto fail_close; } -@@ -587,6 +593,8 @@ handle_elf (int fd, Elf *elf, const char +@@ -588,6 +594,8 @@ handle_elf (int fd, Elf *elf, const char /* Remember the shdr.sh_link value. */ shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link; @@ -1470,7 +1470,7 @@ /* Sections in files other than relocatable object files which are not loaded can be freely moved by us. In relocatable -@@ -599,7 +607,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -600,7 +608,7 @@ handle_elf (int fd, Elf *elf, const char appropriate reference. */ if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX)) { @@ -1479,7 +1479,7 @@ shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt; } else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP)) -@@ -616,7 +624,12 @@ handle_elf (int fd, Elf *elf, const char +@@ -617,7 +625,12 @@ handle_elf (int fd, Elf *elf, const char for (inner = 1; inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word); ++inner) @@ -1492,7 +1492,7 @@ if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0)) /* If the section group contains only one element and this -@@ -627,7 +640,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -628,7 +641,7 @@ handle_elf (int fd, Elf *elf, const char } else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym)) { @@ -1501,7 +1501,7 @@ shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt; } -@@ -635,7 +648,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -636,7 +649,7 @@ handle_elf (int fd, Elf *elf, const char discarded right away. */ if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0) { @@ -1510,7 +1510,7 @@ if (shdr_info[shdr_info[cnt].group_idx].idx == 0) { -@@ -710,11 +723,15 @@ handle_elf (int fd, Elf *elf, const char +@@ -711,11 +724,15 @@ handle_elf (int fd, Elf *elf, const char { /* If a relocation section is marked as being removed make sure the section it is relocating is removed, too. */ @@ -1528,7 +1528,7 @@ if (shdr_info[cnt].idx == 1) { -@@ -741,7 +758,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -742,7 +759,7 @@ handle_elf (int fd, Elf *elf, const char if (shdr_info[cnt].symtab_idx != 0 && shdr_info[shdr_info[cnt].symtab_idx].data == NULL) { @@ -1537,7 +1537,7 @@ shdr_info[shdr_info[cnt].symtab_idx].data = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, -@@ -781,6 +798,9 @@ handle_elf (int fd, Elf *elf, const char +@@ -782,6 +799,9 @@ handle_elf (int fd, Elf *elf, const char else if (scnidx == SHN_XINDEX) scnidx = xndx; @@ -1547,7 +1547,7 @@ if (shdr_info[scnidx].idx == 0) /* This symbol table has a real symbol in a discarded section. So preserve the -@@ -811,12 +831,16 @@ handle_elf (int fd, Elf *elf, const char +@@ -812,12 +832,16 @@ handle_elf (int fd, Elf *elf, const char } /* Handle references through sh_info. */ @@ -1566,7 +1566,7 @@ /* Mark the section as investigated. */ shdr_info[cnt].idx = 2; -@@ -955,7 +979,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -956,7 +980,7 @@ handle_elf (int fd, Elf *elf, const char error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"), elf_errmsg (-1)); @@ -1575,7 +1575,7 @@ /* Add this name to the section header string table. */ shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0); -@@ -992,7 +1016,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -993,7 +1017,7 @@ handle_elf (int fd, Elf *elf, const char error (EXIT_FAILURE, 0, gettext ("while create section header section: %s"), elf_errmsg (-1)); @@ -1584,7 +1584,7 @@ shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn); if (shdr_info[cnt].data == NULL) -@@ -1048,7 +1072,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1049,7 +1073,7 @@ handle_elf (int fd, Elf *elf, const char error (EXIT_FAILURE, 0, gettext ("while create section header section: %s"), elf_errmsg (-1)); @@ -1593,7 +1593,7 @@ /* Finalize the string table and fill in the correct indices in the section headers. */ -@@ -1138,20 +1162,20 @@ handle_elf (int fd, Elf *elf, const char +@@ -1139,20 +1163,20 @@ handle_elf (int fd, Elf *elf, const char shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, NULL); @@ -1617,7 +1617,7 @@ >= shdr_info[cnt].data->d_size / elsize); } -@@ -1206,7 +1230,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1207,7 +1231,7 @@ handle_elf (int fd, Elf *elf, const char sec = shdr_info[sym->st_shndx].idx; else { @@ -1626,7 +1626,7 @@ sec = shdr_info[xshndx].idx; } -@@ -1227,7 +1251,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1228,7 +1252,7 @@ handle_elf (int fd, Elf *elf, const char nxshndx = sec; } @@ -1635,7 +1635,7 @@ if ((inner != destidx || nshndx != sym->st_shndx || (shndxdata != NULL && nxshndx != xshndx)) -@@ -1251,7 +1275,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1252,7 +1276,7 @@ handle_elf (int fd, Elf *elf, const char || shdr_info[cnt].debug_data == NULL) /* This is a section symbol for a section which has been removed. */ @@ -1644,7 +1644,7 @@ } if (destidx != inner) -@@ -1438,11 +1462,11 @@ handle_elf (int fd, Elf *elf, const char +@@ -1439,11 +1463,11 @@ handle_elf (int fd, Elf *elf, const char { GElf_Sym sym_mem; GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem); @@ -1658,7 +1658,7 @@ size_t hidx = elf_hash (name) % nbucket; if (bucket[hidx] == 0) -@@ -1461,7 +1485,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1462,7 +1486,7 @@ handle_elf (int fd, Elf *elf, const char else { /* Alpha and S390 64-bit use 64-bit SHT_HASH entries. */ @@ -1667,7 +1667,7 @@ == sizeof (Elf64_Xword)); Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf; -@@ -1492,11 +1516,11 @@ handle_elf (int fd, Elf *elf, const char +@@ -1493,11 +1517,11 @@ handle_elf (int fd, Elf *elf, const char { GElf_Sym sym_mem; GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem); diff --git a/elfutils.spec b/elfutils.spec index b0b28a47..1379fb87 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,5 +1,5 @@ -%global eu_version 0.144 -%global eu_release 2 +%global eu_version 0.145 +%global eu_release 1 %if %{?_with_compat:1}%{!?_with_compat:0} %global compat 1 @@ -38,8 +38,6 @@ Patch2: elfutils-portability.patch Requires: elfutils-libelf-%{_arch} = %{version}-%{release} Requires: elfutils-libs-%{_arch} = %{version}-%{release} -Patch10: elfutils-0.144-sloppy-include.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison >= 1.875 BuildRequires: flex >= 2.5.4a @@ -183,8 +181,6 @@ sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c %endif %endif -%patch10 -p1 -b .sloppy-includes - find . -name \*.sh ! -perm -0100 -print | xargs chmod +x %build @@ -295,6 +291,15 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Tue Feb 23 2010 Roland McGrath <roland@redhat.com> - 0.145-1 +- Update to 0.145 + - Fix build with --disable-dependency-tracking. (#564646) + - Fix build with most recent glibc headers. + - libdw: Fix CFI decoding. (#563528) + - libdwfl: Fix address bias returned by CFI accessors. (#563528) + Fix core file module layout identification. (#559836) + - readelf: Fix CFI decoding. + * Fri Jan 15 2010 Roland McGrath <roland@redhat.com> - 0.144-2 - Fix sloppy #include's breaking build with F-13 glibc. diff --git a/elfutils/INSTALL b/elfutils/INSTALL index 2550dab7..d3c5b40a 100644 --- a/elfutils/INSTALL +++ b/elfutils/INSTALL @@ -2,15 +2,15 @@ Installation Instructions ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +2006, 2007 Free Software Foundation, Inc. - This file is free documentation; the Free Software Foundation gives +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should +Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. @@ -73,9 +73,9 @@ The simplest way to compile this package is: Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -88,7 +88,7 @@ is an example: Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run @@ -100,24 +100,10 @@ architecture at a time in the source code directory. After you have installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - Installation Names ================== - By default, `make install' installs the package's commands under +By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -140,7 +126,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -152,46 +138,14 @@ find the X include and library files automatically, but if it doesn't, you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -199,8 +153,7 @@ type, such as `sun4', or a canonical name which has the form: where SYSTEM can have one of these forms: - OS - KERNEL-OS + OS KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -218,9 +171,9 @@ eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -229,7 +182,7 @@ A warning: not all `configure' scripts look for a site script. Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -248,19 +201,11 @@ an Autoconf bug. Until the bug is fixed you can use this workaround: `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. + Print a summary of the options to `configure', and exit. `--version' `-V' @@ -287,16 +232,6 @@ operates. Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. diff --git a/elfutils/NEWS b/elfutils/NEWS index 4a8163f2..77ea4cb3 100644 --- a/elfutils/NEWS +++ b/elfutils/NEWS @@ -1,3 +1,18 @@ +Version 0.145: + +Fix build with --disable-dependency-tracking. + +Fix build with most recent glibc headers. + +libelf: More robust to bogus section headers. + +libdw: Fix CFI decoding. + +libdwfl: Fix address bias returned by CFI accessors. + Fix core file module layout identification. + +readelf: Fix CFI decoding. + Version 0.144: libelf: New function elf_getphdrnum. diff --git a/elfutils/backends/ChangeLog b/elfutils/backends/ChangeLog index b52d75dd..4ec13fd8 100644 --- a/elfutils/backends/ChangeLog +++ b/elfutils/backends/ChangeLog @@ -1,3 +1,13 @@ +2010-02-18 Roland McGrath <roland@redhat.com> + + * Makefile.am (libebl_%.so): Use multi-target pattern rule instead of + intermediate dependency file for libebl_%.map, working around apparent + make -j timing-sensitive bugs. + +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + 2010-01-05 Roland McGrath <roland@redhat.com> * arm_retval.c (arm_return_value_location): Use dwarf_aggregate_size. diff --git a/elfutils/backends/Makefile.am b/elfutils/backends/Makefile.am index 2aed6216..a18454d6 100644 --- a/elfutils/backends/Makefile.am +++ b/elfutils/backends/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 2000-2009 Red Hat, Inc. +## Copyright (C) 2000-2010 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -24,17 +24,9 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\" -if MUDFLAP -AM_CFLAGS = -fmudflap -else -AM_CFLAGS = -endif -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ - -std=gnu99 -INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ - -I$(top_srcdir)/lib -I.. +include $(top_srcdir)/config/eu.am +INCLUDES += -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ + -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 @@ -49,17 +41,11 @@ noinst_DATA = $(libebl_pic:_pic.a=.so) if MUDFLAP libelf = ../libelf/libelf.a libdw = ../libdw/libdw.a -libmudflap = -lmudflap else libelf = ../libelf/libelf.so libdw = ../libdw/libdw.so -libmudflap = endif - -textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi - - i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c i386_cfi.c \ i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c cpu_i386 = ../libcpu/libcpu_i386.a @@ -110,28 +96,19 @@ libebl_s390_pic_a_SOURCES = $(s390_SRCS) am_libebl_s390_pic_a_OBJECTS = $(s390_SRCS:.c=.os) -libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw) \ - $(cpu_$(@:libebl_%.so=%) - $(LINK) -shared -o $@ -Wl,--whole-archive,$<\ - $(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \ - -Wl,--version-script,$(word 2,$^) \ +libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) + @rm -f $(@:.so=.map) + echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' \ + > $(@:.so=.map) + $(LINK) -shared -o $(@:.map=.so) \ + -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ + -Wl,--version-script,$(@:.so=.map) \ -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap) $(textrel_check) -# XXX Should not be needed... libebl_i386.so: $(cpu_i386) libebl_x86_64.so: $(cpu_x86_64) -libebl_%.map: Makefile - echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' > $@ - -%.os: %.c - if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ - -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi - install: install-am install-ebl-modules install-ebl-modules: $(mkinstalldirs) $(DESTDIR)$(libdir)/$(LIBEBL_SUBDIR) @@ -150,6 +127,6 @@ uninstall: uninstall-am noinst_HEADERS = libebl_CPU.h common-reloc.c linux-core-note.c x86_corenote.c EXTRA_DIST = $(foreach m,$(modules),$($(m)_SRCS)) $(modules:=_reloc.def) -CLEANFILES = *.gcno *.gcda \ - $(foreach m,$(modules),\ - libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS)) +CLEANFILES += $(foreach m,$(modules),\ + libebl_$(m).map libebl_$(m).so \ + $(am_libebl_$(m)_pic_a_OBJECTS)) diff --git a/elfutils/backends/Makefile.in b/elfutils/backends/Makefile.in index d0af9f05..db09caff 100644 --- a/elfutils/backends/Makefile.in +++ b/elfutils/backends/Makefile.in @@ -36,9 +36,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = backends DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ChangeLog + $(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog +@MUDFLAP_TRUE@am__append_1 = -fmudflap +subdir = backends ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/zip.m4 \ @@ -149,7 +150,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEBUGPRED = @DEBUGPRED@ -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\" +DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -249,14 +250,22 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ -@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99 -@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ -@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99 -INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ - -I$(top_srcdir)/lib -I.. +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ + -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ + -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw +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) +@MUDFLAP_FALSE@libmudflap = +@MUDFLAP_TRUE@libmudflap = -lmudflap +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) +CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \ + libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS)) +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ @@ -269,9 +278,6 @@ noinst_DATA = $(libebl_pic:_pic.a=.so) @MUDFLAP_TRUE@libelf = ../libelf/libelf.a @MUDFLAP_FALSE@libdw = ../libdw/libdw.so @MUDFLAP_TRUE@libdw = ../libdw/libdw.a -@MUDFLAP_FALSE@libmudflap = -@MUDFLAP_TRUE@libmudflap = -lmudflap -textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c i386_cfi.c \ i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c @@ -320,15 +326,11 @@ libebl_s390_pic_a_SOURCES = $(s390_SRCS) am_libebl_s390_pic_a_OBJECTS = $(s390_SRCS:.c=.os) noinst_HEADERS = libebl_CPU.h common-reloc.c linux-core-note.c x86_corenote.c EXTRA_DIST = $(foreach m,$(modules),$($(m)_SRCS)) $(modules:=_reloc.def) -CLEANFILES = *.gcno *.gcda \ - $(foreach m,$(modules),\ - libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS)) - all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/eu.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -675,28 +677,28 @@ uninstall-am: uninstall-am -libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw) \ - $(cpu_$(@:libebl_%.so=%) - $(LINK) -shared -o $@ -Wl,--whole-archive,$<\ - $(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \ - -Wl,--version-script,$(word 2,$^) \ +%.os: %.c %.o +@AMDEP_TRUE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ +@AMDEP_TRUE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +@AMDEP_TRUE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*.Tpo"; \ +@AMDEP_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< + +libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) + @rm -f $(@:.so=.map) + echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' \ + > $(@:.so=.map) + $(LINK) -shared -o $(@:.map=.so) \ + -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ + -Wl,--version-script,$(@:.so=.map) \ -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap) $(textrel_check) -# XXX Should not be needed... libebl_i386.so: $(cpu_i386) libebl_x86_64.so: $(cpu_x86_64) -libebl_%.map: Makefile - echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' > $@ - -%.os: %.c - if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ - -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi - install: install-am install-ebl-modules install-ebl-modules: $(mkinstalldirs) $(DESTDIR)$(libdir)/$(LIBEBL_SUBDIR) diff --git a/elfutils/config/ChangeLog b/elfutils/config/ChangeLog index 798a2f93..1e61047e 100644 --- a/elfutils/config/ChangeLog +++ b/elfutils/config/ChangeLog @@ -1,3 +1,7 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * eu.am: New file. + 2009-04-19 Roland McGrath <roland@redhat.com> * version.h.in: Revert last change. diff --git a/elfutils/config/config.guess b/elfutils/config/config.guess index da833146..ca2a03ca 100755 --- a/elfutils/config/config.guess +++ b/elfutils/config/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-04-27' +timestamp='2008-01-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -324,9 +324,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -334,20 +331,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -812,7 +796,7 @@ EOF x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -951,9 +935,6 @@ EOF if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -1004,6 +985,9 @@ EOF a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -1118,11 +1102,8 @@ EOF pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1160,16 +1141,6 @@ EOF 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1245,9 +1216,6 @@ EOF BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1356,9 +1324,6 @@ EOF i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1519,9 +1484,9 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be diff --git a/elfutils/config/config.sub b/elfutils/config/config.sub index a39437d0..6759825a 100755 --- a/elfutils/config/config.sub +++ b/elfutils/config/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-04-17' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,7 +122,6 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -250,16 +249,13 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -272,7 +268,6 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -282,7 +277,7 @@ case $basic_machine in | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -291,7 +286,7 @@ case $basic_machine in | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) + | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -334,17 +329,14 @@ case $basic_machine in | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -366,20 +358,20 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-* | z80-*) + | z8k-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -447,10 +439,6 @@ case $basic_machine in basic_machine=m68k-apollo os=-bsd ;; - aros) - basic_machine=i386-pc - os=-aros - ;; aux) basic_machine=m68k-apple os=-aux @@ -471,10 +459,6 @@ case $basic_machine in basic_machine=c90-cray os=-unicos ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -542,10 +526,6 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1148,10 +1128,6 @@ case $basic_machine in basic_machine=z8k-unknown os=-sim ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1190,7 +1166,7 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1262,9 +1238,8 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1273,7 +1248,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1413,9 +1388,6 @@ case $os in -zvmoe) os=-zvmoe ;; - -dicos*) - os=-dicos - ;; -none) ;; *) diff --git a/elfutils/config/depcomp b/elfutils/config/depcomp index df8eea7e..e5f9736c 100755 --- a/elfutils/config/depcomp +++ b/elfutils/config/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2007-03-29.01 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software +# Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,9 @@ scriptversion=2009-04-28.21; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -85,15 +87,6 @@ if test "$depmode" = dashXmstdout; then depmode=dashmstdout fi -cygpath_u="cygpath -u -f -" -if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp -fi - case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -199,14 +192,14 @@ sgi) ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> "$depfile" - echo >> "$depfile" +' ' ' >> $depfile + echo >> $depfile # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + >> $depfile else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -335,12 +328,7 @@ hp2) if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -416,7 +404,7 @@ dashmstdout) # Remove the call to Libtool. if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do + while test $1 != '--mode=compile'; do shift done shift @@ -467,39 +455,32 @@ makedepend) "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do + while test $1 != '--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no eat=no - for arg - do + cleared=no + for arg in "$@"; do case $cleared in no) set ""; shift cleared=yes ;; esac - if test $eat = yes; then - eat=no - continue - fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. - -arch) - eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix=`echo "$object" | sed 's/^.*\././'` + obj_suffix="`echo $object | sed 's/^.*\././'`" touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -519,7 +500,7 @@ cpp) # Remove the call to Libtool. if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do + while test $1 != '--mode=compile'; do shift done shift @@ -557,27 +538,13 @@ cpp) msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. + # always write the preprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - IFS=" " for arg do case "$arg" in - -o) - shift - ;; - $object) - shift - ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -590,23 +557,16 @@ msvisualcpp) ;; esac done - "$@" -E 2>/dev/null | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; -msvcmsys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - none) exec "$@" ;; @@ -625,6 +585,5 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff --git a/elfutils/config/elfutils.spec.in b/elfutils/config/elfutils.spec.in index 4d9aab71..045542cb 100644 --- a/elfutils/config/elfutils.spec.in +++ b/elfutils/config/elfutils.spec.in @@ -183,6 +183,15 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Thu Jan 14 2010 <drepper@redhat.com> 0.144-1 +- libelf: New function elf_getphdrnum. Now support using more than + 65536 program headers in a file. +- libdw: New function dwarf_aggregate_size for computing (constant) + type sizes, including array_type cases with nontrivial + calculation. +- readelf: Don't give errors for missing info under -a. + Handle Linux "VMCOREINFO" notes under -n. + * Mon Sep 21 2009 <drepper@redhat.com> 0.143-1 - libdw: Various convenience functions for individual attributes now use dwarf_attr_integrate to look up indirect inherited diff --git a/elfutils/config/eu.am b/elfutils/config/eu.am new file mode 100644 index 00000000..7cbdd249 --- /dev/null +++ b/elfutils/config/eu.am @@ -0,0 +1,60 @@ +## Common automake fragments for elfutils subdirectory makefiles. +## +## Copyright (C) 2010 Red Hat, Inc. +## This file is part of Red Hat elfutils. +## +## Red Hat elfutils is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by the +## Free Software Foundation; version 2 of the License. +## +## Red Hat elfutils is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License along +## with Red Hat elfutils; if not, write to the Free Software Foundation, +## Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +## +## Red Hat elfutils is an included package of the Open Invention Network. +## An included package of the Open Invention Network is a package for which +## Open Invention Network licensees cross-license their patents. No patent +## license is granted, either expressly or impliedly, by designation as an +## included package. Should you wish to participate in the Open Invention +## Network licensing program, please visit www.openinventionnetwork.com +## <http://www.openinventionnetwork.com>. +## + +DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. +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) + +if MUDFLAP +AM_CFLAGS += -fmudflap +libmudflap = -lmudflap +else +libmudflap = +endif + +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) + +%.os: %.c %.o +if AMDEP + if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ + -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ + then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ + rm -f "$(DEPDIR)/$*.Tpo"; \ + else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ + fi +else + $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< +endif + +CLEANFILES = *.gcno *.gcda + +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi diff --git a/elfutils/config/install-sh b/elfutils/config/install-sh index 6781b987..a5897de6 100755 --- a/elfutils/config/install-sh +++ b/elfutils/config/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -515,6 +515,5 @@ done # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff --git a/elfutils/config/missing b/elfutils/config/missing index 28055d2a..1c8ff704 100755 --- a/elfutils/config/missing +++ b/elfutils/config/missing @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,9 @@ scriptversion=2009-04-28.21; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,9 +89,6 @@ Supported PROGRAM values: tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - Send bug reports to <bug-automake@gnu.org>." exit $? ;; @@ -107,22 +106,15 @@ Send bug reports to <bug-automake@gnu.org>." esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. +# the program). case $1 in - lex*|yacc*) + lex|yacc) # Not GNU programs, they don't have --version. ;; - tar*) + tar) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -146,7 +138,7 @@ esac # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $program in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -156,7 +148,7 @@ WARNING: \`$1' is $msg. You should only need it if touch aclocal.m4 ;; - autoconf*) + autoconf) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -165,7 +157,7 @@ WARNING: \`$1' is $msg. You should only need it if touch configure ;; - autoheader*) + autoheader) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -195,7 +187,7 @@ WARNING: \`$1' is $msg. You should only need it if while read f; do touch "$f"; done ;; - autom4te*) + autom4te) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -218,7 +210,7 @@ WARNING: \`$1' is needed, but is $msg. fi ;; - bison*|yacc*) + bison|yacc) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -248,7 +240,7 @@ WARNING: \`$1' $msg. You should only need it if fi ;; - lex*|flex*) + lex|flex) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -271,7 +263,7 @@ WARNING: \`$1' is $msg. You should only need it if fi ;; - help2man*) + help2man) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -285,11 +277,11 @@ WARNING: \`$1' is $msg. You should only need it if else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit $? + exit 1 fi ;; - makeinfo*) + makeinfo) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -318,7 +310,7 @@ WARNING: \`$1' is $msg. You should only need it if touch $file ;; - tar*) + tar) shift # We have already tried tar in the generic part. @@ -371,6 +363,5 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff --git a/elfutils/config/ylwrap b/elfutils/config/ylwrap index 84d56340..7278b6a3 100755 --- a/elfutils/config/ylwrap +++ b/elfutils/config/ylwrap @@ -1,10 +1,10 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2009-04-28.21; # UTC +scriptversion=2007-11-22.22 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, -# 2007, 2009 Free Software Foundation, Inc. +# 2007 Free Software Foundation, Inc. # # Written by Tom Tromey <tromey@cygnus.com>. # @@ -19,7 +19,9 @@ scriptversion=2009-04-28.21; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -217,6 +219,5 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff --git a/elfutils/configure b/elfutils/configure index 184ba827..24634411 100755 --- a/elfutils/configure +++ b/elfutils/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for Red Hat elfutils 0.144. +# Generated by GNU Autoconf 2.63 for Red Hat elfutils 0.145. # # Report bugs to <http://bugzilla.redhat.com/bugzilla/>. # @@ -9,7 +9,7 @@ # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. # -# Copyright (C) 1996-2009 Red Hat, Inc. +# Copyright (C) 1996-2010 Red Hat, Inc. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Red Hat elfutils' PACKAGE_TARNAME='elfutils' -PACKAGE_VERSION='0.144' -PACKAGE_STRING='Red Hat elfutils 0.144' +PACKAGE_VERSION='0.145' +PACKAGE_STRING='Red Hat elfutils 0.145' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/' ac_unique_file="libelf/libelf.h" @@ -1323,7 +1323,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Red Hat elfutils 0.144 to adapt to many kinds of systems. +\`configure' configures Red Hat elfutils 0.145 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Red Hat elfutils 0.144:";; + short | recursive ) echo "Configuration of Red Hat elfutils 0.145:";; esac cat <<\_ACEOF @@ -1505,7 +1505,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Red Hat elfutils configure 0.144 +Red Hat elfutils configure 0.145 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1513,7 +1513,7 @@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright (C) 1996-2009 Red Hat, Inc. +Copyright (C) 1996-2010 Red Hat, Inc. _ACEOF exit fi @@ -1521,7 +1521,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Red Hat elfutils $as_me 0.144, which was +It was created by Red Hat elfutils $as_me 0.145, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2376,7 +2376,7 @@ fi # Define the identity of the package. PACKAGE='elfutils' - VERSION='0.144' + VERSION='0.145' cat >>confdefs.h <<_ACEOF @@ -6036,7 +6036,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Red Hat elfutils $as_me 0.144, which was +This file was extended by Red Hat elfutils $as_me 0.145, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6099,7 +6099,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -Red Hat elfutils config.status 0.144 +Red Hat elfutils config.status 0.145 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/elfutils/configure.ac b/elfutils/configure.ac index e9fbfccf..d2af2377 100644 --- a/elfutils/configure.ac +++ b/elfutils/configure.ac @@ -16,12 +16,12 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software Foundation, dnl Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. dnl -AC_INIT([Red Hat elfutils],[0.144],[http://bugzilla.redhat.com/bugzilla/],[elfutils]) +AC_INIT([Red Hat elfutils],[0.145],[http://bugzilla.redhat.com/bugzilla/],[elfutils]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_FILES([config/Makefile]) -AC_COPYRIGHT([Copyright (C) 1996-2009 Red Hat, Inc.]) +AC_COPYRIGHT([Copyright (C) 1996-2010 Red Hat, Inc.]) AC_PREREQ(2.63) dnl Minimum Autoconf version required. dnl We use GNU make extensions; automake 1.10 defaults to -Wportability. diff --git a/elfutils/elfutils.spec b/elfutils/elfutils.spec index 44c7c3ed..3d810889 100644 --- a/elfutils/elfutils.spec +++ b/elfutils/elfutils.spec @@ -1,7 +1,7 @@ # -*- rpm-spec-*- Summary: A collection of utilities and DSOs to handle compiled objects Name: elfutils -Version: 0.144 +Version: 0.145 Release: 1 License: GPLv2 with exceptions Group: Development/Tools @@ -183,6 +183,15 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Thu Jan 14 2010 <drepper@redhat.com> 0.144-1 +- libelf: New function elf_getphdrnum. Now support using more than + 65536 program headers in a file. +- libdw: New function dwarf_aggregate_size for computing (constant) + type sizes, including array_type cases with nontrivial + calculation. +- readelf: Don't give errors for missing info under -a. + Handle Linux "VMCOREINFO" notes under -n. + * Mon Sep 21 2009 <drepper@redhat.com> 0.143-1 - libdw: Various convenience functions for individual attributes now use dwarf_attr_integrate to look up indirect inherited diff --git a/elfutils/lib/ChangeLog b/elfutils/lib/ChangeLog index 73f8e73a..089747aa 100644 --- a/elfutils/lib/ChangeLog +++ b/elfutils/lib/ChangeLog @@ -1,3 +1,7 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + 2009-08-09 Roland McGrath <roland@redhat.com> * eu-config.h (OLD_VERSION, NEW_VERSION, COMPAT_VERSION): New macros. diff --git a/elfutils/lib/Makefile.am b/elfutils/lib/Makefile.am index b95d3e3b..50d55c56 100644 --- a/elfutils/lib/Makefile.am +++ b/elfutils/lib/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 1996-2001, 2002, 2004, 2005, 2008 Red Hat, Inc. +## Copyright (C) 1996-2010 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -24,14 +24,9 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -if MUDFLAP -AM_CFLAGS = -fmudflap -else -AM_CFLAGS = -endif -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS) -INCLUDES = -I$(srcdir)/../libelf -I.. +include $(top_srcdir)/config/eu.am +AM_CFLAGS += -fpic +INCLUDES += -I$(srcdir)/../libelf noinst_LIBRARIES = libeu.a diff --git a/elfutils/lib/Makefile.in b/elfutils/lib/Makefile.in index 8f7c157d..d7ce287d 100644 --- a/elfutils/lib/Makefile.in +++ b/elfutils/lib/Makefile.in @@ -35,9 +35,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = lib DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ChangeLog + $(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog +@MUDFLAP_TRUE@am__append_1 = -fmudflap +subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/zip.m4 \ @@ -184,11 +185,20 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ -@MUDFLAP_FALSE@ -Wextra $($(*F)_CFLAGS) -@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ -@MUDFLAP_TRUE@ -Wunused -Wextra $($(*F)_CFLAGS) -INCLUDES = -I$(srcdir)/../libelf -I.. +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ + -I$(srcdir)/../libelf +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) -fpic +@MUDFLAP_FALSE@libmudflap = +@MUDFLAP_TRUE@libmudflap = -lmudflap +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) + +CLEANFILES = *.gcno *.gcda +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi noinst_LIBRARIES = libeu.a libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \ crc32.c crc32_file.c md5.c sha1.c @@ -202,7 +212,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/eu.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -371,6 +381,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -464,6 +475,15 @@ uninstall-am: uninstall-am +%.os: %.c %.o +@AMDEP_TRUE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ +@AMDEP_TRUE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +@AMDEP_TRUE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*.Tpo"; \ +@AMDEP_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/elfutils/libasm/ChangeLog b/elfutils/libasm/ChangeLog index d0d40396..ef31dbb2 100644 --- a/elfutils/libasm/ChangeLog +++ b/elfutils/libasm/ChangeLog @@ -1,3 +1,7 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + 2009-01-10 Ulrich Drepper <drepper@redhat.com> * Makefile.am: Use USE_LOCKS instead of USE_TLS. diff --git a/elfutils/libasm/Makefile.am b/elfutils/libasm/Makefile.am index 7d5e25d1..52de7a3b 100644 --- a/elfutils/libasm/Makefile.am +++ b/elfutils/libasm/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 2002, 2004, 2005, 2006, 2008, 2009 Red Hat, Inc. +## Copyright (C) 2002-2010 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -24,22 +24,12 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -if MUDFLAP -AM_CFLAGS = -fmudflap -else -AM_CFLAGS = -endif -AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -INCLUDES = -I. -I$(srcdir) -I.. \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ - -I$(top_srcdir)/lib +include $(top_srcdir)/config/eu.am +INCLUDES += -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw + GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) VERSION = 1 -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) - lib_LIBRARIES = libasm.a if !MUDFLAP noinst_LIBRARIES = libasm_pic.a @@ -79,15 +69,6 @@ libasm.so: libasm_pic.a libasm.map if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi ln -fs $@ $@.$(VERSION) - -%.os: %.c %.o - if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ - -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ - then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ - rm -f "$(DEPDIR)/$*.Tpo"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi - install: install-am libasm.so $(mkinstalldirs) $(DESTDIR)$(libdir) $(INSTALL_PROGRAM) libasm.so $(DESTDIR)$(libdir)/libasm-$(PACKAGE_VERSION).so @@ -104,4 +85,4 @@ endif noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map -CLEANFILES = $(am_libasm_pic_a_OBJECTS) *.gcno *.gcda libasm.so.$(VERSION) +CLEANFILES += $(am_libasm_pic_a_OBJECTS) libasm.so.$(VERSION) diff --git a/elfutils/libasm/Makefile.in b/elfutils/libasm/Makefile.in index b6a620b0..7808b9b9 100644 --- a/elfutils/libasm/Makefile.in +++ b/elfutils/libasm/Makefile.in @@ -36,12 +36,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/eu.am ChangeLog +@MUDFLAP_TRUE@am__append_1 = -fmudflap @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1) @MUDFLAP_TRUE@am_libasm_pic_a_OBJECTS = -@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_1 = -lpthread +@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_2 = -lpthread subdir = libasm -DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/zip.m4 \ @@ -231,18 +233,23 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \ -@MUDFLAP_FALSE@ -Wextra -Wformat=2 -@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \ -@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -INCLUDES = -I. -I$(srcdir) -I.. \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ - -I$(top_srcdir)/lib - +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ + -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \ + -I$(top_srcdir)/libdw +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) +@MUDFLAP_FALSE@libmudflap = +@MUDFLAP_TRUE@libmudflap = -lmudflap +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) + +CLEANFILES = *.gcno *.gcda $(am_libasm_pic_a_OBJECTS) \ + libasm.so.$(VERSION) +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) - lib_LIBRARIES = libasm.a @MUDFLAP_FALSE@noinst_LIBRARIES = libasm_pic.a pkginclude_HEADERS = libasm.h @@ -262,16 +269,15 @@ libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \ @MUDFLAP_FALSE@libasm_pic_a_SOURCES = @MUDFLAP_FALSE@am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) -@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_1) +@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_2) @MUDFLAP_FALSE@libasm_so_SOURCES = noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map -CLEANFILES = $(am_libasm_pic_a_OBJECTS) *.gcno *.gcda libasm.so.$(VERSION) all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/eu.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -625,6 +631,15 @@ uninstall-am: uninstall-libLIBRARIES uninstall-pkgincludeHEADERS tags uninstall uninstall-am uninstall-libLIBRARIES \ uninstall-pkgincludeHEADERS + +%.os: %.c %.o +@AMDEP_TRUE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ +@AMDEP_TRUE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +@AMDEP_TRUE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*.Tpo"; \ +@AMDEP_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< @MUDFLAP_FALSE@libasm.so: libasm_pic.a libasm.map @MUDFLAP_FALSE@ $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ @MUDFLAP_FALSE@ -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \ @@ -633,14 +648,6 @@ uninstall-am: uninstall-libLIBRARIES uninstall-pkgincludeHEADERS @MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi @MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION) -@MUDFLAP_FALSE@%.os: %.c %.o -@MUDFLAP_FALSE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ -@MUDFLAP_FALSE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ -@MUDFLAP_FALSE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ -@MUDFLAP_FALSE@ rm -f "$(DEPDIR)/$*.Tpo"; \ -@MUDFLAP_FALSE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@MUDFLAP_FALSE@ fi - @MUDFLAP_FALSE@install: install-am libasm.so @MUDFLAP_FALSE@ $(mkinstalldirs) $(DESTDIR)$(libdir) @MUDFLAP_FALSE@ $(INSTALL_PROGRAM) libasm.so $(DESTDIR)$(libdir)/libasm-$(PACKAGE_VERSION).so diff --git a/elfutils/libcpu/ChangeLog b/elfutils/libcpu/ChangeLog index 738af57a..9d517fc8 100644 --- a/elfutils/libcpu/ChangeLog +++ b/elfutils/libcpu/ChangeLog @@ -1,3 +1,7 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + 2009-04-14 Roland McGrath <roland@redhat.com> * Makefile.am (AM_CFLAGS): Add -fdollars-in-identifiers; it is not the diff --git a/elfutils/libcpu/Makefile.am b/elfutils/libcpu/Makefile.am index 923556f6..ca334bb6 100644 --- a/elfutils/libcpu/Makefile.am +++ b/elfutils/libcpu/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009 Red Hat, Inc. +## Copyright (C) 2002-2010 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -24,26 +24,14 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -if MUDFLAP -AM_CFLAGS = -fmudflap -else -AM_CFLAGS = -endif -AM_CFLAGS += -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fpic \ - -fdollars-in-identifiers \ - $($(*F)_CFLAGS) \ - $(if $($(*F)_no_Werror),,-Werror) -INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \ - -I$(srcdir)/../libebl -I$(srcdir)/../libdw -I$(srcdir)/../libasm +include $(top_srcdir)/config/eu.am +INCLUDES += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw -I$(srcdir)/../libasm +AM_CFLAGS += -fpic -fdollars-in-identifiers LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -P$(<F:lex.l=) LEX_OUTPUT_ROOT = lex.$(<F:lex.l=) AM_YFLAGS = -p$(<F:parse.y=) -if MUDFLAP -libmudflap = -lmudflap -endif - noinst_LIBRARIES = libcpu_i386.a libcpu_x86_64.a noinst_PROGRAMS = i386_gendis @@ -81,4 +69,4 @@ noinst_HEADERS = memory-access.h i386_parse.h i386_data.h EXTRA_DIST = defs/i386 -CLEANFILES = i386.mnemonics i386_dis.h x86_64.mnemonics x86_64_dis.h +CLEANFILES += i386.mnemonics i386_dis.h x86_64.mnemonics x86_64_dis.h diff --git a/elfutils/libcpu/Makefile.in b/elfutils/libcpu/Makefile.in index 3675ff29..d6d25055 100644 --- a/elfutils/libcpu/Makefile.in +++ b/elfutils/libcpu/Makefile.in @@ -36,10 +36,12 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \ + i386_lex.c i386_parse.c +@MUDFLAP_TRUE@am__append_1 = -fmudflap noinst_PROGRAMS = i386_gendis$(EXEEXT) subdir = libcpu -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ChangeLog i386_lex.c i386_parse.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/zip.m4 \ @@ -200,19 +202,24 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 \ -@MUDFLAP_FALSE@ -fpic -fdollars-in-identifiers $($(*F)_CFLAGS) \ -@MUDFLAP_FALSE@ $(if $($(*F)_no_Werror),,-Werror) -@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused -Wextra \ -@MUDFLAP_TRUE@ -std=gnu99 -fpic -fdollars-in-identifiers \ -@MUDFLAP_TRUE@ $($(*F)_CFLAGS) $(if \ -@MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) -INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \ - -I$(srcdir)/../libebl -I$(srcdir)/../libdw -I$(srcdir)/../libasm +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ + -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw -I$(srcdir)/../libasm +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) -fpic -fdollars-in-identifiers +@MUDFLAP_FALSE@libmudflap = +@MUDFLAP_TRUE@libmudflap = -lmudflap +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) +CLEANFILES = *.gcno *.gcda i386.mnemonics i386_dis.h x86_64.mnemonics \ + x86_64_dis.h +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -P$(<F:lex.l=) AM_YFLAGS = -p$(<F:parse.y=) -@MUDFLAP_TRUE@libmudflap = -lmudflap noinst_LIBRARIES = libcpu_i386.a libcpu_x86_64.a libcpu_i386_a_SOURCES = i386_disasm.c libcpu_x86_64_a_SOURCES = x86_64_disasm.c @@ -224,12 +231,11 @@ i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`" i386_gendis_LDADD = $(libeu) -lm $(libmudflap) noinst_HEADERS = memory-access.h i386_parse.h i386_data.h EXTRA_DIST = defs/i386 -CLEANFILES = i386.mnemonics i386_dis.h x86_64.mnemonics x86_64_dis.h all: all-am .SUFFIXES: .SUFFIXES: .c .l .o .obj .y -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/eu.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -509,6 +515,15 @@ uninstall-am: uninstall-am +%.os: %.c %.o +@AMDEP_TRUE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ +@AMDEP_TRUE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +@AMDEP_TRUE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*.Tpo"; \ +@AMDEP_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< + i386_disasm.o: i386.mnemonics i386_dis.h x86_64_disasm.o: x86_64.mnemonics x86_64_dis.h i386_disasm.c diff --git a/elfutils/libdw/ChangeLog b/elfutils/libdw/ChangeLog index 97f87da0..c21b9129 100644 --- a/elfutils/libdw/ChangeLog +++ b/elfutils/libdw/ChangeLog @@ -1,3 +1,11 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + +2010-02-02 Mark Wielaard <mjw@redhat.com> + + * fde.c (intern_fde): Fix length check for sized_augmentation_data. + 2010-01-07 Roland McGrath <roland@redhat.com> * dwarf_getcfi_elf.c (getcfi_phdr): Use elf_getphdrnum. diff --git a/elfutils/libdw/Makefile.am b/elfutils/libdw/Makefile.am index 23896fa6..4bd0f2a8 100644 --- a/elfutils/libdw/Makefile.am +++ b/elfutils/libdw/Makefile.am @@ -24,22 +24,14 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW -if MUDFLAP -AM_CFLAGS = -fmudflap -else -AM_CFLAGS = -endif +include $(top_srcdir)/config/eu.am +DEFS += -DIS_LIBDW if BUILD_STATIC AM_CFLAGS += -fpic endif -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 -INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib +INCLUDES += -I$(srcdir)/../libelf VERSION = 1 -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) - lib_LIBRARIES = libdw.a if !MUDFLAP noinst_LIBRARIES = libdw_pic.a @@ -117,14 +109,6 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.a \ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi ln -fs $@ $@.$(VERSION) -%.os: %.c %.o - if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ - -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ - then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ - rm -f "$(DEPDIR)/$*.Tpo"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi - install: install-am libdw.so $(mkinstalldirs) $(DESTDIR)$(libdir) $(INSTALL_PROGRAM) libdw.so $(DESTDIR)$(libdir)/libdw-$(PACKAGE_VERSION).so @@ -145,4 +129,4 @@ noinst_HEADERS = libdwP.h memory-access.h dwarf_abbrev_hash.h \ EXTRA_DIST = libdw.map -MOSTLYCLEANFILES = $(am_libdw_pic_a_OBJECTS) *.gcno *.gcda libdw.so.$(VERSION) +MOSTLYCLEANFILES = $(am_libdw_pic_a_OBJECTS) libdw.so.$(VERSION) diff --git a/elfutils/libdw/Makefile.in b/elfutils/libdw/Makefile.in index f77dd161..00e021aa 100644 --- a/elfutils/libdw/Makefile.in +++ b/elfutils/libdw/Makefile.in @@ -36,13 +36,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@BUILD_STATIC_TRUE@am__append_1 = -fpic +DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ + $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog +@MUDFLAP_TRUE@am__append_1 = -fmudflap +@BUILD_STATIC_TRUE@am__append_2 = -fpic @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1) @MUDFLAP_TRUE@am_libdw_pic_a_OBJECTS = subdir = libdw -DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ - $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/zip.m4 \ @@ -273,14 +274,20 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \ -@MUDFLAP_FALSE@ -Wunused -Wformat=2 -Wextra -std=gnu99 -@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Werror \ -@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 -INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) - +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ + -I$(srcdir)/../libelf +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) $(am__append_2) +@MUDFLAP_FALSE@libmudflap = +@MUDFLAP_TRUE@libmudflap = -lmudflap +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) + +CLEANFILES = *.gcno *.gcda +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi lib_LIBRARIES = libdw.a @MUDFLAP_FALSE@noinst_LIBRARIES = libdw_pic.a include_HEADERS = dwarf.h @@ -337,13 +344,13 @@ noinst_HEADERS = libdwP.h memory-access.h dwarf_abbrev_hash.h \ cfi.h encoded-value.h EXTRA_DIST = libdw.map -MOSTLYCLEANFILES = $(am_libdw_pic_a_OBJECTS) *.gcno *.gcda libdw.so.$(VERSION) +MOSTLYCLEANFILES = $(am_libdw_pic_a_OBJECTS) libdw.so.$(VERSION) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/eu.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -697,6 +704,7 @@ mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -795,6 +803,15 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLIBRARIES \ ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS \ uninstall-libLIBRARIES uninstall-pkgincludeHEADERS + +%.os: %.c %.o +@AMDEP_TRUE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ +@AMDEP_TRUE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +@AMDEP_TRUE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*.Tpo"; \ +@AMDEP_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< @MAINTAINER_MODE_TRUE@$(srcdir)/known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h @MAINTAINER_MODE_TRUE@ $(AWK) -f $^ > $@.new @MAINTAINER_MODE_TRUE@ mv -f $@.new $@ @@ -811,14 +828,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLIBRARIES \ @MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi @MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION) -@MUDFLAP_FALSE@%.os: %.c %.o -@MUDFLAP_FALSE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ -@MUDFLAP_FALSE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ -@MUDFLAP_FALSE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ -@MUDFLAP_FALSE@ rm -f "$(DEPDIR)/$*.Tpo"; \ -@MUDFLAP_FALSE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@MUDFLAP_FALSE@ fi - @MUDFLAP_FALSE@install: install-am libdw.so @MUDFLAP_FALSE@ $(mkinstalldirs) $(DESTDIR)$(libdir) @MUDFLAP_FALSE@ $(INSTALL_PROGRAM) libdw.so $(DESTDIR)$(libdir)/libdw-$(PACKAGE_VERSION).so diff --git a/elfutils/libdw/fde.c b/elfutils/libdw/fde.c index f38eed7e..c826114c 100644 --- a/elfutils/libdw/fde.c +++ b/elfutils/libdw/fde.c @@ -115,7 +115,7 @@ intern_fde (Dwarf_CFI *cache, const Dwarf_FDE *entry) before its actual instruction stream. */ Dwarf_Word len; get_uleb128 (len, fde->instructions); - if ((Dwarf_Word) (fde->instructions_end < fde->instructions) < len) + if ((Dwarf_Word) (fde->instructions_end - fde->instructions) < len) { free (fde); __libdw_seterrno (DWARF_E_INVALID_DWARF); diff --git a/elfutils/libdwfl/ChangeLog b/elfutils/libdwfl/ChangeLog index d9e6e654..7df643e3 100644 --- a/elfutils/libdwfl/ChangeLog +++ b/elfutils/libdwfl/ChangeLog @@ -1,3 +1,22 @@ +2010-02-17 Roland McGrath <roland@redhat.com> + + * dwfl_segment_report_module.c (addr_segndx): Take new flag argument. + If set, find the first index not below ADDR. + (dwfl_segment_report_module): Update callers. + Pass true when calculating return value. + +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + + * find-debuginfo.c (find_debuginfo_in_path): Fix uninitialized + variable in failure path. + +2010-02-02 Mark Wielaard <mjw@redhat.com> + + * dwfl_module_dwarf_cfi.c (dwfl_module_dwarf_cfi): Always set bias. + * dwfl_module_eh_cfi.c (dwfl_module_eh_cfi): Likewise + 2010-01-07 Roland McGrath <roland@redhat.com> * core-file.c (dwfl_core_file_report): Use elf_getphdrnum. diff --git a/elfutils/libdwfl/Makefile.am b/elfutils/libdwfl/Makefile.am index 69bef7d9..8ec1f4fa 100644 --- a/elfutils/libdwfl/Makefile.am +++ b/elfutils/libdwfl/Makefile.am @@ -2,7 +2,7 @@ ## ## Process this file with automake to create Makefile.in ## -## Copyright (C) 2005, 2006, 2007, 2008, 2009 Red Hat, Inc. +## Copyright (C) 2005-2010 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -26,20 +26,11 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -if MUDFLAP -AM_CFLAGS = -fmudflap -else -AM_CFLAGS = -endif -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 -INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib +include $(top_srcdir)/config/eu.am +INCLUDES += -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw VERSION = 1 -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) - noinst_LIBRARIES = libdwfl.a if !MUDFLAP noinst_LIBRARIES += libdwfl_pic.a @@ -90,7 +81,6 @@ if MUDFLAP libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu) libdw = ../libdw/libdw.a libelf = ../libelf/libelf.a -libmudflap = -lmudflap else libdwfl = $(libdw) libdw = ../libdw/libdw.so @@ -99,20 +89,11 @@ endif libebl = ../libebl/libebl.a libeu = ../lib/libeu.a - if !MUDFLAP libdwfl_pic_a_SOURCES = am_libdwfl_pic_a_OBJECTS = $(libdwfl_a_SOURCES:.c=.os) - -%.os: %.c %.o - if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ - -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ - then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ - rm -f "$(DEPDIR)/$*.Tpo"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi endif noinst_HEADERS = libdwflP.h -CLEANFILES = $(am_libdwfl_pic_a_OBJECTS) +CLEANFILES += $(am_libdwfl_pic_a_OBJECTS) diff --git a/elfutils/libdwfl/Makefile.in b/elfutils/libdwfl/Makefile.in index 511706ed..bff0882b 100644 --- a/elfutils/libdwfl/Makefile.in +++ b/elfutils/libdwfl/Makefile.in @@ -35,14 +35,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@MUDFLAP_FALSE@am__append_1 = libdwfl_pic.a -@ZLIB_TRUE@am__append_2 = gzip.c -@BZLIB_TRUE@am__append_3 = bzip2.c -@LZMA_TRUE@am__append_4 = lzma.c +DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/eu.am ChangeLog +@MUDFLAP_TRUE@am__append_1 = -fmudflap +@MUDFLAP_FALSE@am__append_2 = libdwfl_pic.a +@ZLIB_TRUE@am__append_3 = gzip.c +@BZLIB_TRUE@am__append_4 = bzip2.c +@LZMA_TRUE@am__append_5 = lzma.c @MUDFLAP_TRUE@am_libdwfl_pic_a_OBJECTS = subdir = libdwfl -DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/zip.m4 \ @@ -265,17 +267,22 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \ -@MUDFLAP_FALSE@ -Wextra -std=gnu99 -@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \ -@MUDFLAP_TRUE@ -Wformat=2 -Wextra -std=gnu99 -INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib - -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. -I$(srcdir) \ + -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw +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) +@MUDFLAP_FALSE@libmudflap = +@MUDFLAP_TRUE@libmudflap = -lmudflap +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) -noinst_LIBRARIES = libdwfl.a $(am__append_1) +CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS) +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi +noinst_LIBRARIES = libdwfl.a $(am__append_2) pkginclude_HEADERS = libdwfl.h libdwfl_a_SOURCES = dwfl_begin.c dwfl_end.c dwfl_error.c \ dwfl_version.c dwfl_module.c dwfl_report_elf.c relocate.c \ @@ -296,26 +303,24 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_end.c dwfl_error.c \ dwfl_module_addrname.c dwfl_module_addrsym.c \ dwfl_module_return_value_location.c \ dwfl_module_register_names.c dwfl_segment_report_module.c \ - link_map.c core-file.c open.c image-header.c $(am__append_2) \ - $(am__append_3) $(am__append_4) + link_map.c core-file.c open.c image-header.c $(am__append_3) \ + $(am__append_4) $(am__append_5) @MUDFLAP_FALSE@libdwfl = $(libdw) @MUDFLAP_TRUE@libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu) @MUDFLAP_FALSE@libdw = ../libdw/libdw.so @MUDFLAP_TRUE@libdw = ../libdw/libdw.a @MUDFLAP_FALSE@libelf = ../libelf/libelf.so @MUDFLAP_TRUE@libelf = ../libelf/libelf.a -@MUDFLAP_TRUE@libmudflap = -lmudflap libebl = ../libebl/libebl.a libeu = ../lib/libeu.a @MUDFLAP_FALSE@libdwfl_pic_a_SOURCES = @MUDFLAP_FALSE@am_libdwfl_pic_a_OBJECTS = $(libdwfl_a_SOURCES:.c=.os) noinst_HEADERS = libdwflP.h -CLEANFILES = $(am_libdwfl_pic_a_OBJECTS) all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/eu.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -658,13 +663,14 @@ uninstall-am: uninstall-pkgincludeHEADERS tags uninstall uninstall-am uninstall-pkgincludeHEADERS -@MUDFLAP_FALSE@%.os: %.c %.o -@MUDFLAP_FALSE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ -@MUDFLAP_FALSE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ -@MUDFLAP_FALSE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ -@MUDFLAP_FALSE@ rm -f "$(DEPDIR)/$*.Tpo"; \ -@MUDFLAP_FALSE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@MUDFLAP_FALSE@ fi +%.os: %.c %.o +@AMDEP_TRUE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ +@AMDEP_TRUE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +@AMDEP_TRUE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*.Tpo"; \ +@AMDEP_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/elfutils/libdwfl/dwfl_module_dwarf_cfi.c b/elfutils/libdwfl/dwfl_module_dwarf_cfi.c index b02bfafb..e851a1f4 100644 --- a/elfutils/libdwfl/dwfl_module_dwarf_cfi.c +++ b/elfutils/libdwfl/dwfl_module_dwarf_cfi.c @@ -80,7 +80,10 @@ dwfl_module_dwarf_cfi (mod, bias) return NULL; if (mod->dwarf_cfi != NULL) - return mod->dwarf_cfi; + { + *bias = mod->debug.bias; + return mod->dwarf_cfi; + } return __libdwfl_set_cfi (mod, &mod->dwarf_cfi, INTUSE(dwarf_getcfi) diff --git a/elfutils/libdwfl/dwfl_module_eh_cfi.c b/elfutils/libdwfl/dwfl_module_eh_cfi.c index a3cf6243..36a495f1 100644 --- a/elfutils/libdwfl/dwfl_module_eh_cfi.c +++ b/elfutils/libdwfl/dwfl_module_eh_cfi.c @@ -59,7 +59,10 @@ dwfl_module_eh_cfi (mod, bias) return NULL; if (mod->eh_cfi != NULL) - return mod->eh_cfi; + { + *bias = mod->main.bias; + return mod->eh_cfi; + } __libdwfl_getelf (mod); if (mod->elferr != DWFL_E_NOERROR) diff --git a/elfutils/libdwfl/dwfl_segment_report_module.c b/elfutils/libdwfl/dwfl_segment_report_module.c index 10787bdc..5f982f41 100644 --- a/elfutils/libdwfl/dwfl_segment_report_module.c +++ b/elfutils/libdwfl/dwfl_segment_report_module.c @@ -1,5 +1,5 @@ /* Sniff out modules from ELF headers visible in memory segments. - Copyright (C) 2008, 2009 Red Hat, Inc. + Copyright (C) 2008-2010 Red Hat, Inc. This file is part of Red Hat elfutils. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -73,19 +73,28 @@ #endif -/* Return user segment index closest to ADDR but not above it. */ +/* Return user segment index closest to ADDR but not above it. + If NEXT, return the closest to ADDR but not below it. */ static int -addr_segndx (Dwfl *dwfl, size_t segment, GElf_Addr addr) +addr_segndx (Dwfl *dwfl, size_t segment, GElf_Addr addr, bool next) { - int ndx = dwfl->lookup_segndx[segment]; + int ndx = -1; do { if (dwfl->lookup_segndx[segment] >= 0) ndx = dwfl->lookup_segndx[segment]; - ++segment; + if (++segment >= dwfl->lookup_elts - 1) + return next ? ndx + 1 : ndx; + } + while (dwfl->lookup_addr[segment] < addr); + + if (next) + { + while (dwfl->lookup_segndx[segment] < 0) + if (++segment >= dwfl->lookup_elts - 1) + return ndx + 1; + ndx = dwfl->lookup_segndx[segment]; } - while (segment < dwfl->lookup_elts - 1 - && dwfl->lookup_addr[segment] < addr); return ndx; } @@ -148,7 +157,7 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name, { *data = NULL; *data_size = filesz; - return segment_read (addr_segndx (dwfl, segment, vaddr), + return segment_read (addr_segndx (dwfl, segment, vaddr, false), data, data_size, vaddr, filesz); } @@ -437,10 +446,8 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name, dyn_vaddr += bias; /* Our return value now says to skip the segments contained - within the module. - XXX handle gaps - */ - ndx = addr_segndx (dwfl, segment, module_end); + within the module. */ + ndx = addr_segndx (dwfl, segment, module_end, true); /* Examine its .dynamic section to get more interesting details. If it has DT_SONAME, we'll use that as the module name. @@ -599,7 +606,7 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name, { void *into = contents + offset; size_t read_size = size; - (void) segment_read (addr_segndx (dwfl, segment, vaddr), + (void) segment_read (addr_segndx (dwfl, segment, vaddr, false), &into, &read_size, vaddr, size); } diff --git a/elfutils/libdwfl/find-debuginfo.c b/elfutils/libdwfl/find-debuginfo.c index 9e817398..8fdaeb39 100644 --- a/elfutils/libdwfl/find-debuginfo.c +++ b/elfutils/libdwfl/find-debuginfo.c @@ -1,5 +1,5 @@ /* Standard find_debuginfo callback for libdwfl. - Copyright (C) 2005, 2006, 2007, 2008, 2009 Red Hat, Inc. + Copyright (C) 2005-2010 Red Hat, Inc. This file is part of Red Hat elfutils. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -198,7 +198,7 @@ find_debuginfo_in_path (Dwfl_Module *mod, const char *file_name, break; } - char *fname; + char *fname = NULL; int fd = try_open (dir, subdir, debuglink_file, &fname); if (fd < 0) switch (errno) diff --git a/elfutils/libebl/ChangeLog b/elfutils/libebl/ChangeLog index aaa1c86d..ed9361c1 100644 --- a/elfutils/libebl/ChangeLog +++ b/elfutils/libebl/ChangeLog @@ -1,3 +1,7 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + 2010-01-04 Roland McGrath <roland@redhat.com> * eblcorenote.c (ebl_core_note): Take GElf_Nhdr * and name data diff --git a/elfutils/libebl/Makefile.am b/elfutils/libebl/Makefile.am index a95e66d6..d157195e 100644 --- a/elfutils/libebl/Makefile.am +++ b/elfutils/libebl/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 2000-2009 Red Hat, Inc. +## Copyright (C) 2000-2010 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -24,19 +24,10 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\" -if MUDFLAP -AM_CFLAGS = -fmudflap -else -AM_CFLAGS = -endif -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ - -std=gnu99 - -INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ - -I$(top_srcdir)/lib -I.. -I$(srcdir)/../libasm +include $(top_srcdir)/config/eu.am +AM_CFLAGS += -fpic +INCLUDES += -I$(srcdir)/../libelf -I$(srcdir)/../libdw -I$(srcdir)/../libasm VERSION = 1 -PACKAGE_VERSION = @PACKAGE_VERSION@ LIBEBL_SUBDIR = @LIBEBL_SUBDIR@ lib_LIBRARIES = libebl.a @@ -63,15 +54,6 @@ gen_SOURCES = eblopenbackend.c eblclosebackend.c eblstrtab.c \ libebl_a_SOURCES = $(gen_SOURCES) - -%.os: %.c %.o - if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ - -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ - then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ - rm -f "$(DEPDIR)/$*.Tpo"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi - noinst_HEADERS = libeblP.h ebl-hooks.h -CLEANFILES = $(am_libebl_pic_a_OBJECTS) *.gcno *.gcda +CLEANFILES += $(am_libebl_pic_a_OBJECTS) diff --git a/elfutils/libebl/Makefile.in b/elfutils/libebl/Makefile.in index c42056ec..7d058e62 100644 --- a/elfutils/libebl/Makefile.in +++ b/elfutils/libebl/Makefile.in @@ -35,9 +35,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = libebl DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/eu.am ChangeLog +@MUDFLAP_TRUE@am__append_1 = -fmudflap +subdir = libebl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/zip.m4 \ @@ -127,7 +129,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEBUGPRED = @DEBUGPRED@ -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\" +DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -227,13 +229,21 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ -@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99 -@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ -@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99 -INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ - -I$(top_srcdir)/lib -I.. -I$(srcdir)/../libasm - +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ + -I$(srcdir)/../libelf -I$(srcdir)/../libdw \ + -I$(srcdir)/../libasm +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) -fpic +@MUDFLAP_FALSE@libmudflap = +@MUDFLAP_TRUE@libmudflap = -lmudflap +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) + +CLEANFILES = *.gcno *.gcda $(am_libebl_pic_a_OBJECTS) +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi lib_LIBRARIES = libebl.a pkginclude_HEADERS = libebl.h gen_SOURCES = eblopenbackend.c eblclosebackend.c eblstrtab.c \ @@ -256,12 +266,11 @@ gen_SOURCES = eblopenbackend.c eblclosebackend.c eblstrtab.c \ libebl_a_SOURCES = $(gen_SOURCES) noinst_HEADERS = libeblP.h ebl-hooks.h -CLEANFILES = $(am_libebl_pic_a_OBJECTS) *.gcno *.gcda all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/eu.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -617,12 +626,13 @@ uninstall-am: uninstall-libLIBRARIES uninstall-pkgincludeHEADERS %.os: %.c %.o - if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ - -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ - then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ - rm -f "$(DEPDIR)/$*.Tpo"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi +@AMDEP_TRUE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ +@AMDEP_TRUE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +@AMDEP_TRUE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*.Tpo"; \ +@AMDEP_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/elfutils/libelf/ChangeLog b/elfutils/libelf/ChangeLog index c71c5638..38142087 100644 --- a/elfutils/libelf/ChangeLog +++ b/elfutils/libelf/ChangeLog @@ -1,3 +1,13 @@ +2010-02-17 Roland McGrath <roland@redhat.com> + + * elf_begin.c (file_read_elf): Leave section rawdata_base and + data_base pointers null when [sh_offset,sh_size) points outside + the mapped file. + +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + 2010-01-07 Roland McGrath <roland@redhat.com> * elf32_getphdr.c: Use __elf_getphdrnum_rdlock. diff --git a/elfutils/libelf/Makefile.am b/elfutils/libelf/Makefile.am index b277e944..c7c83f35 100644 --- a/elfutils/libelf/Makefile.am +++ b/elfutils/libelf/Makefile.am @@ -24,24 +24,12 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -if MUDFLAP -AM_CFLAGS = -fmudflap -else -AM_CFLAGS = -endif +include $(top_srcdir)/config/eu.am if BUILD_STATIC AM_CFLAGS += -fpic endif -AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ - $($(*F)_CFLAGS) -INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) VERSION = 1 -PACKAGE_VERSION = @PACKAGE_VERSION@ - -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) lib_LIBRARIES = libelf.a if !MUDFLAP @@ -118,14 +106,6 @@ libelf.so: libelf_pic.a libelf.map if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi ln -fs $@ $@.$(VERSION) -%.os: %.c %.o - if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ - -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ - then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ - rm -f "$(DEPDIR)/$*.Tpo"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi - install: install-am libelf.so $(mkinstalldirs) $(DESTDIR)$(libdir) $(INSTALL_PROGRAM) libelf.so $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so @@ -142,4 +122,4 @@ 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 EXTRA_DIST = libelf.map -CLEANFILES = $(am_libelf_pic_a_OBJECTS) *.gcno *.gcda libelf.so.$(VERSION) +CLEANFILES += $(am_libelf_pic_a_OBJECTS) libelf.so.$(VERSION) diff --git a/elfutils/libelf/Makefile.in b/elfutils/libelf/Makefile.in index 283efd47..f0be9c27 100644 --- a/elfutils/libelf/Makefile.in +++ b/elfutils/libelf/Makefile.in @@ -36,14 +36,15 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@BUILD_STATIC_TRUE@am__append_1 = -fpic +DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ + $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog +@MUDFLAP_TRUE@am__append_1 = -fmudflap +@BUILD_STATIC_TRUE@am__append_2 = -fpic @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1) @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS = -@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_2 = -lpthread +@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread subdir = libelf -DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ - $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/zip.m4 \ @@ -274,17 +275,21 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \ -@MUDFLAP_FALSE@ -Wunused -Wextra -Wformat=2 -std=gnu99 \ -@MUDFLAP_FALSE@ $($(*F)_CFLAGS) -@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Wshadow \ -@MUDFLAP_TRUE@ -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ -@MUDFLAP_TRUE@ $($(*F)_CFLAGS) -INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. +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) $(am__append_2) +@MUDFLAP_FALSE@libmudflap = +@MUDFLAP_TRUE@libmudflap = -lmudflap +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) + +CLEANFILES = *.gcno *.gcda $(am_libelf_pic_a_OBJECTS) \ + libelf.so.$(VERSION) +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) - lib_LIBRARIES = libelf.a @MUDFLAP_FALSE@noinst_LIBRARIES = libelf_pic.a include_HEADERS = libelf.h gelf.h nlist.h @@ -340,18 +345,17 @@ libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \ @MUDFLAP_FALSE@libelf_pic_a_SOURCES = @MUDFLAP_FALSE@am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) -@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_2) +@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_3) @MUDFLAP_FALSE@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 EXTRA_DIST = libelf.map -CLEANFILES = $(am_libelf_pic_a_OBJECTS) *.gcno *.gcda libelf.so.$(VERSION) all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/eu.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -806,6 +810,15 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLIBRARIES \ ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS \ uninstall-libLIBRARIES uninstall-pkgincludeHEADERS + +%.os: %.c %.o +@AMDEP_TRUE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ +@AMDEP_TRUE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +@AMDEP_TRUE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*.Tpo"; \ +@AMDEP_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< @MUDFLAP_FALSE@libelf.so: libelf_pic.a libelf.map @MUDFLAP_FALSE@ $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ @MUDFLAP_FALSE@ -Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \ @@ -813,14 +826,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLIBRARIES \ @MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi @MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION) -@MUDFLAP_FALSE@%.os: %.c %.o -@MUDFLAP_FALSE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ -@MUDFLAP_FALSE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ -@MUDFLAP_FALSE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ -@MUDFLAP_FALSE@ rm -f "$(DEPDIR)/$*.Tpo"; \ -@MUDFLAP_FALSE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@MUDFLAP_FALSE@ fi - @MUDFLAP_FALSE@install: install-am libelf.so @MUDFLAP_FALSE@ $(mkinstalldirs) $(DESTDIR)$(libdir) @MUDFLAP_FALSE@ $(INSTALL_PROGRAM) libelf.so $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so diff --git a/elfutils/libelf/elf_begin.c b/elfutils/libelf/elf_begin.c index 896d86b6..0b9583b2 100644 --- a/elfutils/libelf/elf_begin.c +++ b/elfutils/libelf/elf_begin.c @@ -338,10 +338,13 @@ file_read_elf (int fildes, void *map_address, unsigned char *e_ident, elf->state.elf32.scns.data[cnt].elf = elf; elf->state.elf32.scns.data[cnt].shdr.e32 = &elf->state.elf32.shdr[cnt]; - elf->state.elf32.scns.data[cnt].rawdata_base = - elf->state.elf32.scns.data[cnt].data_base = - ((char *) map_address + offset - + elf->state.elf32.shdr[cnt].sh_offset); + if (likely (elf->state.elf32.shdr[cnt].sh_offset < maxsize) + && likely (maxsize - elf->state.elf32.shdr[cnt].sh_offset + <= elf->state.elf32.shdr[cnt].sh_size)) + elf->state.elf32.scns.data[cnt].rawdata_base = + elf->state.elf32.scns.data[cnt].data_base = + ((char *) map_address + offset + + elf->state.elf32.shdr[cnt].sh_offset); elf->state.elf32.scns.data[cnt].list = &elf->state.elf32.scns; /* If this is a section with an extended index add a @@ -423,10 +426,13 @@ file_read_elf (int fildes, void *map_address, unsigned char *e_ident, elf->state.elf64.scns.data[cnt].elf = elf; elf->state.elf64.scns.data[cnt].shdr.e64 = &elf->state.elf64.shdr[cnt]; - elf->state.elf64.scns.data[cnt].rawdata_base = - elf->state.elf64.scns.data[cnt].data_base = - ((char *) map_address + offset - + elf->state.elf64.shdr[cnt].sh_offset); + if (likely (elf->state.elf64.shdr[cnt].sh_offset < maxsize) + && likely (maxsize - elf->state.elf64.shdr[cnt].sh_offset + <= elf->state.elf64.shdr[cnt].sh_size)) + elf->state.elf64.scns.data[cnt].rawdata_base = + elf->state.elf64.scns.data[cnt].data_base = + ((char *) map_address + offset + + elf->state.elf64.shdr[cnt].sh_offset); elf->state.elf64.scns.data[cnt].list = &elf->state.elf64.scns; /* If this is a section with an extended index add a diff --git a/elfutils/po/elfutils.pot b/elfutils/po/elfutils.pot index d681c86f..a6e26015 100644 --- a/elfutils/po/elfutils.pot +++ b/elfutils/po/elfutils.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" -"POT-Creation-Date: 2010-01-14 18:51-0800\n" +"POT-Creation-Date: 2010-02-23 18:42-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,8 +17,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: lib/xmalloc.c:51 lib/xmalloc.c:65 lib/xmalloc.c:79 src/readelf.c:2819 -#: src/readelf.c:3158 src/unstrip.c:2086 src/unstrip.c:2294 +#: lib/xmalloc.c:51 lib/xmalloc.c:65 lib/xmalloc.c:79 src/readelf.c:2820 +#: src/readelf.c:3159 src/unstrip.c:2087 src/unstrip.c:2295 #, c-format msgid "memory exhausted" msgstr "" @@ -51,7 +51,7 @@ msgstr "" msgid "invalid size of destination operand" msgstr "" -#: libelf/elf_error.c:108 src/readelf.c:4773 +#: libelf/elf_error.c:108 src/readelf.c:4777 #, c-format msgid "invalid encoding" msgstr "" @@ -144,7 +144,7 @@ msgstr "" msgid "invalid section header" msgstr "" -#: libelf/elf_error.c:208 src/readelf.c:6257 src/readelf.c:6358 +#: libelf/elf_error.c:208 src/readelf.c:6240 src/readelf.c:6341 #, c-format msgid "invalid data" msgstr "" @@ -348,7 +348,7 @@ msgstr "" msgid "invalid CFI section" msgstr "" -#: libdwfl/argp-std.c:67 src/unstrip.c:2236 +#: libdwfl/argp-std.c:67 src/unstrip.c:2237 msgid "Input selection options:" msgstr "" @@ -447,136 +447,136 @@ msgstr "" msgid "<unknown>: %d" msgstr "" -#: src/ar.c:75 +#: src/ar.c:76 msgid "Commands:" msgstr "" -#: src/ar.c:76 +#: src/ar.c:77 msgid "Delete files from archive." msgstr "" -#: src/ar.c:77 +#: src/ar.c:78 msgid "Move files in archive." msgstr "" -#: src/ar.c:78 +#: src/ar.c:79 msgid "Print files in archive." msgstr "" -#: src/ar.c:79 +#: src/ar.c:80 msgid "Quick append files to archive." msgstr "" -#: src/ar.c:81 +#: src/ar.c:82 msgid "Replace existing or insert new file into archive." msgstr "" -#: src/ar.c:82 +#: src/ar.c:83 msgid "Display content of archive." msgstr "" -#: src/ar.c:83 +#: src/ar.c:84 msgid "Extract files from archive." msgstr "" -#: src/ar.c:85 +#: src/ar.c:86 msgid "Command Modifiers:" msgstr "" -#: src/ar.c:86 +#: src/ar.c:87 msgid "Preserve original dates." msgstr "" -#: src/ar.c:87 +#: src/ar.c:88 msgid "Use instance [COUNT] of name." msgstr "" -#: src/ar.c:89 +#: src/ar.c:90 msgid "Do not replace existing files with extracted files." msgstr "" -#: src/ar.c:90 +#: src/ar.c:91 msgid "Allow filename to be truncated if necessary." msgstr "" -#: src/ar.c:92 +#: src/ar.c:93 msgid "Provide verbose output." msgstr "" -#: src/ar.c:93 +#: src/ar.c:94 msgid "Force regeneration of symbol table." msgstr "" -#: src/ar.c:94 +#: src/ar.c:95 msgid "Insert file after [MEMBER]." msgstr "" -#: src/ar.c:95 +#: src/ar.c:96 msgid "Insert file before [MEMBER]." msgstr "" -#: src/ar.c:96 +#: src/ar.c:97 msgid "Same as -b." msgstr "" -#: src/ar.c:97 +#: src/ar.c:98 msgid "Suppress message when library has to be created." msgstr "" -#: src/ar.c:99 +#: src/ar.c:100 msgid "Use full path for file matching." msgstr "" -#: src/ar.c:100 +#: src/ar.c:101 msgid "Update only older files in archive." msgstr "" -#: src/ar.c:106 +#: src/ar.c:107 msgid "Create, modify, and extract from archives." msgstr "" -#: src/ar.c:109 +#: src/ar.c:110 msgid "[MEMBER] [COUNT] ARCHIVE [FILE...]" msgstr "" -#: src/ar.c:191 +#: src/ar.c:192 #, c-format msgid "'a', 'b', and 'i' are only allowed with the 'm' and 'r' options" msgstr "" -#: src/ar.c:196 +#: src/ar.c:197 #, c-format msgid "MEMBER parameter required for 'a', 'b', and 'i' modifiers" msgstr "" -#: src/ar.c:212 +#: src/ar.c:213 #, c-format msgid "'N' is only meaningful with the 'x' and 'd' options" msgstr "" -#: src/ar.c:217 +#: src/ar.c:218 #, c-format msgid "COUNT parameter required" msgstr "" -#: src/ar.c:229 +#: src/ar.c:230 #, c-format msgid "invalid COUNT parameter %s" msgstr "" -#: src/ar.c:236 +#: src/ar.c:237 #, c-format msgid "'%c' is only meaningful with the 'x' option" msgstr "" -#: src/ar.c:242 +#: src/ar.c:243 #, c-format msgid "archive name required" msgstr "" -#: src/ar.c:288 src/nm.c:253 src/readelf.c:448 src/size.c:219 src/strip.c:203 -#: src/ld.c:957 src/elflint.c:238 src/addr2line.c:185 src/findtextrel.c:170 -#: src/elfcmp.c:555 src/ranlib.c:136 src/strings.c:227 src/unstrip.c:233 +#: src/ar.c:289 src/nm.c:253 src/readelf.c:449 src/size.c:219 src/strip.c:204 +#: src/ld.c:957 src/elflint.c:239 src/addr2line.c:185 src/findtextrel.c:170 +#: src/elfcmp.c:555 src/ranlib.c:136 src/strings.c:227 src/unstrip.c:234 #: src/objdump.c:181 #, c-format msgid "" @@ -585,125 +585,125 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/ar.c:293 src/nm.c:258 src/readelf.c:453 src/size.c:224 src/strip.c:208 -#: src/ld.c:962 src/elflint.c:243 src/addr2line.c:190 src/findtextrel.c:175 -#: src/elfcmp.c:560 src/ranlib.c:141 src/strings.c:232 src/unstrip.c:238 +#: src/ar.c:294 src/nm.c:258 src/readelf.c:454 src/size.c:224 src/strip.c:209 +#: src/ld.c:962 src/elflint.c:244 src/addr2line.c:190 src/findtextrel.c:175 +#: src/elfcmp.c:560 src/ranlib.c:141 src/strings.c:232 src/unstrip.c:239 #: src/objdump.c:186 #, c-format msgid "Written by %s.\n" msgstr "" -#: src/ar.c:313 +#: src/ar.c:314 #, c-format msgid "More than one operation specified" msgstr "" -#: src/ar.c:403 +#: src/ar.c:404 #, c-format msgid "cannot open archive '%s'" msgstr "" -#: src/ar.c:413 +#: src/ar.c:414 #, c-format msgid "cannot open archive '%s': %s" msgstr "" -#: src/ar.c:417 +#: src/ar.c:418 #, c-format msgid "%s: not an archive file" msgstr "" -#: src/ar.c:421 +#: src/ar.c:422 #, c-format msgid "cannot stat archive '%s'" msgstr "" -#: src/ar.c:433 +#: src/ar.c:434 #, c-format msgid "no entry %s in archive\n" msgstr "" -#: src/ar.c:486 src/ar.c:928 src/ar.c:1128 +#: src/ar.c:487 src/ar.c:929 src/ar.c:1129 #, c-format msgid "cannot create hash table" msgstr "" -#: src/ar.c:493 src/ar.c:935 src/ar.c:1137 +#: src/ar.c:494 src/ar.c:936 src/ar.c:1138 #, c-format msgid "cannot insert into hash table" msgstr "" -#: src/ar.c:501 src/ranlib.c:176 +#: src/ar.c:502 src/ranlib.c:176 #, c-format msgid "cannot stat '%s'" msgstr "" -#: src/ar.c:597 +#: src/ar.c:598 #, c-format msgid "cannot read content of %s: %s" msgstr "" -#: src/ar.c:640 +#: src/ar.c:641 #, c-format msgid "cannot open %.*s" msgstr "" -#: src/ar.c:662 +#: src/ar.c:663 #, c-format msgid "failed to write %s" msgstr "" -#: src/ar.c:674 +#: src/ar.c:675 #, c-format msgid "cannot change mode of %s" msgstr "" -#: src/ar.c:690 +#: src/ar.c:691 #, c-format msgid "cannot change modification time of %s" msgstr "" -#: src/ar.c:736 +#: src/ar.c:737 #, c-format msgid "cannot rename temporary file to %.*s" msgstr "" -#: src/ar.c:772 src/ar.c:1020 src/ar.c:1418 src/ranlib.c:250 +#: src/ar.c:773 src/ar.c:1021 src/ar.c:1419 src/ranlib.c:250 #, c-format msgid "cannot create new file" msgstr "" -#: src/ar.c:1219 +#: src/ar.c:1220 #, c-format msgid "position member %s not found" msgstr "" -#: src/ar.c:1229 +#: src/ar.c:1230 #, c-format msgid "%s: no entry %s in archive!\n" msgstr "" -#: src/ar.c:1258 src/ldgeneric.c:519 src/objdump.c:257 +#: src/ar.c:1259 src/ldgeneric.c:519 src/objdump.c:257 #, c-format msgid "cannot open %s" msgstr "" -#: src/ar.c:1263 +#: src/ar.c:1264 #, c-format msgid "cannot stat %s" msgstr "" -#: src/ar.c:1269 +#: src/ar.c:1270 #, c-format msgid "%s is no regular file" msgstr "" -#: src/ar.c:1282 +#: src/ar.c:1283 #, c-format msgid "cannot get ELF descriptor for %s: %s\n" msgstr "" -#: src/ar.c:1301 +#: src/ar.c:1302 #, c-format msgid "cannot read %s: %s" msgstr "" @@ -718,7 +718,7 @@ msgstr "" msgid "cannot read ELF header of %s(%s): %s" msgstr "" -#: src/nm.c:74 src/strip.c:72 +#: src/nm.c:74 src/strip.c:73 msgid "Output selection:" msgstr "" @@ -780,7 +780,7 @@ msgstr "" msgid "Print size of defined symbols" msgstr "" -#: src/nm.c:98 src/size.c:80 src/strip.c:77 src/unstrip.c:80 +#: src/nm.c:98 src/size.c:80 src/strip.c:78 src/unstrip.c:81 msgid "Output options:" msgstr "" @@ -805,31 +805,31 @@ msgstr "" msgid "List symbols from FILEs (a.out by default)." msgstr "" -#: src/nm.c:111 src/size.c:92 src/strip.c:96 src/findtextrel.c:84 +#: src/nm.c:111 src/size.c:92 src/strip.c:97 src/findtextrel.c:84 #: src/strings.c:92 src/objdump.c:80 msgid "[FILE...]" msgstr "" -#: src/nm.c:136 src/size.c:117 src/strip.c:120 src/objdump.c:105 +#: src/nm.c:136 src/size.c:117 src/strip.c:121 src/objdump.c:105 #, c-format msgid "%s: INTERNAL ERROR %d (%s-%s): %s" msgstr "" -#: src/nm.c:363 src/size.c:301 src/strip.c:432 src/strip.c:467 +#: src/nm.c:363 src/size.c:301 src/strip.c:433 src/strip.c:468 #: src/ldgeneric.c:1767 src/ldgeneric.c:4257 src/findtextrel.c:229 -#: src/elfcmp.c:607 src/ranlib.c:169 src/strings.c:183 src/unstrip.c:1899 -#: src/unstrip.c:1928 +#: src/elfcmp.c:607 src/ranlib.c:169 src/strings.c:183 src/unstrip.c:1900 +#: src/unstrip.c:1929 #, c-format msgid "cannot open '%s'" msgstr "" #: src/nm.c:380 src/nm.c:392 src/size.c:317 src/size.c:326 src/size.c:337 -#: src/strip.c:1815 +#: src/strip.c:1816 #, c-format msgid "while closing '%s'" msgstr "" -#: src/nm.c:402 src/strip.c:358 src/objdump.c:296 +#: src/nm.c:402 src/strip.c:359 src/objdump.c:296 #, c-format msgid "%s: File format not recognized" msgstr "" @@ -865,12 +865,12 @@ msgstr "" msgid "cannot create search tree" msgstr "" -#: src/nm.c:740 src/nm.c:1002 src/readelf.c:883 src/readelf.c:1026 -#: src/readelf.c:1167 src/readelf.c:1349 src/readelf.c:1547 src/readelf.c:1733 -#: src/readelf.c:1943 src/readelf.c:2197 src/readelf.c:2263 src/readelf.c:2341 -#: src/readelf.c:2838 src/readelf.c:2874 src/readelf.c:2936 src/readelf.c:6508 -#: src/readelf.c:7393 src/readelf.c:7540 src/readelf.c:7610 src/size.c:425 -#: src/size.c:499 src/strip.c:482 src/objdump.c:744 +#: src/nm.c:740 src/nm.c:1002 src/readelf.c:884 src/readelf.c:1027 +#: src/readelf.c:1168 src/readelf.c:1350 src/readelf.c:1548 src/readelf.c:1734 +#: src/readelf.c:1944 src/readelf.c:2198 src/readelf.c:2264 src/readelf.c:2342 +#: src/readelf.c:2839 src/readelf.c:2875 src/readelf.c:2937 src/readelf.c:6491 +#: src/readelf.c:7376 src/readelf.c:7523 src/readelf.c:7593 src/size.c:425 +#: src/size.c:499 src/strip.c:483 src/objdump.c:744 #, c-format msgid "cannot get section header string table index" msgstr "" @@ -920,401 +920,401 @@ msgstr "" msgid "%s%s%s: no symbols" msgstr "" -#: src/readelf.c:72 +#: src/readelf.c:73 msgid "ELF output selection:" msgstr "" -#: src/readelf.c:74 +#: src/readelf.c:75 msgid "All these plus -p .strtab -p .dynstr -p .comment" msgstr "" -#: src/readelf.c:75 +#: src/readelf.c:76 msgid "Display the dynamic segment" msgstr "" -#: src/readelf.c:76 +#: src/readelf.c:77 msgid "Display the ELF file header" msgstr "" -#: src/readelf.c:78 +#: src/readelf.c:79 msgid "Display histogram of bucket list lengths" msgstr "" -#: src/readelf.c:79 +#: src/readelf.c:80 msgid "Display the program headers" msgstr "" -#: src/readelf.c:81 +#: src/readelf.c:82 msgid "Display relocations" msgstr "" -#: src/readelf.c:82 +#: src/readelf.c:83 msgid "Display the sections' headers" msgstr "" -#: src/readelf.c:84 +#: src/readelf.c:85 msgid "Display the symbol table" msgstr "" -#: src/readelf.c:85 +#: src/readelf.c:86 msgid "Display versioning information" msgstr "" -#: src/readelf.c:86 +#: src/readelf.c:87 msgid "Display the ELF notes" msgstr "" -#: src/readelf.c:88 +#: src/readelf.c:89 msgid "Display architecture specific information, if any" msgstr "" -#: src/readelf.c:90 +#: src/readelf.c:91 msgid "Display sections for exception handling" msgstr "" -#: src/readelf.c:92 +#: src/readelf.c:93 msgid "Additional output selection:" msgstr "" -#: src/readelf.c:94 +#: src/readelf.c:95 msgid "" "Display DWARF section content. SECTION can be one of abbrev, aranges, " "frame, info, loc, line, ranges, pubnames, str, macinfo, or exception" msgstr "" -#: src/readelf.c:98 +#: src/readelf.c:99 msgid "Dump the uninterpreted contents of SECTION, by number or name" msgstr "" -#: src/readelf.c:100 +#: src/readelf.c:101 msgid "Print string contents of sections" msgstr "" -#: src/readelf.c:103 +#: src/readelf.c:104 msgid "Display the symbol index of an archive" msgstr "" -#: src/readelf.c:105 +#: src/readelf.c:106 msgid "Output control:" msgstr "" -#: src/readelf.c:107 +#: src/readelf.c:108 msgid "Do not find symbol names for addresses in DWARF data" msgstr "" -#: src/readelf.c:113 +#: src/readelf.c:114 msgid "Print information from ELF file in human-readable form." msgstr "" -#: src/readelf.c:117 src/elflint.c:85 +#: src/readelf.c:118 src/elflint.c:86 msgid "FILE..." msgstr "" -#: src/readelf.c:271 src/elflint.c:158 +#: src/readelf.c:272 src/elflint.c:159 #, c-format msgid "cannot open input file" msgstr "" -#: src/readelf.c:400 +#: src/readelf.c:401 #, c-format msgid "Unknown DWARF debug section `%s'.\n" msgstr "" -#: src/readelf.c:424 src/elflint.c:222 +#: src/readelf.c:425 src/elflint.c:223 msgid "Missing file name.\n" msgstr "" -#: src/readelf.c:429 src/objdump.c:236 +#: src/readelf.c:430 src/objdump.c:236 msgid "No operation specified.\n" msgstr "" -#: src/readelf.c:464 +#: src/readelf.c:465 #, c-format msgid "cannot generate Elf descriptor: %s" msgstr "" -#: src/readelf.c:476 +#: src/readelf.c:477 #, c-format msgid "'%s' is not an archive, cannot print archive index" msgstr "" -#: src/readelf.c:481 +#: src/readelf.c:482 #, c-format msgid "error while closing Elf descriptor: %s" msgstr "" -#: src/readelf.c:573 +#: src/readelf.c:574 #, c-format msgid "cannot stat input file" msgstr "" -#: src/readelf.c:575 +#: src/readelf.c:576 #, c-format msgid "input file is empty" msgstr "" -#: src/readelf.c:577 +#: src/readelf.c:578 #, c-format msgid "failed reading '%s': %s" msgstr "" -#: src/readelf.c:612 +#: src/readelf.c:613 #, c-format msgid "cannot read ELF header: %s" msgstr "" -#: src/readelf.c:620 +#: src/readelf.c:621 #, c-format msgid "cannot create EBL handle" msgstr "" -#: src/readelf.c:627 src/strip.c:542 src/ldgeneric.c:661 src/ldgeneric.c:1122 +#: src/readelf.c:628 src/strip.c:543 src/ldgeneric.c:661 src/ldgeneric.c:1122 #, c-format msgid "cannot determine number of sections: %s" msgstr "" -#: src/readelf.c:633 +#: src/readelf.c:634 #, c-format msgid "cannot determine number of program headers: %s" msgstr "" -#: src/readelf.c:719 +#: src/readelf.c:720 msgid "NONE (None)" msgstr "" -#: src/readelf.c:720 +#: src/readelf.c:721 msgid "REL (Relocatable file)" msgstr "" -#: src/readelf.c:721 +#: src/readelf.c:722 msgid "EXEC (Executable file)" msgstr "" -#: src/readelf.c:722 +#: src/readelf.c:723 msgid "DYN (Shared object file)" msgstr "" -#: src/readelf.c:723 +#: src/readelf.c:724 msgid "CORE (Core file)" msgstr "" -#: src/readelf.c:728 +#: src/readelf.c:729 #, c-format msgid "OS Specific: (%x)\n" msgstr "" -#: src/readelf.c:730 +#: src/readelf.c:731 #, c-format msgid "Processor Specific: (%x)\n" msgstr "" -#: src/readelf.c:740 +#: src/readelf.c:741 msgid "" "ELF Header:\n" " Magic: " msgstr "" -#: src/readelf.c:744 +#: src/readelf.c:745 #, c-format msgid "" "\n" " Class: %s\n" msgstr "" -#: src/readelf.c:749 +#: src/readelf.c:750 #, c-format msgid " Data: %s\n" msgstr "" -#: src/readelf.c:755 +#: src/readelf.c:756 #, c-format msgid " Ident Version: %hhd %s\n" msgstr "" -#: src/readelf.c:757 src/readelf.c:774 +#: src/readelf.c:758 src/readelf.c:775 msgid "(current)" msgstr "" -#: src/readelf.c:761 +#: src/readelf.c:762 #, c-format msgid " OS/ABI: %s\n" msgstr "" -#: src/readelf.c:764 +#: src/readelf.c:765 #, c-format msgid " ABI Version: %hhd\n" msgstr "" -#: src/readelf.c:767 +#: src/readelf.c:768 msgid " Type: " msgstr "" -#: src/readelf.c:770 +#: src/readelf.c:771 #, c-format msgid " Machine: %s\n" msgstr "" -#: src/readelf.c:772 +#: src/readelf.c:773 #, c-format msgid " Version: %d %s\n" msgstr "" -#: src/readelf.c:776 +#: src/readelf.c:777 #, c-format msgid " Entry point address: %#<PRIx64>\n" msgstr "" -#: src/readelf.c:779 +#: src/readelf.c:780 #, c-format msgid " Start of program headers: %<PRId64> %s\n" msgstr "" -#: src/readelf.c:780 src/readelf.c:783 +#: src/readelf.c:781 src/readelf.c:784 msgid "(bytes into file)" msgstr "" -#: src/readelf.c:782 +#: src/readelf.c:783 #, c-format msgid " Start of section headers: %<PRId64> %s\n" msgstr "" -#: src/readelf.c:785 +#: src/readelf.c:786 #, c-format msgid " Flags: %s\n" msgstr "" -#: src/readelf.c:788 +#: src/readelf.c:789 #, c-format msgid " Size of this header: %<PRId16> %s\n" msgstr "" -#: src/readelf.c:789 src/readelf.c:792 src/readelf.c:809 +#: src/readelf.c:790 src/readelf.c:793 src/readelf.c:810 msgid "(bytes)" msgstr "" -#: src/readelf.c:791 +#: src/readelf.c:792 #, c-format msgid " Size of program header entries: %<PRId16> %s\n" msgstr "" -#: src/readelf.c:794 +#: src/readelf.c:795 #, c-format msgid " Number of program headers entries: %<PRId16>" msgstr "" -#: src/readelf.c:801 +#: src/readelf.c:802 #, c-format msgid " (%<PRIu32> in [0].sh_info)" msgstr "" -#: src/readelf.c:804 src/readelf.c:821 src/readelf.c:835 +#: src/readelf.c:805 src/readelf.c:822 src/readelf.c:836 msgid " ([0] not available)" msgstr "" -#: src/readelf.c:808 +#: src/readelf.c:809 #, c-format msgid " Size of section header entries: %<PRId16> %s\n" msgstr "" -#: src/readelf.c:811 +#: src/readelf.c:812 #, c-format msgid " Number of section headers entries: %<PRId16>" msgstr "" -#: src/readelf.c:818 +#: src/readelf.c:819 #, c-format msgid " (%<PRIu32> in [0].sh_size)" msgstr "" -#: src/readelf.c:831 +#: src/readelf.c:832 #, c-format msgid " (%<PRIu32> in [0].sh_link)" msgstr "" -#: src/readelf.c:839 +#: src/readelf.c:840 #, c-format msgid "" " Section header string table index: XINDEX%s\n" "\n" msgstr "" -#: src/readelf.c:843 +#: src/readelf.c:844 #, c-format msgid "" " Section header string table index: %<PRId16>\n" "\n" msgstr "" -#: src/readelf.c:875 +#: src/readelf.c:876 #, c-format msgid "" "There are %d section headers, starting at offset %#<PRIx64>:\n" "\n" msgstr "" -#: src/readelf.c:885 +#: src/readelf.c:886 msgid "Section Headers:" msgstr "" -#: src/readelf.c:888 +#: src/readelf.c:889 msgid "" "[Nr] Name Type Addr Off Size ES Flags Lk " "Inf Al" msgstr "" -#: src/readelf.c:890 +#: src/readelf.c:891 msgid "" "[Nr] Name Type Addr Off Size ES " "Flags Lk Inf Al" msgstr "" -#: src/readelf.c:897 src/readelf.c:1050 +#: src/readelf.c:898 src/readelf.c:1051 #, c-format msgid "cannot get section: %s" msgstr "" -#: src/readelf.c:904 src/readelf.c:1058 src/readelf.c:7560 src/unstrip.c:352 -#: src/unstrip.c:376 src/unstrip.c:426 src/unstrip.c:535 src/unstrip.c:552 -#: src/unstrip.c:590 src/unstrip.c:788 src/unstrip.c:1056 src/unstrip.c:1243 -#: src/unstrip.c:1304 src/unstrip.c:1426 src/unstrip.c:1479 src/unstrip.c:1587 -#: src/unstrip.c:1777 +#: src/readelf.c:905 src/readelf.c:1059 src/readelf.c:7543 src/unstrip.c:353 +#: src/unstrip.c:377 src/unstrip.c:427 src/unstrip.c:536 src/unstrip.c:553 +#: src/unstrip.c:591 src/unstrip.c:789 src/unstrip.c:1057 src/unstrip.c:1244 +#: src/unstrip.c:1305 src/unstrip.c:1427 src/unstrip.c:1480 src/unstrip.c:1588 +#: src/unstrip.c:1778 #, c-format msgid "cannot get section header: %s" msgstr "" -#: src/readelf.c:962 +#: src/readelf.c:963 msgid "Program Headers:" msgstr "" -#: src/readelf.c:964 +#: src/readelf.c:965 msgid "" " Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align" msgstr "" -#: src/readelf.c:967 +#: src/readelf.c:968 msgid "" " Type Offset VirtAddr PhysAddr FileSiz " "MemSiz Flg Align" msgstr "" -#: src/readelf.c:1007 +#: src/readelf.c:1008 #, c-format msgid "\t[Requesting program interpreter: %s]\n" msgstr "" -#: src/readelf.c:1028 +#: src/readelf.c:1029 msgid "" "\n" " Section to Segment mapping:\n" " Segment Sections..." msgstr "" -#: src/readelf.c:1039 src/unstrip.c:1823 src/unstrip.c:1862 src/unstrip.c:1869 +#: src/readelf.c:1040 src/unstrip.c:1824 src/unstrip.c:1863 src/unstrip.c:1870 #, c-format msgid "cannot get program header: %s" msgstr "" -#: src/readelf.c:1173 +#: src/readelf.c:1174 #, c-format msgid "" "\n" @@ -1325,7 +1325,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:1178 +#: src/readelf.c:1179 #, c-format msgid "" "\n" @@ -1336,15 +1336,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:1186 +#: src/readelf.c:1187 msgid "<INVALID SYMBOL>" msgstr "" -#: src/readelf.c:1200 +#: src/readelf.c:1201 msgid "<INVALID SECTION>" msgstr "" -#: src/readelf.c:1351 +#: src/readelf.c:1352 #, c-format msgid "" "\n" @@ -1357,43 +1357,43 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:1363 +#: src/readelf.c:1364 msgid " Type Value\n" msgstr "" -#: src/readelf.c:1387 +#: src/readelf.c:1388 #, c-format msgid "Shared library: [%s]\n" msgstr "" -#: src/readelf.c:1392 +#: src/readelf.c:1393 #, c-format msgid "Library soname: [%s]\n" msgstr "" -#: src/readelf.c:1397 +#: src/readelf.c:1398 #, c-format msgid "Library rpath: [%s]\n" msgstr "" -#: src/readelf.c:1402 +#: src/readelf.c:1403 #, c-format msgid "Library runpath: [%s]\n" msgstr "" -#: src/readelf.c:1422 +#: src/readelf.c:1423 #, c-format msgid "%<PRId64> (bytes)\n" msgstr "" -#: src/readelf.c:1532 src/readelf.c:1718 +#: src/readelf.c:1533 src/readelf.c:1719 #, c-format msgid "" "\n" "Invalid symbol table at offset %#0<PRIx64>\n" msgstr "" -#: src/readelf.c:1550 src/readelf.c:1735 +#: src/readelf.c:1551 src/readelf.c:1736 #, c-format msgid "" "\n" @@ -1406,7 +1406,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:1565 +#: src/readelf.c:1566 #, c-format msgid "" "\n" @@ -1417,37 +1417,37 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:1575 +#: src/readelf.c:1576 msgid " Offset Type Value Name\n" msgstr "" -#: src/readelf.c:1577 +#: src/readelf.c:1578 msgid " Offset Type Value Name\n" msgstr "" -#: src/readelf.c:1630 src/readelf.c:1641 src/readelf.c:1654 src/readelf.c:1672 -#: src/readelf.c:1684 src/readelf.c:1803 src/readelf.c:1815 src/readelf.c:1829 -#: src/readelf.c:1848 src/readelf.c:1861 +#: src/readelf.c:1631 src/readelf.c:1642 src/readelf.c:1655 src/readelf.c:1673 +#: src/readelf.c:1685 src/readelf.c:1804 src/readelf.c:1816 src/readelf.c:1830 +#: src/readelf.c:1849 src/readelf.c:1862 msgid "<INVALID RELOC>" msgstr "" -#: src/readelf.c:1642 src/readelf.c:1816 src/objdump.c:379 +#: src/readelf.c:1643 src/readelf.c:1817 src/objdump.c:379 msgid "INVALID SYMBOL" msgstr "" -#: src/readelf.c:1673 src/readelf.c:1849 src/objdump.c:394 +#: src/readelf.c:1674 src/readelf.c:1850 src/objdump.c:394 msgid "INVALID SECTION" msgstr "" -#: src/readelf.c:1747 +#: src/readelf.c:1748 msgid " Offset Type Value Addend Name\n" msgstr "" -#: src/readelf.c:1749 +#: src/readelf.c:1750 msgid " Offset Type Value Addend Name\n" msgstr "" -#: src/readelf.c:1950 +#: src/readelf.c:1951 #, c-format msgid "" "\n" @@ -1458,40 +1458,40 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:1956 +#: src/readelf.c:1957 #, c-format msgid " %lu local symbol String table: [%2u] '%s'\n" msgid_plural " %lu local symbols String table: [%2u] '%s'\n" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:1966 +#: src/readelf.c:1967 msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: src/readelf.c:1968 +#: src/readelf.c:1969 msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: src/readelf.c:1988 +#: src/readelf.c:1989 #, c-format msgid "%5u: %0*<PRIx64> %6<PRId64> %-7s %-6s %-9s %6s %s" msgstr "" -#: src/readelf.c:2076 +#: src/readelf.c:2077 #, c-format msgid "bad dynamic symbol" msgstr "" -#: src/readelf.c:2158 +#: src/readelf.c:2159 msgid "none" msgstr "" -#: src/readelf.c:2175 +#: src/readelf.c:2176 msgid "| <unknown>" msgstr "" -#: src/readelf.c:2200 +#: src/readelf.c:2201 #, c-format msgid "" "\n" @@ -1504,17 +1504,17 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:2223 +#: src/readelf.c:2224 #, c-format msgid " %#06x: Version: %hu File: %s Cnt: %hu\n" msgstr "" -#: src/readelf.c:2236 +#: src/readelf.c:2237 #, c-format msgid " %#06x: Name: %s Flags: %s Version: %hu\n" msgstr "" -#: src/readelf.c:2267 +#: src/readelf.c:2268 #, c-format msgid "" "\n" @@ -1527,17 +1527,17 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:2297 +#: src/readelf.c:2298 #, c-format msgid " %#06x: Version: %hd Flags: %s Index: %hd Cnt: %hd Name: %s\n" msgstr "" -#: src/readelf.c:2312 +#: src/readelf.c:2313 #, c-format msgid " %#06x: Parent %d: %s\n" msgstr "" -#: src/readelf.c:2544 +#: src/readelf.c:2545 #, c-format msgid "" "\n" @@ -1550,15 +1550,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:2574 +#: src/readelf.c:2575 msgid " 0 *local* " msgstr "" -#: src/readelf.c:2579 +#: src/readelf.c:2580 msgid " 1 *global* " msgstr "" -#: src/readelf.c:2610 +#: src/readelf.c:2611 #, c-format msgid "" "\n" @@ -1573,41 +1573,41 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:2633 +#: src/readelf.c:2634 #, c-format msgid " Length Number % of total Coverage\n" msgstr "" -#: src/readelf.c:2635 +#: src/readelf.c:2636 #, c-format msgid " 0 %6<PRIu32> %5.1f%%\n" msgstr "" -#: src/readelf.c:2642 +#: src/readelf.c:2643 #, c-format msgid "%7d %6<PRIu32> %5.1f%% %5.1f%%\n" msgstr "" -#: src/readelf.c:2655 +#: src/readelf.c:2656 #, c-format msgid "" " Average number of tests: successful lookup: %f\n" " unsuccessful lookup: %f\n" msgstr "" -#: src/readelf.c:2673 src/readelf.c:2715 src/readelf.c:2756 +#: src/readelf.c:2674 src/readelf.c:2716 src/readelf.c:2757 #, c-format msgid "cannot get data for section %d: %s" msgstr "" -#: src/readelf.c:2810 +#: src/readelf.c:2811 #, c-format msgid "" " Symbol Bias: %u\n" " Bitmask Size: %zu bytes %<PRIuFAST32>%% bits set 2nd hash shift: %u\n" msgstr "" -#: src/readelf.c:2884 +#: src/readelf.c:2885 #, c-format msgid "" "\n" @@ -1618,13 +1618,13 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:2898 +#: src/readelf.c:2899 msgid "" " Library Time Stamp Checksum Version " "Flags" msgstr "" -#: src/readelf.c:2948 +#: src/readelf.c:2949 #, c-format msgid "" "\n" @@ -1632,140 +1632,140 @@ msgid "" "#0<PRIx64>:\n" msgstr "" -#: src/readelf.c:2964 +#: src/readelf.c:2965 msgid " Owner Size\n" msgstr "" -#: src/readelf.c:2990 +#: src/readelf.c:2991 #, c-format msgid " %-13s %4<PRIu32>\n" msgstr "" -#: src/readelf.c:3022 +#: src/readelf.c:3023 #, c-format msgid " %-4u %12<PRIu32>\n" msgstr "" -#: src/readelf.c:3027 +#: src/readelf.c:3028 #, c-format msgid " File: %11<PRIu32>\n" msgstr "" -#: src/readelf.c:3062 +#: src/readelf.c:3063 #, c-format msgid " %s: %<PRId64>, %s\n" msgstr "" -#: src/readelf.c:3065 +#: src/readelf.c:3066 #, c-format msgid " %s: %<PRId64>\n" msgstr "" -#: src/readelf.c:3068 +#: src/readelf.c:3069 #, c-format msgid " %s: %s\n" msgstr "" -#: src/readelf.c:3075 +#: src/readelf.c:3076 #, c-format msgid " %u: %<PRId64>\n" msgstr "" -#: src/readelf.c:3078 +#: src/readelf.c:3079 #, c-format msgid " %u: %s\n" msgstr "" -#: src/readelf.c:3114 +#: src/readelf.c:3115 #, c-format msgid "%s+%#<PRIx64> <%s+%#<PRIx64>>" msgstr "" -#: src/readelf.c:3117 +#: src/readelf.c:3118 #, c-format msgid "%s+%#0*<PRIx64> <%s+%#<PRIx64>>" msgstr "" -#: src/readelf.c:3122 +#: src/readelf.c:3123 #, c-format msgid "%#<PRIx64> <%s+%#<PRIx64>>" msgstr "" -#: src/readelf.c:3125 +#: src/readelf.c:3126 #, c-format msgid "%#0*<PRIx64> <%s+%#<PRIx64>>" msgstr "" -#: src/readelf.c:3131 +#: src/readelf.c:3132 #, c-format msgid "%s+%#<PRIx64> <%s>" msgstr "" -#: src/readelf.c:3134 +#: src/readelf.c:3135 #, c-format msgid "%s+%#0*<PRIx64> <%s>" msgstr "" -#: src/readelf.c:3138 +#: src/readelf.c:3139 #, c-format msgid "%#<PRIx64> <%s>" msgstr "" -#: src/readelf.c:3141 +#: src/readelf.c:3142 #, c-format msgid "%#0*<PRIx64> <%s>" msgstr "" -#: src/readelf.c:3146 +#: src/readelf.c:3147 #, c-format msgid "%s+%#<PRIx64>" msgstr "" -#: src/readelf.c:3149 +#: src/readelf.c:3150 #, c-format msgid "%s+%#0*<PRIx64>" msgstr "" -#: src/readelf.c:3257 +#: src/readelf.c:3258 #, c-format msgid "unknown tag %hx" msgstr "" -#: src/readelf.c:3259 +#: src/readelf.c:3260 #, c-format msgid "unknown user tag %hx" msgstr "" -#: src/readelf.c:3477 +#: src/readelf.c:3478 #, c-format msgid "unknown attribute %hx" msgstr "" -#: src/readelf.c:3480 +#: src/readelf.c:3481 #, c-format msgid "unknown user attribute %hx" msgstr "" -#: src/readelf.c:3526 +#: src/readelf.c:3527 #, c-format msgid "unknown form %<PRIx64>" msgstr "" -#: src/readelf.c:3760 +#: src/readelf.c:3761 msgid "empty block" msgstr "" -#: src/readelf.c:3763 +#: src/readelf.c:3764 #, c-format msgid "%zu byte block:" msgstr "" -#: src/readelf.c:4172 +#: src/readelf.c:4173 #, c-format msgid "%*s[%4<PRIuMAX>] %s <TRUNCATED>\n" msgstr "" -#: src/readelf.c:4185 +#: src/readelf.c:4186 #, c-format msgid "" "\n" @@ -1773,37 +1773,37 @@ msgid "" " [ Code]\n" msgstr "" -#: src/readelf.c:4192 +#: src/readelf.c:4193 #, c-format msgid "" "\n" "Abbreviation section at offset %<PRIu64>:\n" msgstr "" -#: src/readelf.c:4205 +#: src/readelf.c:4206 #, c-format msgid " *** error while reading abbreviation: %s\n" msgstr "" -#: src/readelf.c:4221 +#: src/readelf.c:4222 #, c-format msgid " [%5u] offset: %<PRId64>, children: %s, tag: %s\n" msgstr "" -#: src/readelf.c:4224 +#: src/readelf.c:4225 msgid "yes" msgstr "" -#: src/readelf.c:4224 +#: src/readelf.c:4225 msgid "no" msgstr "" -#: src/readelf.c:4260 +#: src/readelf.c:4261 #, c-format msgid "cannot get .debug_aranges content: %s" msgstr "" -#: src/readelf.c:4265 +#: src/readelf.c:4266 #, c-format msgid "" "\n" @@ -1814,118 +1814,118 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:4295 +#: src/readelf.c:4296 #, c-format msgid " [%*zu] ???\n" msgstr "" -#: src/readelf.c:4297 +#: src/readelf.c:4298 #, c-format msgid "" " [%*zu] start: %0#*<PRIx64>, length: %5<PRIu64>, CU DIE offset: %6<PRId64>\n" msgstr "" -#: src/readelf.c:4316 +#: src/readelf.c:4317 #, c-format msgid "cannot get .debug_ranges content: %s" msgstr "" -#: src/readelf.c:4321 src/readelf.c:4804 src/readelf.c:5467 src/readelf.c:5912 -#: src/readelf.c:6007 src/readelf.c:6179 +#: src/readelf.c:4322 src/readelf.c:4808 src/readelf.c:5450 src/readelf.c:5895 +#: src/readelf.c:5990 src/readelf.c:6162 #, c-format msgid "" "\n" "DWARF section [%2zu] '%s' at offset %#<PRIx64>:\n" msgstr "" -#: src/readelf.c:4335 src/readelf.c:5926 +#: src/readelf.c:4336 src/readelf.c:5909 #, c-format msgid " [%6tx] <INVALID DATA>\n" msgstr "" -#: src/readelf.c:4357 src/readelf.c:5948 +#: src/readelf.c:4358 src/readelf.c:5931 #, c-format msgid " [%6tx] base address %s\n" msgstr "" -#: src/readelf.c:4368 +#: src/readelf.c:4369 #, c-format msgid " [%6tx] %s..%s\n" msgstr "" -#: src/readelf.c:4370 +#: src/readelf.c:4371 #, c-format msgid " %s..%s\n" msgstr "" -#: src/readelf.c:4793 src/readelf.c:6245 src/readelf.c:6347 +#: src/readelf.c:4797 src/readelf.c:6228 src/readelf.c:6330 #, c-format msgid "cannot get %s content: %s" msgstr "" -#: src/readelf.c:4800 +#: src/readelf.c:4804 #, c-format msgid "" "\n" "Call frame information section [%2zu] '%s' at offset %#<PRIx64>:\n" msgstr "" -#: src/readelf.c:4827 src/readelf.c:5501 +#: src/readelf.c:4831 src/readelf.c:5484 #, c-format msgid "invalid data in section [%zu] '%s'" msgstr "" -#: src/readelf.c:4849 +#: src/readelf.c:4853 #, c-format msgid "" "\n" " [%6tx] Zero terminator\n" msgstr "" -#: src/readelf.c:4927 -msgid "FDE address encoding: " +#: src/readelf.c:4922 +#, c-format +msgid "invalid augmentation length" msgstr "" -#: src/readelf.c:4933 -msgid "LSDA pointer encoding: " +#: src/readelf.c:4934 +msgid "FDE address encoding: " msgstr "" -#: src/readelf.c:4978 -#, c-format -msgid "invalid augmentation encoding" +#: src/readelf.c:4940 +msgid "LSDA pointer encoding: " msgstr "" -#: src/readelf.c:5049 +#: src/readelf.c:5032 #, c-format msgid " (offset: %#<PRIx64>)" msgstr "" -#: src/readelf.c:5056 +#: src/readelf.c:5039 #, c-format msgid " (end offset: %#<PRIx64>)" msgstr "" -#: src/readelf.c:5083 +#: src/readelf.c:5066 #, c-format msgid " %-26sLSDA pointer: %#<PRIx64>\n" msgstr "" -#: src/readelf.c:5129 +#: src/readelf.c:5112 #, c-format msgid "cannot get attribute code: %s" msgstr "" -#: src/readelf.c:5137 +#: src/readelf.c:5120 #, c-format msgid "cannot get attribute form: %s" msgstr "" -#: src/readelf.c:5150 +#: src/readelf.c:5133 #, c-format msgid "cannot get attribute value: %s" msgstr "" -#: src/readelf.c:5346 +#: src/readelf.c:5329 #, c-format msgid "" "\n" @@ -1933,7 +1933,7 @@ msgid "" " [Offset]\n" msgstr "" -#: src/readelf.c:5371 +#: src/readelf.c:5354 #, c-format msgid "" " Compilation unit at offset %<PRIu64>:\n" @@ -1941,44 +1941,44 @@ msgid "" "<PRIu8>, Offset size: %<PRIu8>\n" msgstr "" -#: src/readelf.c:5389 +#: src/readelf.c:5372 #, c-format msgid "cannot get DIE at offset %<PRIu64> in section '%s': %s" msgstr "" -#: src/readelf.c:5400 +#: src/readelf.c:5383 #, c-format msgid "cannot get DIE offset: %s" msgstr "" -#: src/readelf.c:5408 +#: src/readelf.c:5391 #, c-format msgid "cannot get tag of DIE at offset %<PRIu64> in section '%s': %s" msgstr "" -#: src/readelf.c:5437 +#: src/readelf.c:5420 #, c-format msgid "cannot get next DIE: %s\n" msgstr "" -#: src/readelf.c:5444 +#: src/readelf.c:5427 #, c-format msgid "cannot get next DIE: %s" msgstr "" -#: src/readelf.c:5479 +#: src/readelf.c:5462 #, c-format msgid "cannot get line data section data: %s" msgstr "" -#: src/readelf.c:5492 +#: src/readelf.c:5475 #, c-format msgid "" "\n" "Table at offset %Zu:\n" msgstr "" -#: src/readelf.c:5544 +#: src/readelf.c:5527 #, c-format msgid "" "\n" @@ -1994,154 +1994,154 @@ msgid "" "Opcodes:\n" msgstr "" -#: src/readelf.c:5563 +#: src/readelf.c:5546 #, c-format msgid "invalid data at offset %tu in section [%zu] '%s'" msgstr "" -#: src/readelf.c:5578 +#: src/readelf.c:5561 #, c-format msgid " [%*<PRIuFAST8>] %hhu argument\n" msgid_plural " [%*<PRIuFAST8>] %hhu arguments\n" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:5586 +#: src/readelf.c:5569 msgid "" "\n" "Directory table:" msgstr "" -#: src/readelf.c:5602 +#: src/readelf.c:5585 msgid "" "\n" "File name table:\n" " Entry Dir Time Size Name" msgstr "" -#: src/readelf.c:5631 +#: src/readelf.c:5614 msgid "" "\n" "Line number statements:" msgstr "" -#: src/readelf.c:5692 +#: src/readelf.c:5675 #, c-format msgid " special opcode %u: address+%u = %s, line%+d = %zu\n" msgstr "" -#: src/readelf.c:5712 +#: src/readelf.c:5695 #, c-format msgid " extended opcode %u: " msgstr "" -#: src/readelf.c:5717 +#: src/readelf.c:5700 msgid "end of sequence" msgstr "" -#: src/readelf.c:5732 +#: src/readelf.c:5715 #, c-format msgid "set address to %s\n" msgstr "" -#: src/readelf.c:5753 +#: src/readelf.c:5736 #, c-format msgid "define new file: dir=%u, mtime=%<PRIu64>, length=%<PRIu64>, name=%s\n" msgstr "" -#: src/readelf.c:5762 +#: src/readelf.c:5745 msgid "unknown opcode" msgstr "" -#: src/readelf.c:5774 +#: src/readelf.c:5757 msgid " copy" msgstr "" -#: src/readelf.c:5784 +#: src/readelf.c:5767 #, c-format msgid "advance address by %u to %s\n" msgstr "" -#: src/readelf.c:5795 +#: src/readelf.c:5778 #, c-format msgid " advance line by constant %d to %<PRId64>\n" msgstr "" -#: src/readelf.c:5803 +#: src/readelf.c:5786 #, c-format msgid " set file to %<PRIu64>\n" msgstr "" -#: src/readelf.c:5813 +#: src/readelf.c:5796 #, c-format msgid " set column to %<PRIu64>\n" msgstr "" -#: src/readelf.c:5820 +#: src/readelf.c:5803 #, c-format msgid " set '%s' to %<PRIuFAST8>\n" msgstr "" -#: src/readelf.c:5826 +#: src/readelf.c:5809 msgid " set basic block flag" msgstr "" -#: src/readelf.c:5836 +#: src/readelf.c:5819 #, c-format msgid "advance address by constant %u to %s\n" msgstr "" -#: src/readelf.c:5852 +#: src/readelf.c:5835 #, c-format msgid "advance address by fixed value %u to %s\n" msgstr "" -#: src/readelf.c:5861 +#: src/readelf.c:5844 msgid " set prologue end flag" msgstr "" -#: src/readelf.c:5866 +#: src/readelf.c:5849 msgid " set epilogue begin flag" msgstr "" -#: src/readelf.c:5875 +#: src/readelf.c:5858 #, c-format msgid " unknown opcode with %<PRIu8> parameter:" msgid_plural " unknown opcode with %<PRIu8> parameters:" msgstr[0] "" msgstr[1] "" -#: src/readelf.c:5907 +#: src/readelf.c:5890 #, c-format msgid "cannot get .debug_loc content: %s" msgstr "" -#: src/readelf.c:5962 +#: src/readelf.c:5945 #, c-format msgid " [%6tx] %s..%s" msgstr "" -#: src/readelf.c:5964 +#: src/readelf.c:5947 #, c-format msgid " %s..%s" msgstr "" -#: src/readelf.c:6017 +#: src/readelf.c:6000 #, c-format msgid "cannot get macro information section data: %s" msgstr "" -#: src/readelf.c:6096 +#: src/readelf.c:6079 #, c-format msgid "%*s*** non-terminated string at end of section" msgstr "" -#: src/readelf.c:6164 +#: src/readelf.c:6147 #, c-format msgid " [%5d] DIE offset: %6<PRId64>, CU DIE offset: %6<PRId64>, name: %s\n" msgstr "" -#: src/readelf.c:6203 +#: src/readelf.c:6186 #, c-format msgid "" "\n" @@ -2149,47 +2149,47 @@ msgid "" " %*s String\n" msgstr "" -#: src/readelf.c:6217 +#: src/readelf.c:6200 #, c-format msgid " *** error while reading strings: %s\n" msgstr "" -#: src/readelf.c:6237 +#: src/readelf.c:6220 #, c-format msgid "" "\n" "Call frame search table section [%2zu] '.eh_frame_hdr':\n" msgstr "" -#: src/readelf.c:6339 +#: src/readelf.c:6322 #, c-format msgid "" "\n" "Exception handling table section [%2zu] '.gcc_except_table':\n" msgstr "" -#: src/readelf.c:6362 +#: src/readelf.c:6345 #, c-format msgid " LPStart encoding: %#x " msgstr "" -#: src/readelf.c:6374 +#: src/readelf.c:6357 #, c-format msgid " TType encoding: %#x " msgstr "" -#: src/readelf.c:6388 +#: src/readelf.c:6371 #, c-format msgid " Call site encoding: %#x " msgstr "" -#: src/readelf.c:6401 +#: src/readelf.c:6384 msgid "" "\n" " Call site table:" msgstr "" -#: src/readelf.c:6415 +#: src/readelf.c:6398 #, c-format msgid "" " [%4u] Call site start: %#<PRIx64>\n" @@ -2198,128 +2198,128 @@ msgid "" " Action: %u\n" msgstr "" -#: src/readelf.c:6475 +#: src/readelf.c:6458 #, c-format msgid "invalid TType encoding" msgstr "" -#: src/readelf.c:6499 +#: src/readelf.c:6482 #, c-format msgid "cannot get debug context descriptor: %s" msgstr "" -#: src/readelf.c:6635 src/readelf.c:7227 +#: src/readelf.c:6618 src/readelf.c:7210 #, c-format msgid "cannot convert core note data: %s" msgstr "" -#: src/readelf.c:6967 +#: src/readelf.c:6950 #, c-format msgid "" "\n" "%*s... <repeats %u more times> ..." msgstr "" -#: src/readelf.c:7326 +#: src/readelf.c:7309 msgid " Owner Data size Type\n" msgstr "" -#: src/readelf.c:7344 +#: src/readelf.c:7327 #, c-format msgid " %-13.*s %9<PRId32> %s\n" msgstr "" -#: src/readelf.c:7378 +#: src/readelf.c:7361 #, c-format msgid "cannot get content of note section: %s" msgstr "" -#: src/readelf.c:7405 +#: src/readelf.c:7388 #, c-format msgid "" "\n" "Note section [%2zu] '%s' of %<PRIu64> bytes at offset %#0<PRIx64>:\n" msgstr "" -#: src/readelf.c:7428 +#: src/readelf.c:7411 #, c-format msgid "" "\n" "Note segment of %<PRIu64> bytes at offset %#0<PRIx64>:\n" msgstr "" -#: src/readelf.c:7474 +#: src/readelf.c:7457 #, c-format msgid "" "\n" "Section [%Zu] '%s' has no data to dump.\n" msgstr "" -#: src/readelf.c:7480 src/readelf.c:7503 +#: src/readelf.c:7463 src/readelf.c:7486 #, c-format msgid "cannot get data for section [%Zu] '%s': %s" msgstr "" -#: src/readelf.c:7484 +#: src/readelf.c:7467 #, c-format msgid "" "\n" "Hex dump of section [%Zu] '%s', %<PRIu64> bytes at offset %#0<PRIx64>:\n" msgstr "" -#: src/readelf.c:7497 +#: src/readelf.c:7480 #, c-format msgid "" "\n" "Section [%Zu] '%s' has no strings to dump.\n" msgstr "" -#: src/readelf.c:7507 +#: src/readelf.c:7490 #, c-format msgid "" "\n" "String section [%Zu] '%s' contains %<PRIu64> bytes at offset %#0<PRIx64>:\n" msgstr "" -#: src/readelf.c:7555 +#: src/readelf.c:7538 #, c-format msgid "" "\n" "section [%lu] does not exist" msgstr "" -#: src/readelf.c:7582 +#: src/readelf.c:7565 #, c-format msgid "" "\n" "section '%s' does not exist" msgstr "" -#: src/readelf.c:7643 +#: src/readelf.c:7626 #, c-format msgid "cannot get symbol index of archive '%s': %s" msgstr "" -#: src/readelf.c:7646 +#: src/readelf.c:7629 #, c-format msgid "" "\n" "Archive '%s' has no symbol index\n" msgstr "" -#: src/readelf.c:7650 +#: src/readelf.c:7633 #, c-format msgid "" "\n" "Index of archive '%s' has %Zu entries:\n" msgstr "" -#: src/readelf.c:7668 +#: src/readelf.c:7651 #, c-format msgid "cannot extract member at offset %Zu in '%s': %s" msgstr "" -#: src/readelf.c:7673 +#: src/readelf.c:7656 #, c-format msgid "Archive member '%s' contains:\n" msgstr "" @@ -2390,149 +2390,149 @@ msgstr "" msgid "(TOTALS)\n" msgstr "" -#: src/strip.c:73 +#: src/strip.c:74 msgid "Place stripped output into FILE" msgstr "" -#: src/strip.c:74 +#: src/strip.c:75 msgid "Extract the removed sections into FILE" msgstr "" -#: src/strip.c:75 +#: src/strip.c:76 msgid "Embed name FILE instead of -f argument" msgstr "" -#: src/strip.c:79 +#: src/strip.c:80 msgid "Remove all debugging symbols" msgstr "" -#: src/strip.c:83 +#: src/strip.c:84 msgid "Copy modified/access timestamps to the output" msgstr "" -#: src/strip.c:85 +#: src/strip.c:86 msgid "Remove .comment section" msgstr "" -#: src/strip.c:88 +#: src/strip.c:89 msgid "Relax a few rules to handle slightly broken ELF files" msgstr "" -#: src/strip.c:93 +#: src/strip.c:94 msgid "Discard symbols from object files." msgstr "" -#: src/strip.c:185 +#: src/strip.c:186 #, c-format msgid "Only one input file allowed together with '-o' and '-f'" msgstr "" -#: src/strip.c:221 +#: src/strip.c:222 #, c-format msgid "-f option specified twice" msgstr "" -#: src/strip.c:230 +#: src/strip.c:231 #, c-format msgid "-F option specified twice" msgstr "" -#: src/strip.c:239 src/unstrip.c:124 +#: src/strip.c:240 src/unstrip.c:125 #, c-format msgid "-o option specified twice" msgstr "" -#: src/strip.c:259 +#: src/strip.c:260 #, c-format msgid "-R option supports only .comment section" msgstr "" -#: src/strip.c:297 src/strip.c:321 +#: src/strip.c:298 src/strip.c:322 #, c-format msgid "cannot stat input file '%s'" msgstr "" -#: src/strip.c:311 +#: src/strip.c:312 #, c-format msgid "while opening '%s'" msgstr "" -#: src/strip.c:349 +#: src/strip.c:350 #, c-format msgid "%s: cannot use -o or -f when stripping archive" msgstr "" -#: src/strip.c:447 +#: src/strip.c:448 #, c-format msgid "cannot open EBL backend" msgstr "" -#: src/strip.c:497 src/strip.c:521 +#: src/strip.c:498 src/strip.c:522 #, c-format msgid "cannot create new file '%s': %s" msgstr "" -#: src/strip.c:581 +#: src/strip.c:582 #, c-format msgid "illformed file '%s'" msgstr "" -#: src/strip.c:868 src/strip.c:955 +#: src/strip.c:869 src/strip.c:956 #, c-format msgid "while generating output file: %s" msgstr "" -#: src/strip.c:928 src/strip.c:1667 +#: src/strip.c:929 src/strip.c:1668 #, c-format msgid "%s: error while creating ELF header: %s" msgstr "" -#: src/strip.c:942 +#: src/strip.c:943 #, c-format msgid "while preparing output for '%s'" msgstr "" -#: src/strip.c:993 src/strip.c:1049 +#: src/strip.c:994 src/strip.c:1050 #, c-format msgid "while create section header section: %s" msgstr "" -#: src/strip.c:999 +#: src/strip.c:1000 #, c-format msgid "cannot allocate section data: %s" msgstr "" -#: src/strip.c:1058 +#: src/strip.c:1059 #, c-format msgid "while create section header string table: %s" msgstr "" -#: src/strip.c:1592 src/strip.c:1689 +#: src/strip.c:1593 src/strip.c:1690 #, c-format msgid "while writing '%s': %s" msgstr "" -#: src/strip.c:1603 +#: src/strip.c:1604 #, c-format msgid "while creating '%s'" msgstr "" -#: src/strip.c:1615 +#: src/strip.c:1616 #, c-format msgid "while computing checksum for debug information" msgstr "" -#: src/strip.c:1675 +#: src/strip.c:1676 #, c-format msgid "%s: error while reading the file: %s" msgstr "" -#: src/strip.c:1721 src/strip.c:1728 +#: src/strip.c:1722 src/strip.c:1729 #, c-format msgid "error while finishing '%s': %s" msgstr "" -#: src/strip.c:1751 src/strip.c:1808 +#: src/strip.c:1752 src/strip.c:1809 #, c-format msgid "cannot set access and modification date of '%s'" msgstr "" @@ -3139,7 +3139,7 @@ msgstr "" msgid "cannot get header of 0th section: %s" msgstr "" -#: src/ldgeneric.c:6941 src/unstrip.c:1807 +#: src/ldgeneric.c:6941 src/unstrip.c:1808 #, c-format msgid "cannot update ELF header: %s" msgstr "" @@ -3230,1605 +3230,1605 @@ msgstr "" msgid "default visibility set as local and global" msgstr "" -#: src/elflint.c:71 +#: src/elflint.c:72 msgid "Be extremely strict, flag level 2 features." msgstr "" -#: src/elflint.c:72 +#: src/elflint.c:73 msgid "Do not print anything if successful" msgstr "" -#: src/elflint.c:73 +#: src/elflint.c:74 msgid "Binary is a separate debuginfo file" msgstr "" -#: src/elflint.c:75 +#: src/elflint.c:76 msgid "" "Binary has been created with GNU ld and is therefore known to be broken in " "certain ways" msgstr "" -#: src/elflint.c:81 +#: src/elflint.c:82 msgid "Pedantic checking of ELF files compliance with gABI/psABI spec." msgstr "" -#: src/elflint.c:165 +#: src/elflint.c:166 #, c-format msgid "cannot generate Elf descriptor: %s\n" msgstr "" -#: src/elflint.c:184 +#: src/elflint.c:185 #, c-format msgid "error while closing Elf descriptor: %s\n" msgstr "" -#: src/elflint.c:188 +#: src/elflint.c:189 msgid "No errors" msgstr "" -#: src/elflint.c:301 +#: src/elflint.c:302 #, c-format msgid " error while freeing sub-ELF descriptor: %s\n" msgstr "" -#: src/elflint.c:309 +#: src/elflint.c:310 #, c-format msgid "Not an ELF file - it has the wrong magic bytes at the start\n" msgstr "" -#: src/elflint.c:369 +#: src/elflint.c:370 #, c-format msgid "e_ident[%d] == %d is no known class\n" msgstr "" -#: src/elflint.c:374 +#: src/elflint.c:375 #, c-format msgid "e_ident[%d] == %d is no known data encoding\n" msgstr "" -#: src/elflint.c:378 +#: src/elflint.c:379 #, c-format msgid "unknown ELF header version number e_ident[%d] == %d\n" msgstr "" -#: src/elflint.c:384 +#: src/elflint.c:385 #, c-format msgid "unsupported OS ABI e_ident[%d] == '%s'\n" msgstr "" -#: src/elflint.c:390 +#: src/elflint.c:391 #, c-format msgid "unsupport ABI version e_ident[%d] == %d\n" msgstr "" -#: src/elflint.c:395 +#: src/elflint.c:396 #, c-format msgid "e_ident[%zu] is not zero\n" msgstr "" -#: src/elflint.c:400 +#: src/elflint.c:401 #, c-format msgid "unknown object file type %d\n" msgstr "" -#: src/elflint.c:407 +#: src/elflint.c:408 #, c-format msgid "unknown machine type %d\n" msgstr "" -#: src/elflint.c:411 +#: src/elflint.c:412 #, c-format msgid "unknown object file version\n" msgstr "" -#: src/elflint.c:417 +#: src/elflint.c:418 #, c-format msgid "invalid program header offset\n" msgstr "" -#: src/elflint.c:419 +#: src/elflint.c:420 #, c-format msgid "executables and DSOs cannot have zero program header offset\n" msgstr "" -#: src/elflint.c:423 +#: src/elflint.c:424 #, c-format msgid "invalid number of program header entries\n" msgstr "" -#: src/elflint.c:431 +#: src/elflint.c:432 #, c-format msgid "invalid section header table offset\n" msgstr "" -#: src/elflint.c:434 +#: src/elflint.c:435 #, c-format msgid "section header table must be present\n" msgstr "" -#: src/elflint.c:448 +#: src/elflint.c:449 #, c-format msgid "invalid number of section header table entries\n" msgstr "" -#: src/elflint.c:465 +#: src/elflint.c:466 #, c-format msgid "invalid section header index\n" msgstr "" -#: src/elflint.c:479 +#: src/elflint.c:480 #, c-format msgid "invalid number of program header table entries\n" msgstr "" -#: src/elflint.c:488 +#: src/elflint.c:489 #, c-format msgid "invalid machine flags: %s\n" msgstr "" -#: src/elflint.c:495 src/elflint.c:512 +#: src/elflint.c:496 src/elflint.c:513 #, c-format msgid "invalid ELF header size: %hd\n" msgstr "" -#: src/elflint.c:498 src/elflint.c:515 +#: src/elflint.c:499 src/elflint.c:516 #, c-format msgid "invalid program header size: %hd\n" msgstr "" -#: src/elflint.c:501 src/elflint.c:518 +#: src/elflint.c:502 src/elflint.c:519 #, c-format msgid "invalid program header position or size\n" msgstr "" -#: src/elflint.c:504 src/elflint.c:521 +#: src/elflint.c:505 src/elflint.c:522 #, c-format msgid "invalid section header size: %hd\n" msgstr "" -#: src/elflint.c:507 src/elflint.c:524 +#: src/elflint.c:508 src/elflint.c:525 #, c-format msgid "invalid section header position or size\n" msgstr "" -#: src/elflint.c:568 +#: src/elflint.c:569 #, c-format msgid "" "section [%2d] '%s': section with SHF_GROUP flag set not part of a section " "group\n" msgstr "" -#: src/elflint.c:572 +#: src/elflint.c:573 #, c-format msgid "" "section [%2d] '%s': section group [%2zu] '%s' does not preceed group member\n" msgstr "" -#: src/elflint.c:588 src/elflint.c:1431 src/elflint.c:1481 src/elflint.c:1590 -#: src/elflint.c:2184 src/elflint.c:2698 src/elflint.c:2859 src/elflint.c:2989 -#: src/elflint.c:3161 src/elflint.c:4061 +#: src/elflint.c:589 src/elflint.c:1432 src/elflint.c:1482 src/elflint.c:1591 +#: src/elflint.c:2185 src/elflint.c:2699 src/elflint.c:2860 src/elflint.c:2990 +#: src/elflint.c:3162 src/elflint.c:4062 #, c-format msgid "section [%2d] '%s': cannot get section data\n" msgstr "" -#: src/elflint.c:601 src/elflint.c:1597 +#: src/elflint.c:602 src/elflint.c:1598 #, c-format msgid "" "section [%2d] '%s': referenced as string table for section [%2d] '%s' but " "type is not SHT_STRTAB\n" msgstr "" -#: src/elflint.c:624 +#: src/elflint.c:625 #, c-format msgid "" "section [%2d] '%s': symbol table cannot have more than one extended index " "section\n" msgstr "" -#: src/elflint.c:635 +#: src/elflint.c:636 #, c-format msgid "section [%2u] '%s': entry size is does not match ElfXX_Sym\n" msgstr "" -#: src/elflint.c:644 +#: src/elflint.c:645 #, c-format msgid "section [%2d] '%s': cannot get symbol %d: %s\n" msgstr "" -#: src/elflint.c:649 src/elflint.c:652 src/elflint.c:655 src/elflint.c:658 -#: src/elflint.c:661 src/elflint.c:664 +#: src/elflint.c:650 src/elflint.c:653 src/elflint.c:656 src/elflint.c:659 +#: src/elflint.c:662 src/elflint.c:665 #, c-format msgid "section [%2d] '%s': '%s' in zeroth entry not zero\n" msgstr "" -#: src/elflint.c:667 +#: src/elflint.c:668 #, c-format msgid "section [%2d] '%s': XINDEX for zeroth entry not zero\n" msgstr "" -#: src/elflint.c:677 +#: src/elflint.c:678 #, c-format msgid "section [%2d] '%s': cannot get symbol %zu: %s\n" msgstr "" -#: src/elflint.c:686 +#: src/elflint.c:687 #, c-format msgid "section [%2d] '%s': symbol %zu: invalid name value\n" msgstr "" -#: src/elflint.c:699 +#: src/elflint.c:700 #, c-format msgid "" "section [%2d] '%s': symbol %zu: too large section index but no extended " "section index section\n" msgstr "" -#: src/elflint.c:705 +#: src/elflint.c:706 #, c-format msgid "" "section [%2d] '%s': symbol %zu: XINDEX used for index which would fit in " "st_shndx (%<PRIu32>)\n" msgstr "" -#: src/elflint.c:717 +#: src/elflint.c:718 #, c-format msgid "section [%2d] '%s': symbol %zu: invalid section index\n" msgstr "" -#: src/elflint.c:725 +#: src/elflint.c:726 #, c-format msgid "section [%2d] '%s': symbol %zu: unknown type\n" msgstr "" -#: src/elflint.c:731 +#: src/elflint.c:732 #, c-format msgid "section [%2d] '%s': symbol %zu: unknown symbol binding\n" msgstr "" -#: src/elflint.c:736 +#: src/elflint.c:737 #, c-format msgid "section [%2d] '%s': symbol %zu: unique symbol not of object type\n" msgstr "" -#: src/elflint.c:744 +#: src/elflint.c:745 #, c-format msgid "" "section [%2d] '%s': symbol %zu: COMMON only allowed in relocatable files\n" msgstr "" -#: src/elflint.c:748 +#: src/elflint.c:749 #, c-format msgid "section [%2d] '%s': symbol %zu: local COMMON symbols are nonsense\n" msgstr "" -#: src/elflint.c:752 +#: src/elflint.c:753 #, c-format msgid "" "section [%2d] '%s': symbol %zu: function in COMMON section is nonsense\n" msgstr "" -#: src/elflint.c:784 +#: src/elflint.c:785 #, c-format msgid "section [%2d] '%s': symbol %zu: st_value out of bounds\n" msgstr "" -#: src/elflint.c:790 src/elflint.c:815 src/elflint.c:858 +#: src/elflint.c:791 src/elflint.c:816 src/elflint.c:859 #, c-format msgid "" "section [%2d] '%s': symbol %zu does not fit completely in referenced section " "[%2d] '%s'\n" msgstr "" -#: src/elflint.c:799 +#: src/elflint.c:800 #, c-format msgid "" "section [%2d] '%s': symbol %zu: referenced section [%2d] '%s' does not have " "SHF_TLS flag set\n" msgstr "" -#: src/elflint.c:809 src/elflint.c:851 +#: src/elflint.c:810 src/elflint.c:852 #, c-format msgid "" "section [%2d] '%s': symbol %zu: st_value out of bounds of referenced section " "[%2d] '%s'\n" msgstr "" -#: src/elflint.c:836 +#: src/elflint.c:837 #, c-format msgid "" "section [%2d] '%s': symbol %zu: TLS symbol but no TLS program header entry\n" msgstr "" -#: src/elflint.c:844 +#: src/elflint.c:845 #, c-format msgid "" "section [%2d] '%s': symbol %zu: st_value short of referenced section [%2d] '%" "s'\n" msgstr "" -#: src/elflint.c:871 +#: src/elflint.c:872 #, c-format msgid "" "section [%2d] '%s': symbol %zu: local symbol outside range described in " "sh_info\n" msgstr "" -#: src/elflint.c:878 +#: src/elflint.c:879 #, c-format msgid "" "section [%2d] '%s': symbol %zu: non-local symbol outside range described in " "sh_info\n" msgstr "" -#: src/elflint.c:885 +#: src/elflint.c:886 #, c-format msgid "section [%2d] '%s': symbol %zu: non-local section symbol\n" msgstr "" -#: src/elflint.c:935 +#: src/elflint.c:936 #, c-format msgid "" "section [%2d] '%s': _GLOBAL_OFFSET_TABLE_ symbol refers to bad section [%" "2d]\n" msgstr "" -#: src/elflint.c:942 +#: src/elflint.c:943 #, c-format msgid "" "section [%2d] '%s': _GLOBAL_OFFSET_TABLE_ symbol refers to section [%2d] '%" "s'\n" msgstr "" -#: src/elflint.c:958 +#: src/elflint.c:959 #, c-format msgid "" "section [%2d] '%s': _GLOBAL_OFFSET_TABLE_ symbol value %#<PRIx64> does not " "match %s section address %#<PRIx64>\n" msgstr "" -#: src/elflint.c:965 +#: src/elflint.c:966 #, c-format msgid "" "section [%2d] '%s': _GLOBAL_OFFSET_TABLE_ symbol size %<PRIu64> does not " "match %s section size %<PRIu64>\n" msgstr "" -#: src/elflint.c:973 +#: src/elflint.c:974 #, c-format msgid "" "section [%2d] '%s': _GLOBAL_OFFSET_TABLE_ symbol present, but no .got " "section\n" msgstr "" -#: src/elflint.c:989 +#: src/elflint.c:990 #, c-format msgid "" "section [%2d] '%s': _DYNAMIC_ symbol value %#<PRIx64> does not match dynamic " "segment address %#<PRIx64>\n" msgstr "" -#: src/elflint.c:996 +#: src/elflint.c:997 #, c-format msgid "" "section [%2d] '%s': _DYNAMIC symbol size %<PRIu64> does not match dynamic " "segment size %<PRIu64>\n" msgstr "" -#: src/elflint.c:1009 +#: src/elflint.c:1010 #, c-format msgid "" "section [%2d] '%s': symbol %zu: symbol in dynamic symbol table with non-" "default visibility\n" msgstr "" -#: src/elflint.c:1013 +#: src/elflint.c:1014 #, c-format msgid "section [%2d] '%s': symbol %zu: unknown bit set in st_other\n" msgstr "" -#: src/elflint.c:1058 +#: src/elflint.c:1059 #, c-format msgid "section [%2d] '%s': DT_RELCOUNT used for this RELA section\n" msgstr "" -#: src/elflint.c:1067 src/elflint.c:1119 +#: src/elflint.c:1068 src/elflint.c:1120 #, c-format msgid "section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n" msgstr "" -#: src/elflint.c:1092 src/elflint.c:1144 +#: src/elflint.c:1093 src/elflint.c:1145 #, c-format msgid "" "section [%2d] '%s': relative relocations after index %d as specified by " "DT_RELCOUNT\n" msgstr "" -#: src/elflint.c:1098 src/elflint.c:1150 +#: src/elflint.c:1099 src/elflint.c:1151 #, c-format msgid "" "section [%2d] '%s': non-relative relocation at index %zu; DT_RELCOUNT " "specified %d relative relocations\n" msgstr "" -#: src/elflint.c:1110 +#: src/elflint.c:1111 #, c-format msgid "section [%2d] '%s': DT_RELACOUNT used for this REL section\n" msgstr "" -#: src/elflint.c:1192 +#: src/elflint.c:1193 #, c-format msgid "section [%2d] '%s': invalid destination section index\n" msgstr "" -#: src/elflint.c:1205 +#: src/elflint.c:1206 #, c-format msgid "section [%2d] '%s': invalid destination section type\n" msgstr "" -#: src/elflint.c:1213 +#: src/elflint.c:1214 #, c-format msgid "section [%2d] '%s': sh_info should be zero\n" msgstr "" -#: src/elflint.c:1220 +#: src/elflint.c:1221 #, c-format msgid "section [%2d] '%s': no relocations for merge-able sections possible\n" msgstr "" -#: src/elflint.c:1227 +#: src/elflint.c:1228 #, c-format msgid "section [%2d] '%s': section entry size does not match ElfXX_Rela\n" msgstr "" -#: src/elflint.c:1287 +#: src/elflint.c:1288 #, c-format msgid "text relocation flag set but there is no read-only segment\n" msgstr "" -#: src/elflint.c:1314 +#: src/elflint.c:1315 #, c-format msgid "section [%2d] '%s': relocation %zu: invalid type\n" msgstr "" -#: src/elflint.c:1322 +#: src/elflint.c:1323 #, c-format msgid "" "section [%2d] '%s': relocation %zu: relocation type invalid for the file " "type\n" msgstr "" -#: src/elflint.c:1330 +#: src/elflint.c:1331 #, c-format msgid "section [%2d] '%s': relocation %zu: invalid symbol index\n" msgstr "" -#: src/elflint.c:1348 +#: src/elflint.c:1349 #, c-format msgid "" "section [%2d] '%s': relocation %zu: only symbol '_GLOBAL_OFFSET_TABLE_' can " "be used with %s\n" msgstr "" -#: src/elflint.c:1365 +#: src/elflint.c:1366 #, c-format msgid "section [%2d] '%s': relocation %zu: offset out of bounds\n" msgstr "" -#: src/elflint.c:1380 +#: src/elflint.c:1381 #, c-format msgid "" "section [%2d] '%s': relocation %zu: copy relocation against symbol of type %" "s\n" msgstr "" -#: src/elflint.c:1401 +#: src/elflint.c:1402 #, c-format msgid "" "section [%2d] '%s': relocation %zu: read-only section modified but text " "relocation flag not set\n" msgstr "" -#: src/elflint.c:1416 +#: src/elflint.c:1417 #, c-format msgid "section [%2d] '%s': relocations are against loaded and unloaded data\n" msgstr "" -#: src/elflint.c:1455 src/elflint.c:1505 +#: src/elflint.c:1456 src/elflint.c:1506 #, c-format msgid "section [%2d] '%s': cannot get relocation %zu: %s\n" msgstr "" -#: src/elflint.c:1585 +#: src/elflint.c:1586 #, c-format msgid "more than one dynamic section present\n" msgstr "" -#: src/elflint.c:1603 +#: src/elflint.c:1604 #, c-format msgid "section [%2d] '%s': section entry size does not match ElfXX_Dyn\n" msgstr "" -#: src/elflint.c:1608 src/elflint.c:1900 +#: src/elflint.c:1609 src/elflint.c:1901 #, c-format msgid "section [%2d] '%s': sh_info not zero\n" msgstr "" -#: src/elflint.c:1618 +#: src/elflint.c:1619 #, c-format msgid "section [%2d] '%s': cannot get dynamic section entry %zu: %s\n" msgstr "" -#: src/elflint.c:1626 +#: src/elflint.c:1627 #, c-format msgid "section [%2d] '%s': non-DT_NULL entries follow DT_NULL entry\n" msgstr "" -#: src/elflint.c:1633 +#: src/elflint.c:1634 #, c-format msgid "section [%2d] '%s': entry %zu: unknown tag\n" msgstr "" -#: src/elflint.c:1644 +#: src/elflint.c:1645 #, c-format msgid "section [%2d] '%s': entry %zu: more than one entry with tag %s\n" msgstr "" -#: src/elflint.c:1654 +#: src/elflint.c:1655 #, c-format msgid "section [%2d] '%s': entry %zu: level 2 tag %s used\n" msgstr "" -#: src/elflint.c:1672 +#: src/elflint.c:1673 #, c-format msgid "" "section [%2d] '%s': entry %zu: DT_PLTREL value must be DT_REL or DT_RELA\n" msgstr "" -#: src/elflint.c:1694 +#: src/elflint.c:1695 #, c-format msgid "" "section [%2d] '%s': entry %zu: pointer does not match address of section [%" "2d] '%s' referenced by sh_link\n" msgstr "" -#: src/elflint.c:1737 +#: src/elflint.c:1738 #, c-format msgid "" "section [%2d] '%s': entry %zu: %s value must point into loaded segment\n" msgstr "" -#: src/elflint.c:1752 +#: src/elflint.c:1753 #, c-format msgid "" "section [%2d] '%s': entry %zu: %s value must be valid offset in section [%" "2d] '%s'\n" msgstr "" -#: src/elflint.c:1772 src/elflint.c:1800 +#: src/elflint.c:1773 src/elflint.c:1801 #, c-format msgid "section [%2d] '%s': contains %s entry but not %s\n" msgstr "" -#: src/elflint.c:1784 +#: src/elflint.c:1785 #, c-format msgid "section [%2d] '%s': mandatory tag %s not present\n" msgstr "" -#: src/elflint.c:1793 +#: src/elflint.c:1794 #, c-format msgid "section [%2d] '%s': no hash section present\n" msgstr "" -#: src/elflint.c:1808 src/elflint.c:1815 +#: src/elflint.c:1809 src/elflint.c:1816 #, c-format msgid "section [%2d] '%s': not all of %s, %s, and %s are present\n" msgstr "" -#: src/elflint.c:1825 src/elflint.c:1829 +#: src/elflint.c:1826 src/elflint.c:1830 #, c-format msgid "section [%2d] '%s': %s tag missing in DSO marked during prelinking\n" msgstr "" -#: src/elflint.c:1835 +#: src/elflint.c:1836 #, c-format msgid "section [%2d] '%s': non-DSO file marked as dependency during prelink\n" msgstr "" -#: src/elflint.c:1846 src/elflint.c:1850 src/elflint.c:1854 src/elflint.c:1858 +#: src/elflint.c:1847 src/elflint.c:1851 src/elflint.c:1855 src/elflint.c:1859 #, c-format msgid "section [%2d] '%s': %s tag missing in prelinked executable\n" msgstr "" -#: src/elflint.c:1870 +#: src/elflint.c:1871 #, c-format msgid "" "section [%2d] '%s': only relocatable files can have extended section index\n" msgstr "" -#: src/elflint.c:1880 +#: src/elflint.c:1881 #, c-format msgid "" "section [%2d] '%s': extended section index section not for symbol table\n" msgstr "" -#: src/elflint.c:1885 +#: src/elflint.c:1886 #, c-format msgid "cannot get data for symbol section\n" msgstr "" -#: src/elflint.c:1888 +#: src/elflint.c:1889 #, c-format msgid "section [%2d] '%s': entry size does not match Elf32_Word\n" msgstr "" -#: src/elflint.c:1895 +#: src/elflint.c:1896 #, c-format msgid "section [%2d] '%s': extended index table too small for symbol table\n" msgstr "" -#: src/elflint.c:1910 +#: src/elflint.c:1911 #, c-format msgid "" "section [%2d] '%s': extended section index in section [%2zu] '%s' refers to " "same symbol table\n" msgstr "" -#: src/elflint.c:1921 +#: src/elflint.c:1922 #, c-format msgid "symbol 0 should have zero extended section index\n" msgstr "" -#: src/elflint.c:1933 +#: src/elflint.c:1934 #, c-format msgid "cannot get data for symbol %zu\n" msgstr "" -#: src/elflint.c:1938 +#: src/elflint.c:1939 #, c-format msgid "extended section index is %<PRIu32> but symbol index is not XINDEX\n" msgstr "" -#: src/elflint.c:1954 src/elflint.c:1995 +#: src/elflint.c:1955 src/elflint.c:1996 #, c-format msgid "" "section [%2d] '%s': hash table section is too small (is %ld, expected %ld)\n" msgstr "" -#: src/elflint.c:1966 src/elflint.c:2007 +#: src/elflint.c:1967 src/elflint.c:2008 #, c-format msgid "section [%2d] '%s': chain array too large\n" msgstr "" -#: src/elflint.c:1975 src/elflint.c:2016 +#: src/elflint.c:1976 src/elflint.c:2017 #, c-format msgid "section [%2d] '%s': hash bucket reference %zu out of bounds\n" msgstr "" -#: src/elflint.c:1981 +#: src/elflint.c:1982 #, c-format msgid "section [%2d] '%s': hash chain reference %zu out of bounds\n" msgstr "" -#: src/elflint.c:2022 +#: src/elflint.c:2023 #, c-format msgid "section [%2d] '%s': hash chain reference %<PRIu64> out of bounds\n" msgstr "" -#: src/elflint.c:2037 +#: src/elflint.c:2038 #, c-format msgid "section [%2d] '%s': bitmask size not power of 2: %u\n" msgstr "" -#: src/elflint.c:2048 +#: src/elflint.c:2049 #, c-format msgid "" "section [%2d] '%s': hash table section is too small (is %ld, expected at " "least%ld)\n" msgstr "" -#: src/elflint.c:2056 +#: src/elflint.c:2057 #, c-format msgid "section [%2d] '%s': 2nd hash function shift too big: %u\n" msgstr "" -#: src/elflint.c:2088 +#: src/elflint.c:2089 #, c-format msgid "" "section [%2d] '%s': hash chain for bucket %zu lower than symbol index bias\n" msgstr "" -#: src/elflint.c:2109 +#: src/elflint.c:2110 #, c-format msgid "" "section [%2d] '%s': symbol %u referenced in chain for bucket %zu is " "undefined\n" msgstr "" -#: src/elflint.c:2120 +#: src/elflint.c:2121 #, c-format msgid "" "section [%2d] '%s': hash value for symbol %u in chain for bucket %zu wrong\n" msgstr "" -#: src/elflint.c:2151 +#: src/elflint.c:2152 #, c-format msgid "section [%2d] '%s': hash chain for bucket %zu out of bounds\n" msgstr "" -#: src/elflint.c:2156 +#: src/elflint.c:2157 #, c-format msgid "" "section [%2d] '%s': symbol reference in chain for bucket %zu out of bounds\n" msgstr "" -#: src/elflint.c:2162 +#: src/elflint.c:2163 #, c-format msgid "section [%2d] '%s': bitmask does not match names in the hash table\n" msgstr "" -#: src/elflint.c:2175 +#: src/elflint.c:2176 #, c-format msgid "section [%2d] '%s': relocatable files cannot have hash tables\n" msgstr "" -#: src/elflint.c:2193 +#: src/elflint.c:2194 #, c-format msgid "section [%2d] '%s': hash table not for dynamic symbol table\n" msgstr "" -#: src/elflint.c:2201 +#: src/elflint.c:2202 #, c-format msgid "section [%2d] '%s': hash table entry size incorrect\n" msgstr "" -#: src/elflint.c:2206 +#: src/elflint.c:2207 #, c-format msgid "section [%2d] '%s': not marked to be allocated\n" msgstr "" -#: src/elflint.c:2211 +#: src/elflint.c:2212 #, c-format msgid "" "section [%2d] '%s': hash table has not even room for initial administrative " "entries\n" msgstr "" -#: src/elflint.c:2259 +#: src/elflint.c:2260 #, c-format msgid "sh_link in hash sections [%2zu] '%s' and [%2zu] '%s' not identical\n" msgstr "" -#: src/elflint.c:2337 src/elflint.c:2341 +#: src/elflint.c:2338 src/elflint.c:2342 #, c-format msgid "section [%2zu] '%s': reference to symbol index 0\n" msgstr "" -#: src/elflint.c:2348 +#: src/elflint.c:2349 #, c-format msgid "" "symbol %d referenced in new hash table in [%2zu] '%s' but not in old hash " "table in [%2zu] '%s'\n" msgstr "" -#: src/elflint.c:2360 +#: src/elflint.c:2361 #, c-format msgid "" "symbol %d referenced in old hash table in [%2zu] '%s' but not in new hash " "table in [%2zu] '%s'\n" msgstr "" -#: src/elflint.c:2376 +#: src/elflint.c:2377 #, c-format msgid "section [%2d] '%s': nonzero sh_%s for NULL section\n" msgstr "" -#: src/elflint.c:2396 +#: src/elflint.c:2397 #, c-format msgid "" "section [%2d] '%s': section groups only allowed in relocatable object files\n" msgstr "" -#: src/elflint.c:2407 +#: src/elflint.c:2408 #, c-format msgid "section [%2d] '%s': cannot get symbol table: %s\n" msgstr "" -#: src/elflint.c:2412 +#: src/elflint.c:2413 #, c-format msgid "section [%2d] '%s': section reference in sh_link is no symbol table\n" msgstr "" -#: src/elflint.c:2418 +#: src/elflint.c:2419 #, c-format msgid "section [%2d] '%s': invalid symbol index in sh_info\n" msgstr "" -#: src/elflint.c:2423 +#: src/elflint.c:2424 #, c-format msgid "section [%2d] '%s': sh_flags not zero\n" msgstr "" -#: src/elflint.c:2430 +#: src/elflint.c:2431 #, c-format msgid "section [%2d] '%s': cannot get symbol for signature\n" msgstr "" -#: src/elflint.c:2435 +#: src/elflint.c:2436 #, c-format msgid "section [%2d] '%s': signature symbol canot be empty string\n" msgstr "" -#: src/elflint.c:2441 +#: src/elflint.c:2442 #, c-format msgid "section [%2d] '%s': sh_flags not set correctly\n" msgstr "" -#: src/elflint.c:2447 +#: src/elflint.c:2448 #, c-format msgid "section [%2d] '%s': cannot get data: %s\n" msgstr "" -#: src/elflint.c:2456 +#: src/elflint.c:2457 #, c-format msgid "section [%2d] '%s': section size not multiple of sizeof(Elf32_Word)\n" msgstr "" -#: src/elflint.c:2461 +#: src/elflint.c:2462 #, c-format msgid "section [%2d] '%s': section group without flags word\n" msgstr "" -#: src/elflint.c:2467 +#: src/elflint.c:2468 #, c-format msgid "section [%2d] '%s': section group without member\n" msgstr "" -#: src/elflint.c:2471 +#: src/elflint.c:2472 #, c-format msgid "section [%2d] '%s': section group with only one member\n" msgstr "" -#: src/elflint.c:2482 +#: src/elflint.c:2483 #, c-format msgid "section [%2d] '%s': unknown section group flags\n" msgstr "" -#: src/elflint.c:2494 +#: src/elflint.c:2495 #, c-format msgid "section [%2d] '%s': section index %Zu out of range\n" msgstr "" -#: src/elflint.c:2503 +#: src/elflint.c:2504 #, c-format msgid "section [%2d] '%s': cannot get section header for element %zu: %s\n" msgstr "" -#: src/elflint.c:2510 +#: src/elflint.c:2511 #, c-format msgid "section [%2d] '%s': section group contains another group [%2d] '%s'\n" msgstr "" -#: src/elflint.c:2516 +#: src/elflint.c:2517 #, c-format msgid "" "section [%2d] '%s': element %Zu references section [%2d] '%s' without " "SHF_GROUP flag set\n" msgstr "" -#: src/elflint.c:2523 +#: src/elflint.c:2524 #, c-format msgid "section [%2d] '%s' is contained in more than one section group\n" msgstr "" -#: src/elflint.c:2712 +#: src/elflint.c:2713 #, c-format msgid "" "section [%2d] '%s' refers in sh_link to section [%2d] '%s' which is no " "dynamic symbol table\n" msgstr "" -#: src/elflint.c:2723 +#: src/elflint.c:2724 #, c-format msgid "" "section [%2d] '%s' has different number of entries than symbol table [%2d] '%" "s'\n" msgstr "" -#: src/elflint.c:2739 +#: src/elflint.c:2740 #, c-format msgid "section [%2d] '%s': symbol %d: cannot read version data\n" msgstr "" -#: src/elflint.c:2755 +#: src/elflint.c:2756 #, c-format msgid "section [%2d] '%s': symbol %d: local symbol with global scope\n" msgstr "" -#: src/elflint.c:2763 +#: src/elflint.c:2764 #, c-format msgid "section [%2d] '%s': symbol %d: local symbol with version\n" msgstr "" -#: src/elflint.c:2777 +#: src/elflint.c:2778 #, c-format msgid "section [%2d] '%s': symbol %d: invalid version index %d\n" msgstr "" -#: src/elflint.c:2782 +#: src/elflint.c:2783 #, c-format msgid "" "section [%2d] '%s': symbol %d: version index %d is for defined version\n" msgstr "" -#: src/elflint.c:2792 +#: src/elflint.c:2793 #, c-format msgid "" "section [%2d] '%s': symbol %d: version index %d is for requested version\n" msgstr "" -#: src/elflint.c:2844 +#: src/elflint.c:2845 #, c-format msgid "more than one version reference section present\n" msgstr "" -#: src/elflint.c:2852 src/elflint.c:2981 +#: src/elflint.c:2853 src/elflint.c:2982 #, c-format msgid "section [%2d] '%s': sh_link does not link to string table\n" msgstr "" -#: src/elflint.c:2875 src/elflint.c:3033 +#: src/elflint.c:2876 src/elflint.c:3034 #, c-format msgid "section [%2d] '%s': entry %d has wrong version %d\n" msgstr "" -#: src/elflint.c:2881 src/elflint.c:3039 +#: src/elflint.c:2882 src/elflint.c:3040 #, c-format msgid "section [%2d] '%s': entry %d has wrong offset of auxiliary data\n" msgstr "" -#: src/elflint.c:2889 +#: src/elflint.c:2890 #, c-format msgid "section [%2d] '%s': entry %d has invalid file reference\n" msgstr "" -#: src/elflint.c:2897 +#: src/elflint.c:2898 #, c-format msgid "section [%2d] '%s': entry %d references unknown dependency\n" msgstr "" -#: src/elflint.c:2909 +#: src/elflint.c:2910 #, c-format msgid "section [%2d] '%s': auxiliary entry %d of entry %d has unknown flag\n" msgstr "" -#: src/elflint.c:2916 +#: src/elflint.c:2917 #, c-format msgid "" "section [%2d] '%s': auxiliary entry %d of entry %d has invalid name " "reference\n" msgstr "" -#: src/elflint.c:2923 +#: src/elflint.c:2924 #, c-format msgid "" "section [%2d] '%s': auxiliary entry %d of entry %d has wrong hash value: %" "#x, expected %#x\n" msgstr "" -#: src/elflint.c:2933 +#: src/elflint.c:2934 #, c-format msgid "" "section [%2d] '%s': auxiliary entry %d of entry %d has duplicate version " "name '%s'\n" msgstr "" -#: src/elflint.c:2944 +#: src/elflint.c:2945 #, c-format msgid "" "section [%2d] '%s': auxiliary entry %d of entry %d has wrong next field\n" msgstr "" -#: src/elflint.c:2960 src/elflint.c:3118 +#: src/elflint.c:2961 src/elflint.c:3119 #, c-format msgid "section [%2d] '%s': entry %d has invalid offset to next entry\n" msgstr "" -#: src/elflint.c:2973 +#: src/elflint.c:2974 #, c-format msgid "more than one version definition section present\n" msgstr "" -#: src/elflint.c:3018 +#: src/elflint.c:3019 #, c-format msgid "section [%2d] '%s': more than one BASE definition\n" msgstr "" -#: src/elflint.c:3022 +#: src/elflint.c:3023 #, c-format msgid "section [%2d] '%s': BASE definition must have index VER_NDX_GLOBAL\n" msgstr "" -#: src/elflint.c:3028 +#: src/elflint.c:3029 #, c-format msgid "section [%2d] '%s': entry %d has unknown flag\n" msgstr "" -#: src/elflint.c:3052 +#: src/elflint.c:3053 #, c-format msgid "section [%2d] '%s': entry %d has invalid name reference\n" msgstr "" -#: src/elflint.c:3059 +#: src/elflint.c:3060 #, c-format msgid "section [%2d] '%s': entry %d has wrong hash value: %#x, expected %#x\n" msgstr "" -#: src/elflint.c:3068 +#: src/elflint.c:3069 #, c-format msgid "section [%2d] '%s': entry %d has duplicate version name '%s'\n" msgstr "" -#: src/elflint.c:3087 +#: src/elflint.c:3088 #, c-format msgid "" "section [%2d] '%s': entry %d has invalid name reference in auxiliary data\n" msgstr "" -#: src/elflint.c:3102 +#: src/elflint.c:3103 #, c-format msgid "section [%2d] '%s': entry %d has wrong next field in auxiliary data\n" msgstr "" -#: src/elflint.c:3124 +#: src/elflint.c:3125 #, c-format msgid "section [%2d] '%s': no BASE definition\n" msgstr "" -#: src/elflint.c:3140 +#: src/elflint.c:3141 #, c-format msgid "section [%2d] '%s': unknown parent version '%s'\n" msgstr "" -#: src/elflint.c:3153 +#: src/elflint.c:3154 #, c-format msgid "section [%2d] '%s': empty object attributes section\n" msgstr "" -#: src/elflint.c:3174 +#: src/elflint.c:3175 #, c-format msgid "section [%2d] '%s': unrecognized attribute format\n" msgstr "" -#: src/elflint.c:3190 +#: src/elflint.c:3191 #, c-format msgid "" "section [%2d] '%s': offset %zu: zero length field in attribute section\n" msgstr "" -#: src/elflint.c:3199 +#: src/elflint.c:3200 #, c-format msgid "section [%2d] '%s': offset %zu: invalid length in attribute section\n" msgstr "" -#: src/elflint.c:3211 +#: src/elflint.c:3212 #, c-format msgid "section [%2d] '%s': offset %zu: unterminated vendor name string\n" msgstr "" -#: src/elflint.c:3228 +#: src/elflint.c:3229 #, c-format msgid "" "section [%2d] '%s': offset %zu: endless ULEB128 in attribute subsection tag\n" msgstr "" -#: src/elflint.c:3237 +#: src/elflint.c:3238 #, c-format msgid "section [%2d] '%s': offset %zu: truncated attribute section\n" msgstr "" -#: src/elflint.c:3246 +#: src/elflint.c:3247 #, c-format msgid "" "section [%2d] '%s': offset %zu: zero length field in attribute subsection\n" msgstr "" -#: src/elflint.c:3259 +#: src/elflint.c:3260 #, c-format msgid "" "section [%2d] '%s': offset %zu: invalid length in attribute subsection\n" msgstr "" -#: src/elflint.c:3270 +#: src/elflint.c:3271 #, c-format msgid "" "section [%2d] '%s': offset %zu: attribute subsection has unexpected tag %u\n" msgstr "" -#: src/elflint.c:3288 +#: src/elflint.c:3289 #, c-format msgid "section [%2d] '%s': offset %zu: endless ULEB128 in attribute tag\n" msgstr "" -#: src/elflint.c:3299 +#: src/elflint.c:3300 #, c-format msgid "section [%2d] '%s': offset %zu: unterminated string in attribute\n" msgstr "" -#: src/elflint.c:3312 +#: src/elflint.c:3313 #, c-format msgid "section [%2d] '%s': offset %zu: unrecognized attribute tag %u\n" msgstr "" -#: src/elflint.c:3316 +#: src/elflint.c:3317 #, c-format msgid "" "section [%2d] '%s': offset %zu: unrecognized %s attribute value %<PRIu64>\n" msgstr "" -#: src/elflint.c:3326 +#: src/elflint.c:3327 #, c-format msgid "section [%2d] '%s': offset %zu: vendor '%s' unknown\n" msgstr "" -#: src/elflint.c:3332 +#: src/elflint.c:3333 #, c-format msgid "" "section [%2d] '%s': offset %zu: extra bytes after last attribute section\n" msgstr "" -#: src/elflint.c:3421 +#: src/elflint.c:3422 #, c-format msgid "cannot get section header of zeroth section\n" msgstr "" -#: src/elflint.c:3425 +#: src/elflint.c:3426 #, c-format msgid "zeroth section has nonzero name\n" msgstr "" -#: src/elflint.c:3427 +#: src/elflint.c:3428 #, c-format msgid "zeroth section has nonzero type\n" msgstr "" -#: src/elflint.c:3429 +#: src/elflint.c:3430 #, c-format msgid "zeroth section has nonzero flags\n" msgstr "" -#: src/elflint.c:3431 +#: src/elflint.c:3432 #, c-format msgid "zeroth section has nonzero address\n" msgstr "" -#: src/elflint.c:3433 +#: src/elflint.c:3434 #, c-format msgid "zeroth section has nonzero offset\n" msgstr "" -#: src/elflint.c:3435 +#: src/elflint.c:3436 #, c-format msgid "zeroth section has nonzero align value\n" msgstr "" -#: src/elflint.c:3437 +#: src/elflint.c:3438 #, c-format msgid "zeroth section has nonzero entry size value\n" msgstr "" -#: src/elflint.c:3440 +#: src/elflint.c:3441 #, c-format msgid "" "zeroth section has nonzero size value while ELF header has nonzero shnum " "value\n" msgstr "" -#: src/elflint.c:3444 +#: src/elflint.c:3445 #, c-format msgid "" "zeroth section has nonzero link value while ELF header does not signal " "overflow in shstrndx\n" msgstr "" -#: src/elflint.c:3448 +#: src/elflint.c:3449 #, c-format msgid "" "zeroth section has nonzero link value while ELF header does not signal " "overflow in phnum\n" msgstr "" -#: src/elflint.c:3465 +#: src/elflint.c:3466 #, c-format msgid "cannot get section header for section [%2zu] '%s': %s\n" msgstr "" -#: src/elflint.c:3474 +#: src/elflint.c:3475 #, c-format msgid "section [%2zu]: invalid name\n" msgstr "" -#: src/elflint.c:3501 +#: src/elflint.c:3502 #, c-format msgid "section [%2d] '%s' has wrong type: expected %s, is %s\n" msgstr "" -#: src/elflint.c:3517 +#: src/elflint.c:3518 #, c-format msgid "section [%2zu] '%s' has wrong flags: expected %s, is %s\n" msgstr "" -#: src/elflint.c:3534 +#: src/elflint.c:3535 #, c-format msgid "" "section [%2zu] '%s' has wrong flags: expected %s and possibly %s, is %s\n" msgstr "" -#: src/elflint.c:3552 +#: src/elflint.c:3553 #, c-format msgid "section [%2zu] '%s' present in object file\n" msgstr "" -#: src/elflint.c:3558 src/elflint.c:3590 +#: src/elflint.c:3559 src/elflint.c:3591 #, c-format msgid "" "section [%2zu] '%s' has SHF_ALLOC flag set but there is no loadable segment\n" msgstr "" -#: src/elflint.c:3563 src/elflint.c:3595 +#: src/elflint.c:3564 src/elflint.c:3596 #, c-format msgid "" "section [%2zu] '%s' has SHF_ALLOC flag not set but there are loadable " "segments\n" msgstr "" -#: src/elflint.c:3571 +#: src/elflint.c:3572 #, c-format msgid "" "section [%2zu] '%s' is extension section index table in non-object file\n" msgstr "" -#: src/elflint.c:3614 +#: src/elflint.c:3615 #, c-format msgid "section [%2zu] '%s': size not multiple of entry size\n" msgstr "" -#: src/elflint.c:3619 +#: src/elflint.c:3620 #, c-format msgid "cannot get section header\n" msgstr "" -#: src/elflint.c:3629 +#: src/elflint.c:3630 #, c-format msgid "section [%2zu] '%s' has unsupported type %d\n" msgstr "" -#: src/elflint.c:3643 +#: src/elflint.c:3644 #, c-format msgid "" "section [%2zu] '%s' contains invalid processor-specific flag(s) %#<PRIx64>\n" msgstr "" -#: src/elflint.c:3650 +#: src/elflint.c:3651 #, c-format msgid "section [%2zu] '%s' contains unknown flag(s) %#<PRIx64>\n" msgstr "" -#: src/elflint.c:3658 +#: src/elflint.c:3659 #, c-format msgid "section [%2zu] '%s': thread-local data sections address not zero\n" msgstr "" -#: src/elflint.c:3666 +#: src/elflint.c:3667 #, c-format msgid "section [%2zu] '%s': invalid section reference in link value\n" msgstr "" -#: src/elflint.c:3671 +#: src/elflint.c:3672 #, c-format msgid "section [%2zu] '%s': invalid section reference in info value\n" msgstr "" -#: src/elflint.c:3678 +#: src/elflint.c:3679 #, c-format msgid "section [%2zu] '%s': strings flag set without merge flag\n" msgstr "" -#: src/elflint.c:3683 +#: src/elflint.c:3684 #, c-format msgid "section [%2zu] '%s': merge flag set but entry size is zero\n" msgstr "" -#: src/elflint.c:3701 +#: src/elflint.c:3702 #, c-format msgid "section [%2zu] '%s' has unexpected type %d for an executable section\n" msgstr "" -#: src/elflint.c:3710 +#: src/elflint.c:3711 #, c-format msgid "section [%2zu] '%s' is both executable and writable\n" msgstr "" -#: src/elflint.c:3737 +#: src/elflint.c:3738 #, c-format msgid "" "section [%2zu] '%s' not fully contained in segment of program header entry %" "d\n" msgstr "" -#: src/elflint.c:3745 +#: src/elflint.c:3746 #, c-format msgid "" "section [%2zu] '%s' has type NOBITS but is read from the file in segment of " "program header entry %d\n" msgstr "" -#: src/elflint.c:3754 +#: src/elflint.c:3755 #, c-format msgid "" "section [%2zu] '%s' has not type NOBITS but is not read from the file in " "segment of program header entry %d\n" msgstr "" -#: src/elflint.c:3765 +#: src/elflint.c:3766 #, c-format msgid "section [%2zu] '%s' is executable in nonexecutable segment %d\n" msgstr "" -#: src/elflint.c:3775 +#: src/elflint.c:3776 #, c-format msgid "section [%2zu] '%s' is writable in unwritable segment %d\n" msgstr "" -#: src/elflint.c:3785 +#: src/elflint.c:3786 #, c-format msgid "" "section [%2zu] '%s': alloc flag set but section not in any loaded segment\n" msgstr "" -#: src/elflint.c:3791 +#: src/elflint.c:3792 #, c-format msgid "" "section [%2zu] '%s': ELF header says this is the section header string table " "but type is not SHT_TYPE\n" msgstr "" -#: src/elflint.c:3799 +#: src/elflint.c:3800 #, c-format msgid "" "section [%2zu] '%s': relocatable files cannot have dynamic symbol tables\n" msgstr "" -#: src/elflint.c:3850 +#: src/elflint.c:3851 #, c-format msgid "more than one version symbol table present\n" msgstr "" -#: src/elflint.c:3873 +#: src/elflint.c:3874 #, c-format msgid "INTERP program header entry but no .interp section\n" msgstr "" -#: src/elflint.c:3884 +#: src/elflint.c:3885 #, c-format msgid "" "loadable segment [%u] is executable but contains no executable sections\n" msgstr "" -#: src/elflint.c:3890 +#: src/elflint.c:3891 #, c-format msgid "loadable segment [%u] is writable but contains no writable sections\n" msgstr "" -#: src/elflint.c:3901 +#: src/elflint.c:3902 #, c-format msgid "" "no .gnu.versym section present but .gnu.versym_d or .gnu.versym_r section " "exist\n" msgstr "" -#: src/elflint.c:3914 +#: src/elflint.c:3915 #, c-format msgid "duplicate version index %d\n" msgstr "" -#: src/elflint.c:3928 +#: src/elflint.c:3929 #, c-format msgid ".gnu.versym section present without .gnu.versym_d or .gnu.versym_r\n" msgstr "" -#: src/elflint.c:3977 +#: src/elflint.c:3978 #, c-format msgid "phdr[%d]: unknown core file note type %<PRIu32> at offset %<PRIu64>\n" msgstr "" -#: src/elflint.c:3981 +#: src/elflint.c:3982 #, c-format msgid "" "section [%2d] '%s': unknown core file note type %<PRIu32> at offset %Zu\n" msgstr "" -#: src/elflint.c:4004 +#: src/elflint.c:4005 #, c-format msgid "phdr[%d]: unknown object file note type %<PRIu32> at offset %Zu\n" msgstr "" -#: src/elflint.c:4008 +#: src/elflint.c:4009 #, c-format msgid "" "section [%2d] '%s': unknown object file note type %<PRIu32> at offset %Zu\n" msgstr "" -#: src/elflint.c:4025 +#: src/elflint.c:4026 #, c-format msgid "phdr[%d]: no note entries defined for the type of file\n" msgstr "" -#: src/elflint.c:4044 +#: src/elflint.c:4045 #, c-format msgid "phdr[%d]: cannot get content of note section: %s\n" msgstr "" -#: src/elflint.c:4047 +#: src/elflint.c:4048 #, c-format msgid "phdr[%d]: extra %<PRIu64> bytes after last note\n" msgstr "" -#: src/elflint.c:4068 +#: src/elflint.c:4069 #, c-format msgid "section [%2d] '%s': no note entries defined for the type of file\n" msgstr "" -#: src/elflint.c:4075 +#: src/elflint.c:4076 #, c-format msgid "section [%2d] '%s': cannot get content of note section\n" msgstr "" -#: src/elflint.c:4078 +#: src/elflint.c:4079 #, c-format msgid "section [%2d] '%s': extra %<PRIu64> bytes after last note\n" msgstr "" -#: src/elflint.c:4096 +#: src/elflint.c:4097 #, c-format msgid "" "only executables, shared objects, and core files can have program headers\n" msgstr "" -#: src/elflint.c:4111 +#: src/elflint.c:4112 #, c-format msgid "cannot get program header entry %d: %s\n" msgstr "" -#: src/elflint.c:4120 +#: src/elflint.c:4121 #, c-format msgid "program header entry %d: unknown program header entry type %#<PRIx64>\n" msgstr "" -#: src/elflint.c:4131 +#: src/elflint.c:4132 #, c-format msgid "more than one INTERP entry in program header\n" msgstr "" -#: src/elflint.c:4139 +#: src/elflint.c:4140 #, c-format msgid "more than one TLS entry in program header\n" msgstr "" -#: src/elflint.c:4146 +#: src/elflint.c:4147 #, c-format msgid "static executable cannot have dynamic sections\n" msgstr "" -#: src/elflint.c:4160 +#: src/elflint.c:4161 #, c-format msgid "dynamic section reference in program header has wrong offset\n" msgstr "" -#: src/elflint.c:4163 +#: src/elflint.c:4164 #, c-format msgid "dynamic section size mismatch in program and section header\n" msgstr "" -#: src/elflint.c:4173 +#: src/elflint.c:4174 #, c-format msgid "more than one GNU_RELRO entry in program header\n" msgstr "" -#: src/elflint.c:4194 +#: src/elflint.c:4195 #, c-format msgid "loadable segment GNU_RELRO applies to is not writable\n" msgstr "" -#: src/elflint.c:4197 +#: src/elflint.c:4198 #, c-format msgid "loadable segment [%u] flags do not match GNU_RELRO [%u] flags\n" msgstr "" -#: src/elflint.c:4205 src/elflint.c:4228 +#: src/elflint.c:4206 src/elflint.c:4229 #, c-format msgid "%s segment not contained in a loaded segment\n" msgstr "" -#: src/elflint.c:4234 +#: src/elflint.c:4235 #, c-format msgid "program header offset in ELF header and PHDR entry do not match" msgstr "" -#: src/elflint.c:4258 +#: src/elflint.c:4259 #, c-format msgid "call frame search table reference in program header has wrong offset\n" msgstr "" -#: src/elflint.c:4261 +#: src/elflint.c:4262 #, c-format msgid "call frame search table size mismatch in program and section header\n" msgstr "" -#: src/elflint.c:4274 +#: src/elflint.c:4275 #, c-format msgid "PT_GNU_EH_FRAME present but no .eh_frame_hdr section\n" msgstr "" -#: src/elflint.c:4282 +#: src/elflint.c:4283 #, c-format msgid "call frame search table must be allocated\n" msgstr "" -#: src/elflint.c:4285 +#: src/elflint.c:4286 #, c-format msgid "section [%2zu] '%s' must be allocated\n" msgstr "" -#: src/elflint.c:4289 +#: src/elflint.c:4290 #, c-format msgid "call frame search table must not be writable\n" msgstr "" -#: src/elflint.c:4292 +#: src/elflint.c:4293 #, c-format msgid "section [%2zu] '%s' must not be writable\n" msgstr "" -#: src/elflint.c:4297 +#: src/elflint.c:4298 #, c-format msgid "call frame search table must not be executable\n" msgstr "" -#: src/elflint.c:4300 +#: src/elflint.c:4301 #, c-format msgid "section [%2zu] '%s' must not be executable\n" msgstr "" -#: src/elflint.c:4311 +#: src/elflint.c:4312 #, c-format msgid "program header entry %d: file size greater than memory size\n" msgstr "" -#: src/elflint.c:4318 +#: src/elflint.c:4319 #, c-format msgid "program header entry %d: alignment not a power of 2\n" msgstr "" -#: src/elflint.c:4321 +#: src/elflint.c:4322 #, c-format msgid "" "program header entry %d: file offset and virtual address not module of " "alignment\n" msgstr "" -#: src/elflint.c:4334 +#: src/elflint.c:4335 #, c-format msgid "" "executable/DSO with .eh_frame_hdr section does not have a PT_GNU_EH_FRAME " "program header entry" msgstr "" -#: src/elflint.c:4368 +#: src/elflint.c:4369 #, c-format msgid "cannot read ELF header: %s\n" msgstr "" -#: src/elflint.c:4394 +#: src/elflint.c:4395 #, c-format msgid "text relocation flag set but not needed\n" msgstr "" @@ -5215,288 +5215,288 @@ msgstr "" msgid "mprotect failed" msgstr "" -#: src/unstrip.c:77 +#: src/unstrip.c:78 msgid "Match MODULE against file names, not module names" msgstr "" -#: src/unstrip.c:78 +#: src/unstrip.c:79 msgid "Silently skip unfindable files" msgstr "" -#: src/unstrip.c:81 +#: src/unstrip.c:82 msgid "Place output into FILE" msgstr "" -#: src/unstrip.c:83 +#: src/unstrip.c:84 msgid "Create multiple output files under DIRECTORY" msgstr "" -#: src/unstrip.c:84 +#: src/unstrip.c:85 msgid "Use module rather than file names" msgstr "" -#: src/unstrip.c:86 +#: src/unstrip.c:87 msgid "Create output for modules that have no separate debug information" msgstr "" -#: src/unstrip.c:89 +#: src/unstrip.c:90 msgid "Apply relocations to section contents in ET_REL files" msgstr "" -#: src/unstrip.c:91 +#: src/unstrip.c:92 msgid "Only list module and file names, build IDs" msgstr "" -#: src/unstrip.c:133 +#: src/unstrip.c:134 #, c-format msgid "-d option specified twice" msgstr "" -#: src/unstrip.c:165 +#: src/unstrip.c:166 #, c-format msgid "only one of -o or -d allowed" msgstr "" -#: src/unstrip.c:174 +#: src/unstrip.c:175 #, c-format msgid "-n cannot be used with explicit files or -o or -d" msgstr "" -#: src/unstrip.c:189 +#: src/unstrip.c:190 #, c-format msgid "output directory '%s'" msgstr "" -#: src/unstrip.c:198 +#: src/unstrip.c:199 #, c-format msgid "exactly two file arguments are required" msgstr "" -#: src/unstrip.c:204 +#: src/unstrip.c:205 #, c-format msgid "-m, -a, -R, and -i options not allowed with explicit files" msgstr "" -#: src/unstrip.c:217 +#: src/unstrip.c:218 #, c-format msgid "-o or -d is required when using implicit files" msgstr "" -#: src/unstrip.c:253 +#: src/unstrip.c:254 #, c-format msgid "cannot create ELF header: %s" msgstr "" -#: src/unstrip.c:258 +#: src/unstrip.c:259 #, c-format msgid "cannot copy ELF header: %s" msgstr "" -#: src/unstrip.c:263 src/unstrip.c:1816 +#: src/unstrip.c:264 src/unstrip.c:1817 #, c-format msgid "cannot create program headers: %s" msgstr "" -#: src/unstrip.c:269 +#: src/unstrip.c:270 #, c-format msgid "cannot copy program header: %s" msgstr "" -#: src/unstrip.c:279 +#: src/unstrip.c:280 #, c-format msgid "cannot copy section header: %s" msgstr "" -#: src/unstrip.c:282 src/unstrip.c:1504 +#: src/unstrip.c:283 src/unstrip.c:1505 #, c-format msgid "cannot get section data: %s" msgstr "" -#: src/unstrip.c:284 src/unstrip.c:1506 +#: src/unstrip.c:285 src/unstrip.c:1507 #, c-format msgid "cannot copy section data: %s" msgstr "" -#: src/unstrip.c:308 +#: src/unstrip.c:309 #, c-format msgid "cannot create directory '%s'" msgstr "" -#: src/unstrip.c:348 src/unstrip.c:762 src/unstrip.c:1539 +#: src/unstrip.c:349 src/unstrip.c:763 src/unstrip.c:1540 #, c-format msgid "cannot get symbol table entry: %s" msgstr "" -#: src/unstrip.c:364 src/unstrip.c:579 src/unstrip.c:600 src/unstrip.c:612 -#: src/unstrip.c:1560 src/unstrip.c:1690 src/unstrip.c:1714 +#: src/unstrip.c:365 src/unstrip.c:580 src/unstrip.c:601 src/unstrip.c:613 +#: src/unstrip.c:1561 src/unstrip.c:1691 src/unstrip.c:1715 #, c-format msgid "cannot update symbol table: %s" msgstr "" -#: src/unstrip.c:381 src/unstrip.c:431 src/unstrip.c:561 src/unstrip.c:1208 -#: src/unstrip.c:1524 src/unstrip.c:1719 src/unstrip.c:1790 +#: src/unstrip.c:382 src/unstrip.c:432 src/unstrip.c:562 src/unstrip.c:1209 +#: src/unstrip.c:1525 src/unstrip.c:1720 src/unstrip.c:1791 #, c-format msgid "cannot update section header: %s" msgstr "" -#: src/unstrip.c:407 src/unstrip.c:418 +#: src/unstrip.c:408 src/unstrip.c:419 #, c-format msgid "cannot update relocation: %s" msgstr "" -#: src/unstrip.c:506 +#: src/unstrip.c:507 #, c-format msgid "cannot get symbol version: %s" msgstr "" -#: src/unstrip.c:518 +#: src/unstrip.c:519 #, c-format msgid "unexpected section type in [%Zu] with sh_link to symtab" msgstr "" -#: src/unstrip.c:768 +#: src/unstrip.c:769 #, c-format msgid "invalid string offset in symbol [%Zu]" msgstr "" -#: src/unstrip.c:910 src/unstrip.c:1247 +#: src/unstrip.c:911 src/unstrip.c:1248 #, c-format msgid "cannot read section [%Zu] name: %s" msgstr "" -#: src/unstrip.c:951 src/unstrip.c:970 src/unstrip.c:1003 +#: src/unstrip.c:952 src/unstrip.c:971 src/unstrip.c:1004 #, c-format msgid "cannot read '.gnu.prelink_undo' section: %s" msgstr "" -#: src/unstrip.c:991 +#: src/unstrip.c:992 #, c-format msgid "invalid contents in '%s' section" msgstr "" -#: src/unstrip.c:1046 src/unstrip.c:1369 +#: src/unstrip.c:1047 src/unstrip.c:1370 #, c-format msgid "cannot find matching section for [%Zu] '%s'" msgstr "" -#: src/unstrip.c:1170 src/unstrip.c:1185 src/unstrip.c:1450 +#: src/unstrip.c:1171 src/unstrip.c:1186 src/unstrip.c:1451 #, c-format msgid "cannot add section name to string table: %s" msgstr "" -#: src/unstrip.c:1194 +#: src/unstrip.c:1195 #, c-format msgid "cannot update section header string table data: %s" msgstr "" -#: src/unstrip.c:1222 src/unstrip.c:1226 +#: src/unstrip.c:1223 src/unstrip.c:1227 #, c-format msgid "cannot get section header string table section index: %s" msgstr "" -#: src/unstrip.c:1230 src/unstrip.c:1234 src/unstrip.c:1465 +#: src/unstrip.c:1231 src/unstrip.c:1235 src/unstrip.c:1466 #, c-format msgid "cannot get section count: %s" msgstr "" -#: src/unstrip.c:1292 src/unstrip.c:1384 +#: src/unstrip.c:1293 src/unstrip.c:1385 #, c-format msgid "cannot read section header string table: %s" msgstr "" -#: src/unstrip.c:1444 +#: src/unstrip.c:1445 #, c-format msgid "cannot add new section: %s" msgstr "" -#: src/unstrip.c:1547 +#: src/unstrip.c:1548 #, c-format msgid "symbol [%Zu] has invalid section index" msgstr "" -#: src/unstrip.c:1799 +#: src/unstrip.c:1800 #, c-format msgid "cannot get ELF header: %s" msgstr "" -#: src/unstrip.c:1826 +#: src/unstrip.c:1827 #, c-format msgid "cannot update program header: %s" msgstr "" -#: src/unstrip.c:1831 src/unstrip.c:1910 +#: src/unstrip.c:1832 src/unstrip.c:1911 #, c-format msgid "cannot write output file: %s" msgstr "" -#: src/unstrip.c:1879 +#: src/unstrip.c:1880 #, c-format msgid "DWARF data not adjusted for prelinking bias; consider prelink -u" msgstr "" -#: src/unstrip.c:1882 +#: src/unstrip.c:1883 #, c-format msgid "" "DWARF data in '%s' not adjusted for prelinking bias; consider prelink -u" msgstr "" -#: src/unstrip.c:1901 src/unstrip.c:1941 src/unstrip.c:1953 src/unstrip.c:2033 +#: src/unstrip.c:1902 src/unstrip.c:1942 src/unstrip.c:1954 src/unstrip.c:2034 #, c-format msgid "cannot create ELF descriptor: %s" msgstr "" -#: src/unstrip.c:1959 +#: src/unstrip.c:1960 #, c-format msgid "'%s' and '%s' do not seem to match" msgstr "" -#: src/unstrip.c:1990 +#: src/unstrip.c:1991 #, c-format msgid "cannot find stripped file for module '%s': %s" msgstr "" -#: src/unstrip.c:1994 +#: src/unstrip.c:1995 #, c-format msgid "cannot open stripped file '%s' for module '%s': %s" msgstr "" -#: src/unstrip.c:2009 +#: src/unstrip.c:2010 #, c-format msgid "cannot find debug file for module '%s': %s" msgstr "" -#: src/unstrip.c:2013 +#: src/unstrip.c:2014 #, c-format msgid "cannot open debug file '%s' for module '%s': %s" msgstr "" -#: src/unstrip.c:2026 +#: src/unstrip.c:2027 #, c-format msgid "module '%s' file '%s' is not stripped" msgstr "" -#: src/unstrip.c:2057 +#: src/unstrip.c:2058 #, c-format msgid "cannot cache section addresses for module '%s': %s" msgstr "" -#: src/unstrip.c:2190 +#: src/unstrip.c:2191 #, c-format msgid "no matching modules found" msgstr "" -#: src/unstrip.c:2199 +#: src/unstrip.c:2200 #, c-format msgid "matched more than one module" msgstr "" -#: src/unstrip.c:2246 +#: src/unstrip.c:2247 msgid "" "STRIPPED-FILE DEBUG-FILE\n" "[MODULE...]" msgstr "" -#: src/unstrip.c:2247 +#: src/unstrip.c:2248 msgid "" "Combine stripped files with separate symbols and debug information.\vThe " "first form puts the result in DEBUG-FILE if -o was not given.\n" diff --git a/elfutils/src/ChangeLog b/elfutils/src/ChangeLog index c4b5b053..0b7c51a6 100644 --- a/elfutils/src/ChangeLog +++ b/elfutils/src/ChangeLog @@ -1,3 +1,26 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + + * readelf.c (print_debug_frame_section): Add a cast to avoid sign + mismatch in comparison. + +2010-02-02 Roland McGrath <roland@redhat.com> + + * readelf.c (print_encoding_base): Handle DW_EH_PE_absptr (zero). + (read_encoded): Likewise. + (print_debug_frame_section): Check for bogus augmentation length. + For P augmentation, use read_encoded, print the encoding description, + and use hex for unsigned values. + +2010-01-15 Roland McGrath <roland@redhat.com> + + * ar.c: Include <sys/stat.h>. + * elflint.c: Likewise. + * readelf.c: Likewise. + * strip.c: Likewise. + * unstrip.c: Likewise + 2010-01-07 Roland McGrath <roland@redhat.com> * readelf.c (print_ehdr): Handle PN_XNUM. diff --git a/elfutils/src/Makefile.am b/elfutils/src/Makefile.am index 9b7d7f0f..afd3bd3a 100644 --- a/elfutils/src/Makefile.am +++ b/elfutils/src/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 1996-2002, 2003, 2004, 2005, 2006, 2007, 2009 Red Hat, Inc. +## Copyright (C) 1996-2010 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -24,24 +24,17 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \ - -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" -if MUDFLAP -AM_CFLAGS = -fmudflap -else -AM_CFLAGS = -endif -AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \ - $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ - $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(CFLAGS_$(*F)) - -INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \ - -I$(srcdir)/../libasm -I$(srcdir)/../lib -I.. +include $(top_srcdir)/config/eu.am +DEFS += $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \ + -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" +INCLUDES += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \ + -I$(srcdir)/../libasm AM_LDFLAGS = -Wl,-rpath-link,../libelf:../libdw +no_mudflap.os = -fmudflap + YACC = @YACC@ -d AM_YFLAGS = -pld AM_LFLAGS = -Pld -olex.yy.c @@ -70,8 +63,6 @@ noinst_LIBRARIES += libdummy.a libdummy_a_SOURCES = i386_ld.c endif -textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi - ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \ versionhash.c @@ -87,11 +78,7 @@ ld_modules = i386_ld.c bin_SCRIPTS = make-debug-archive EXTRA_DIST += make-debug-archive.in -CLEANFILES = make-debug-archive - -if MUDFLAP -libmudflap = -lmudflap -endif +CLEANFILES += make-debug-archive if BUILD_STATIC libasm = ../libasm/libasm.a @@ -151,16 +138,6 @@ libld_elf_i386.so: libld_elf_i386_pic.a libld_elf_i386.map $(textrel_check) endif - -%.os: %.c %.o - if $(filter-out -fmudflap,$(COMPILE)) -c -o $@ -fpic -DPIC -DSHARED \ - -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ - `test -f '$<' || echo '$(srcdir)/'`$<; \ - then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ - rm -f "$(DEPDIR)/$*.Tpo"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi - # Special rule to make it possible to define libld_elf_a_SOURCES as we do. # Otherwise make would complain. .deps/none_ld.Po: none_ld.os @@ -183,7 +160,7 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS) done; \ done; rm -f c$${pid}_.???; exit $$bad -CLEANFILES += none_ld.os $(ld_modules:.c=.os) *.gcno *.gcda *.gconv +CLEANFILES += none_ld.os $(ld_modules:.c=.os) *.gconv MAINTAINERCLEANFILES = ldlex.c ldscript.c ldscript.h diff --git a/elfutils/src/Makefile.in b/elfutils/src/Makefile.in index 3f829e96..86d1b64b 100644 --- a/elfutils/src/Makefile.in +++ b/elfutils/src/Makefile.in @@ -37,6 +37,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \ + ldlex.c ldscript.c ylwrap +@MUDFLAP_TRUE@am__append_1 = -fmudflap bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \ strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \ findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \ @@ -45,13 +49,11 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \ @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 # -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_libld_elf_i386_pic_a_OBJECTS = subdir = src -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ChangeLog ldlex.c ldscript.c ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/zip.m4 \ @@ -112,7 +114,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$(OBJEXT) ldlex.$(OBJEXT) \ versionhash.$(OBJEXT) ld_OBJECTS = $(am_ld_OBJECTS) ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__DEPENDENCIES_1) \ - $(am__append_2) + $(am__append_3) ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \ $@ am_libld_elf_i386_so_OBJECTS = @@ -210,9 +212,9 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEBUGPRED = @DEBUGPRED@ -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \ - -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" - +DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \ + -DDEBUGPRED=@DEBUGPRED@ -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" \ + -DOBJDIR=\"$(shell pwd)\" DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -312,33 +314,34 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \ -@MUDFLAP_FALSE@ $(native_ld_cflags) $(if \ -@MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \ -@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ -@MUDFLAP_FALSE@ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ -@MUDFLAP_FALSE@ $(CFLAGS_$(*F)) -@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \ -@MUDFLAP_TRUE@ $(native_ld_cflags) $(if \ -@MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) $(if \ -@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ -@MUDFLAP_TRUE@ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ -@MUDFLAP_TRUE@ $(CFLAGS_$(*F)) -INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \ - -I$(srcdir)/../libasm -I$(srcdir)/../lib -I.. +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \ + -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \ + -I$(srcdir)/../libasm +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) +@MUDFLAP_FALSE@libmudflap = +@MUDFLAP_TRUE@libmudflap = -lmudflap +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) +CLEANFILES = *.gcno *.gcda make-debug-archive none_ld.os \ + $(ld_modules:.c=.os) *.gconv +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi AM_LDFLAGS = -Wl,-rpath-link,../libelf:../libdw +no_mudflap.os = -fmudflap AM_YFLAGS = -pld 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_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu) @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c -textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \ versionhash.c @@ -350,9 +353,6 @@ EXTRA_DIST = elf32-i386.script libld_elf_i386.map $(ld_modules) \ arlib.h debugpred.h make-debug-archive.in ld_modules = i386_ld.c bin_SCRIPTS = make-debug-archive -CLEANFILES = make-debug-archive none_ld.os $(ld_modules:.c=.os) *.gcno \ - *.gcda *.gconv -@MUDFLAP_TRUE@libmudflap = -lmudflap @BUILD_STATIC_FALSE@libasm = ../libasm/libasm.so @BUILD_STATIC_TRUE@libasm = ../libasm/libasm.a @BUILD_STATIC_FALSE@libdw = ../libdw/libdw.so @@ -372,7 +372,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl size_LDADD = $(libelf) $(libeu) $(libmudflap) strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ - $(am__append_2) + $(am__append_3) ld_LDFLAGS = -rdynamic elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) @@ -395,7 +395,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .l .o .obj .y -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/eu.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -836,6 +836,15 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS +%.os: %.c %.o +@AMDEP_TRUE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ +@AMDEP_TRUE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +@AMDEP_TRUE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*.Tpo"; \ +@AMDEP_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< + ldlex.o: ldscript.c ldscript.h: ldscript.c @NATIVE_LD_FALSE@libld_elf_i386.so: libld_elf_i386_pic.a libld_elf_i386.map @@ -844,15 +853,6 @@ ldscript.h: ldscript.c @NATIVE_LD_FALSE@ -Wl,--version-script,$(srcdir)/libld_elf_i386.map @NATIVE_LD_FALSE@ $(textrel_check) -%.os: %.c %.o - if $(filter-out -fmudflap,$(COMPILE)) -c -o $@ -fpic -DPIC -DSHARED \ - -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ - `test -f '$<' || echo '$(srcdir)/'`$<; \ - then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ - rm -f "$(DEPDIR)/$*.Tpo"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi - # Special rule to make it possible to define libld_elf_a_SOURCES as we do. # Otherwise make would complain. .deps/none_ld.Po: none_ld.os diff --git a/elfutils/src/ar.c b/elfutils/src/ar.c index 5d7a6e76..149d116d 100644 --- a/elfutils/src/ar.c +++ b/elfutils/src/ar.c @@ -1,5 +1,5 @@ /* Create, modify, and extract from archives. - Copyright (C) 2005, 2007, 2009 Red Hat, Inc. + Copyright (C) 2005-2010 Red Hat, Inc. Written by Ulrich Drepper <drepper@redhat.com>, 2005. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -45,6 +45,7 @@ #include <time.h> #include <unistd.h> #include <sys/mman.h> +#include <sys/stat.h> #include <sys/time.h> #include <system.h> diff --git a/elfutils/src/elflint.c b/elfutils/src/elflint.c index 63d8389e..531122bf 100644 --- a/elfutils/src/elflint.c +++ b/elfutils/src/elflint.c @@ -42,6 +42,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <sys/stat.h> #include <sys/param.h> #include <elf-knowledge.h> diff --git a/elfutils/src/readelf.c b/elfutils/src/readelf.c index 44648669..7b3c4f8b 100644 --- a/elfutils/src/readelf.c +++ b/elfutils/src/readelf.c @@ -49,6 +49,7 @@ #include <time.h> #include <unistd.h> #include <sys/param.h> +#include <sys/stat.h> #include <system.h> #include "../libelf/libelfP.h" @@ -4704,8 +4705,7 @@ print_encoding_base (const char *pfx, unsigned int fde_encoding) { unsigned int w = fde_encoding; - if (w & 0xf) - w = print_encoding (w); + w = print_encoding (w); if (w & 0x70) { @@ -4727,6 +4727,10 @@ static const unsigned char * read_encoded (unsigned int encoding, const unsigned char *readp, const unsigned char *const endp, uint64_t *res, Dwarf *dbg) { + if ((encoding & 0xf) == DW_EH_PE_absptr) + encoding = gelf_getclass (dbg->elf) == ELFCLASS32 + ? DW_EH_PE_udata4 : DW_EH_PE_udata8; + switch (encoding & 0xf) { case DW_EH_PE_uleb128: @@ -4914,6 +4918,9 @@ print_debug_frame_section (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr, unsigned int augmentationlen; get_uleb128 (augmentationlen, readp); + if (augmentationlen > (size_t) (dataend - readp)) + error (1, 0, gettext ("invalid augmentation length")); + const char *hdr = "Augmentation data:"; const char *cp = augmentation + 1; while (*cp != '\0') @@ -4940,51 +4947,27 @@ print_debug_frame_section (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr, const unsigned char *startp = readp; unsigned int encoding = *readp++; uint64_t val = 0; - int64_t sval = 0; - bool is_signed = false; + readp = read_encoded (encoding, readp, + readp - 1 + augmentationlen, + &val, dbg); + + while (++startp < readp) + printf ("%#x ", *startp); + putchar ('('); + print_encoding (encoding); + putchar (' '); switch (encoding & 0xf) { - case DW_EH_PE_uleb128: - get_uleb128 (val, readp); - break; case DW_EH_PE_sleb128: - get_sleb128 (sval, readp); - is_signed = true; - break; - case DW_EH_PE_udata2: - val = read_2ubyte_unaligned_inc (dbg, readp); - break; - case DW_EH_PE_udata4: - val = read_4ubyte_unaligned_inc (dbg, readp); - break; - case DW_EH_PE_udata8: - val = read_8ubyte_unaligned_inc (dbg, readp); - break; case DW_EH_PE_sdata2: - val = read_2sbyte_unaligned_inc (dbg, readp); - is_signed = true; - break; case DW_EH_PE_sdata4: - val = read_4sbyte_unaligned_inc (dbg, readp); - is_signed = true; - break; - case DW_EH_PE_sdata8: - val = read_8sbyte_unaligned_inc (dbg, readp); - is_signed = true; + printf ("%" PRId64 ")\n", val); break; default: - error (1, 0, - gettext ("invalid augmentation encoding")); + printf ("%#" PRIx64 ")\n", val); + break; } - - while (++startp < readp) - printf ("%#x ", *startp); - - if (is_signed) - printf ("(%" PRId64 ")\n", sval); - else - printf ("(%" PRIu64 ")\n", val); } else printf ("(%x)\n", *readp++); diff --git a/elfutils/src/strip.c b/elfutils/src/strip.c index 32cf0d70..7b2b889a 100644 --- a/elfutils/src/strip.c +++ b/elfutils/src/strip.c @@ -1,5 +1,5 @@ /* Discard section not used at runtime from object files. - Copyright (C) 2000-2008, 2009 Red Hat, Inc. + Copyright (C) 2000-2010 Red Hat, Inc. This file is part of Red Hat elfutils. Written by Ulrich Drepper <drepper@redhat.com>, 2000. @@ -46,6 +46,7 @@ #include <string.h> #include <unistd.h> #include <sys/param.h> +#include <sys/stat.h> #include <sys/time.h> #include <elf-knowledge.h> diff --git a/elfutils/src/unstrip.c b/elfutils/src/unstrip.c index 284607b3..0984e6bc 100644 --- a/elfutils/src/unstrip.c +++ b/elfutils/src/unstrip.c @@ -1,5 +1,5 @@ /* Combine stripped files with separate symbols and debug information. - Copyright (C) 2007, 2009 Red Hat, Inc. + Copyright (C) 2007-2010 Red Hat, Inc. This file is part of Red Hat elfutils. Written by Roland McGrath <roland@redhat.com>, 2007. @@ -52,6 +52,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <sys/stat.h> #include <gelf.h> #include <libebl.h> diff --git a/elfutils/tests/ChangeLog b/elfutils/tests/ChangeLog index 87654d60..c871baa1 100644 --- a/elfutils/tests/ChangeLog +++ b/elfutils/tests/ChangeLog @@ -1,3 +1,9 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + + * asm-tst9.c (main): Rename local to avoid shadowing another local. + 2009-07-22 Roland McGrath <roland@redhat.com> * addrcfi.c: Update dwarf_frame_{cfa,register} calling convention. diff --git a/elfutils/tests/Makefile.am b/elfutils/tests/Makefile.am index 54d2c61a..1b9bc73b 100644 --- a/elfutils/tests/Makefile.am +++ b/elfutils/tests/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 1996-2009 Red Hat, Inc. +## Copyright (C) 1996-2010 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -24,26 +24,22 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE +include $(top_srcdir)/config/eu.am if MUDFLAP -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ - $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) BUILD_RPATH = \$$ORIGIN/../backends else -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ - $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf endif AM_LDFLAGS = if !STANDALONE -INCLUDES = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ - -I$(top_srcdir)/libdwfl \ - -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \ - -I$(top_srcdir)/lib -I.. +INCLUDES += -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ + -I$(top_srcdir)/libdwfl \ + -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \ + -I$(top_srcdir)/lib -I.. AM_LDFLAGS += -Wl,-rpath-link,../libasm:../libdw:../libelf -endif !STANDALONE +endif if TESTS_RPATH AM_LDFLAGS += -Wl,-rpath,$(BUILT_RPATH) @@ -161,7 +157,6 @@ endif !STANDALONE if MUDFLAP static_build = yes -libmudflap = -lmudflap endif if STANDALONE @@ -233,11 +228,9 @@ dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl sha1_tst_LDADD = $(libeu) $(libmudflap) -dwarf_getmacros_LDADD = $(libdw) +dwarf_getmacros_LDADD = $(libdw) $(libmudflap) addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -CLEANFILES = xxx *.gcno *.gcda *gconv - if GCOV check: check-am coverage .PHONY: coverage diff --git a/elfutils/tests/Makefile.in b/elfutils/tests/Makefile.in index 9c3ceec2..c6766a80 100644 --- a/elfutils/tests/Makefile.in +++ b/elfutils/tests/Makefile.in @@ -34,8 +34,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@STANDALONE_FALSE@am__append_1 = -Wl,-rpath-link,../libasm:../libdw:../libelf -@TESTS_RPATH_TRUE@am__append_2 = -Wl,-rpath,$(BUILT_RPATH) +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/eu.am ChangeLog +@MUDFLAP_TRUE@am__append_1 = -fmudflap +@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ +@STANDALONE_FALSE@ -I$(top_srcdir)/libdwfl \ +@STANDALONE_FALSE@ -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \ +@STANDALONE_FALSE@ -I$(top_srcdir)/lib -I.. + +@STANDALONE_FALSE@am__append_3 = -Wl,-rpath-link,../libasm:../libdw:../libelf +@TESTS_RPATH_TRUE@am__append_4 = -Wl,-rpath,$(BUILT_RPATH) noinst_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \ newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \ sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \ @@ -74,12 +82,11 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \ run-disasm-x86.sh run-disasm-x86-64.sh run-early-offscn.sh \ run-dwarf-getmacros.sh $(am__EXEEXT_1) $(am__EXEEXT_3) # run-show-ciefde.sh -@STANDALONE_FALSE@am__append_3 = msg_tst sha1-tst -@STANDALONE_FALSE@am__append_4 = msg_tst sha1-tst -@HAVE_LIBASM_TRUE@am__append_5 = $(asm_TESTS) -@HAVE_LIBASM_TRUE@am__append_6 = $(asm_TESTS) +@STANDALONE_FALSE@am__append_5 = msg_tst sha1-tst +@STANDALONE_FALSE@am__append_6 = msg_tst sha1-tst +@HAVE_LIBASM_TRUE@am__append_7 = $(asm_TESTS) +@HAVE_LIBASM_TRUE@am__append_8 = $(asm_TESTS) subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/zip.m4 \ @@ -174,7 +181,8 @@ asm_tst9_DEPENDENCIES = $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) dwarf_getmacros_SOURCES = dwarf-getmacros.c dwarf_getmacros_OBJECTS = dwarf-getmacros.$(OBJEXT) -dwarf_getmacros_DEPENDENCIES = $(am__DEPENDENCIES_4) +dwarf_getmacros_DEPENDENCIES = $(am__DEPENDENCIES_4) \ + $(am__DEPENDENCIES_1) dwfl_addr_sect_SOURCES = dwfl-addr-sect.c dwfl_addr_sect_OBJECTS = dwfl-addr-sect.$(OBJEXT) dwfl_addr_sect_DEPENDENCIES = $(am__DEPENDENCIES_4) \ @@ -345,7 +353,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEBUGPRED = @DEBUGPRED@ -DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE +DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -445,20 +453,22 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ -@MUDFLAP_FALSE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - -@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ -@MUDFLAP_TRUE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) +INCLUDES = -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) +@MUDFLAP_FALSE@libmudflap = +@MUDFLAP_TRUE@libmudflap = -lmudflap +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ + $(COMPILE)) +CLEANFILES = *.gcno *.gcda +textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends @MUDFLAP_FALSE@BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf -AM_LDFLAGS = $(am__append_1) $(am__append_2) -@STANDALONE_FALSE@INCLUDES = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ -@STANDALONE_FALSE@ -I$(top_srcdir)/libdwfl \ -@STANDALONE_FALSE@ -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \ -@STANDALONE_FALSE@ -I$(top_srcdir)/lib -I.. - +AM_LDFLAGS = $(am__append_3) $(am__append_4) @TESTS_RPATH_FALSE@tests_rpath = no @TESTS_RPATH_TRUE@tests_rpath = yes asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \ @@ -519,7 +529,6 @@ installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir) \ @STANDALONE_TRUE@TESTS_ENVIRONMENT = $(installed_TESTS_ENVIRONMENT) @MUDFLAP_TRUE@static_build = yes -@MUDFLAP_TRUE@libmudflap = -lmudflap @BUILD_STATIC_FALSE@@STANDALONE_FALSE@libdw = ../libdw/libdw.so @BUILD_STATIC_TRUE@@STANDALONE_FALSE@libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) $(libebl) -ldl @STANDALONE_TRUE@libdw = -ldw @@ -582,14 +591,13 @@ dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl sha1_tst_LDADD = $(libeu) $(libmudflap) -dwarf_getmacros_LDADD = $(libdw) +dwarf_getmacros_LDADD = $(libdw) $(libmudflap) addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -CLEANFILES = xxx *.gcno *.gcda *gconv all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/eu.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1135,6 +1143,15 @@ uninstall-am: tags uninstall uninstall-am +%.os: %.c %.o +@AMDEP_TRUE@ if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ +@AMDEP_TRUE@ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +@AMDEP_TRUE@ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*.Tpo"; \ +@AMDEP_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED $< + @STANDALONE_FALSE@installcheck-local: @STANDALONE_FALSE@ $(MAKE) $(AM_MAKEFLAGS) \ @STANDALONE_FALSE@ TESTS_ENVIRONMENT='$(installed_TESTS_ENVIRONMENT)' check-TESTS diff --git a/elfutils/tests/asm-tst9.c b/elfutils/tests/asm-tst9.c index 1797e48c..ad252759 100644 --- a/elfutils/tests/asm-tst9.c +++ b/elfutils/tests/asm-tst9.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2005 Red Hat, Inc. +/* Copyright (C) 2002-2010 Red Hat, Inc. This file is part of Red Hat elfutils. Written by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -211,19 +211,19 @@ main (void) for (cnt = 1; cnt < 3; ++cnt) { - Elf_Scn *scn; + Elf_Scn *escn; GElf_Shdr shdr_mem; GElf_Shdr *shdr; - scn = elf_getscn (elf, cnt); - if (scn == NULL) + escn = elf_getscn (elf, cnt); + if (escn == NULL) { printf ("cannot get section %Zd: %s\n", cnt, elf_errmsg (-1)); result = 1; continue; } - shdr = gelf_getshdr (scn, &shdr_mem); + shdr = gelf_getshdr (escn, &shdr_mem); if (shdr == NULL) { printf ("cannot get section header for section %Zd: %s\n", @@ -303,7 +303,7 @@ main (void) if (cnt == 1) { - Elf_Data *data = elf_getdata (scn, NULL); + Elf_Data *data = elf_getdata (escn, NULL); if (data == NULL) { diff --git a/elfutils/version.h b/elfutils/version.h index 2672ea8d..9f97d57e 100644 --- a/elfutils/version.h +++ b/elfutils/version.h @@ -50,7 +50,7 @@ #ifndef _ELFUTILS_VERSION_H #define _ELFUTILS_VERSION_H 1 -#define _ELFUTILS_VERSION 144 +#define _ELFUTILS_VERSION 145 #define _ELFUTILS_PREREQ(major, minor) \ (_ELFUTILS_VERSION >= ((major) * 1000 + (minor))) |