Merge tag '0.151-1'

87 files changed, 2696 insertions, 1643 deletions

diff --git a/elfutils-0.149-rh-portability.patch b/elfutils-0.151-rh-portability.patch
index 772ef91d..eac700c9 100644
--- a/elfutils-0.149-rh-portability.patch
+++ b/elfutils-0.151-rh-portability.patch
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -106,6 +106,10 @@
+@@ -111,6 +111,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
-@@ -433,6 +437,11 @@
+@@ -438,6 +442,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.
-@@ -455,6 +464,9 @@
+@@ -460,6 +469,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -633,7 +633,7 @@
  @MUDFLAP_FALSE@libmudflap = 
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -299,6 +299,10 @@
+@@ -308,6 +308,10 @@
  
  	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
  
@@ -644,7 +644,7 @@
  2009-08-10  Roland McGrath  <roland@redhat.com>
  
  	* dwarf_getscopevar.c: Use dwarf_diename.
-@@ -1067,6 +1071,11 @@
+@@ -1076,6 +1080,11 @@
  
  2005-05-31  Roland McGrath  <roland@redhat.com>
  
@@ -696,7 +696,7 @@
  @MUDFLAP_FALSE@libmudflap = 
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -1283,6 +1283,11 @@
+@@ -1350,6 +1350,11 @@
  
  2005-07-21  Roland McGrath  <roland@redhat.com>
  
@@ -778,7 +778,7 @@
  @MUDFLAP_FALSE@libmudflap = 
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -666,6 +666,11 @@
+@@ -671,6 +671,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -890,7 +890,7 @@
  	  break;
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -220,8 +220,16 @@
+@@ -236,8 +236,16 @@
  	* readelf.c (attr_callback): Use print_block only when we don't use
  	print_ops.
  
@@ -907,7 +907,7 @@
  	* ar.c (do_oper_extract): Use pathconf instead of statfs.
  
  2009-08-01  Ulrich Drepper  <drepper@redhat.com>
-@@ -385,6 +393,8 @@
+@@ -401,6 +409,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -916,7 +916,7 @@
  2009-01-21  Ulrich Drepper  <drepper@redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -568,6 +578,11 @@
+@@ -584,6 +594,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -928,7 +928,7 @@
  2008-02-29  Roland McGrath  <roland@redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -819,6 +834,8 @@
+@@ -835,6 +850,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -937,7 +937,7 @@
  2007-10-15  Roland McGrath  <roland@redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -1258,6 +1275,10 @@
+@@ -1274,6 +1291,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0@gmx.net>.
  
@@ -948,7 +948,7 @@
  2006-08-08  Ulrich Drepper  <drepper@redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1334,6 +1355,10 @@
+@@ -1350,6 +1371,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -959,7 +959,7 @@
  2006-06-12  Ulrich Drepper  <drepper@redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1682,6 +1707,11 @@
+@@ -1698,6 +1723,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -973,7 +973,7 @@
  	* readelf.c (print_debug_line_section): Print section offset of each
 --- elfutils/src/findtextrel.c
 +++ elfutils/src/findtextrel.c
-@@ -490,7 +490,11 @@ ptrcompare (const void *p1, const void *
+@@ -504,7 +504,11 @@ ptrcompare (const void *p1, const void *
  
  
  static void
@@ -1145,7 +1145,7 @@
  
  /* Name and version of program.  */
  static void print_version (FILE *stream, struct argp_state *state);
-@@ -301,8 +307,18 @@ process_file (const char *fname)
+@@ -311,8 +317,18 @@ process_file (const char *fname)
  
        /* If we have to preserve the timestamp, we need it in the
  	 format utimes() understands.  */
@@ -1164,7 +1164,7 @@
      }
  
    /* Open the file.  */
-@@ -1747,7 +1763,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1809,7 +1825,7 @@ while computing checksum for debug infor
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -1173,7 +1173,7 @@
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -1804,7 +1820,7 @@ handle_ar (int fd, Elf *elf, const char 
+@@ -1866,7 +1882,7 @@ handle_ar (int fd, Elf *elf, const char 
  
    if (tvp != NULL)
      {
@@ -1184,7 +1184,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -154,6 +154,8 @@
+@@ -197,6 +197,8 @@
  
  2008-01-21  Roland McGrath  <roland@redhat.com>
  
@@ -1193,7 +1193,7 @@
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -862,6 +864,11 @@
+@@ -905,6 +907,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
diff --git a/elfutils-0.149-rh-robustify.patch b/elfutils-0.151-rh-robustify.patch
index e65b48e5..19764cbb 100644
--- a/elfutils-0.149-rh-robustify.patch
+++ b/elfutils-0.151-rh-robustify.patch
@@ -1,6 +1,6 @@
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -658,10 +658,53 @@
+@@ -663,10 +663,53 @@
  	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.
  
@@ -865,7 +865,7 @@
  #endif  /* libelfP.h */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1670,6 +1670,16 @@
+@@ -1686,6 +1686,16 @@
  	object symbols or symbols with unknown type.
  	(check_rel): Likewise.
  
@@ -882,7 +882,7 @@
  2005-06-08  Roland McGrath  <roland@redhat.com>
  
  	* readelf.c (print_ops): Add consts.
-@@ -1715,6 +1725,19 @@
+@@ -1731,6 +1741,19 @@
  
  	* readelf.c (dwarf_tag_string): Add new tags.
  
@@ -1392,7 +1392,7 @@
  		    "\
 --- elfutils/src/strip.c
 +++ elfutils/src/strip.c
-@@ -545,6 +545,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -555,6 +555,11 @@ handle_elf (int fd, Elf *elf, const char
        goto fail_close;
      }
  
@@ -1404,7 +1404,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.
-@@ -566,7 +571,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -576,7 +581,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).  */
@@ -1413,7 +1413,7 @@
  
        shdr_info[cnt].scn = scn;
  
-@@ -579,6 +584,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -589,6 +594,7 @@ handle_elf (int fd, Elf *elf, const char
  					shdr_info[cnt].shdr.sh_name);
        if (shdr_info[cnt].name == NULL)
  	{
@@ -1421,7 +1421,7 @@
  	  error (0, 0, gettext ("illformed file '%s'"), fname);
  	  goto fail_close;
  	}
-@@ -588,6 +594,8 @@ handle_elf (int fd, Elf *elf, const char
+@@ -598,6 +604,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;
@@ -1430,7 +1430,7 @@
  
        /* Sections in files other than relocatable object files which
  	 are not loaded can be freely moved by us.  In relocatable
-@@ -600,7 +608,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -610,7 +618,7 @@ handle_elf (int fd, Elf *elf, const char
  	 appropriate reference.  */
        if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX))
  	{
@@ -1439,7 +1439,7 @@
  	  shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt;
  	}
        else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP))
-@@ -617,7 +625,12 @@ handle_elf (int fd, Elf *elf, const char
+@@ -627,7 +635,12 @@ handle_elf (int fd, Elf *elf, const char
  	  for (inner = 1;
  	       inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word);
  	       ++inner)
@@ -1452,7 +1452,7 @@
  
  	  if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0))
  	    /* If the section group contains only one element and this
-@@ -628,7 +641,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -638,7 +651,7 @@ handle_elf (int fd, Elf *elf, const char
  	}
        else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym))
  	{
@@ -1461,7 +1461,7 @@
  	  shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt;
  	}
  
-@@ -636,7 +649,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -646,7 +659,7 @@ handle_elf (int fd, Elf *elf, const char
  	 discarded right away.  */
        if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0)
  	{
@@ -1470,7 +1470,7 @@
  
  	  if (shdr_info[shdr_info[cnt].group_idx].idx == 0)
  	    {
-@@ -711,11 +724,15 @@ handle_elf (int fd, Elf *elf, const char
+@@ -722,11 +735,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.  */
@@ -1488,7 +1488,7 @@
  
  	  if (shdr_info[cnt].idx == 1)
  	    {
-@@ -742,7 +759,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -753,7 +770,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)
  		    {
@@ -1497,7 +1497,7 @@
  
  		      shdr_info[shdr_info[cnt].symtab_idx].data
  			= elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
-@@ -782,6 +799,9 @@ handle_elf (int fd, Elf *elf, const char
+@@ -793,6 +810,9 @@ handle_elf (int fd, Elf *elf, const char
  		      else if (scnidx == SHN_XINDEX)
  			scnidx = xndx;
  
@@ -1507,7 +1507,7 @@
  		      if (shdr_info[scnidx].idx == 0)
  			/* This symbol table has a real symbol in
  			   a discarded section.  So preserve the
-@@ -812,12 +832,16 @@ handle_elf (int fd, Elf *elf, const char
+@@ -823,12 +843,16 @@ handle_elf (int fd, Elf *elf, const char
  		}
  
  	      /* Handle references through sh_info.  */
@@ -1526,7 +1526,7 @@
  
  	      /* Mark the section as investigated.  */
  	      shdr_info[cnt].idx = 2;
-@@ -956,7 +980,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -967,7 +991,7 @@ handle_elf (int fd, Elf *elf, const char
  	  error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),
  		 elf_errmsg (-1));
  
@@ -1535,7 +1535,7 @@
  
  	/* Add this name to the section header string table.  */
  	shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);
-@@ -993,7 +1017,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1004,7 +1028,7 @@ handle_elf (int fd, Elf *elf, const char
  	error (EXIT_FAILURE, 0,
  	       gettext ("while create section header section: %s"),
  	       elf_errmsg (-1));
@@ -1544,7 +1544,7 @@
  
        shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);
        if (shdr_info[cnt].data == NULL)
-@@ -1049,7 +1073,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1060,7 +1084,7 @@ handle_elf (int fd, Elf *elf, const char
      error (EXIT_FAILURE, 0,
  	   gettext ("while create section header section: %s"),
  	   elf_errmsg (-1));
@@ -1553,7 +1553,7 @@
  
    /* Finalize the string table and fill in the correct indices in the
       section headers.  */
-@@ -1139,20 +1163,20 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1150,20 +1174,20 @@ handle_elf (int fd, Elf *elf, const char
  		    shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
  					     NULL);
  
@@ -1577,7 +1577,7 @@
  			    >= shdr_info[cnt].data->d_size / elsize);
  		  }
  
-@@ -1207,7 +1231,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1218,7 +1242,7 @@ handle_elf (int fd, Elf *elf, const char
  		      sec = shdr_info[sym->st_shndx].idx;
  		    else
  		      {
@@ -1586,7 +1586,7 @@
  
  			sec = shdr_info[xshndx].idx;
  		      }
-@@ -1228,7 +1252,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1239,7 +1263,7 @@ handle_elf (int fd, Elf *elf, const char
  			    nxshndx = sec;
  			  }
  
@@ -1595,7 +1595,7 @@
  
  			if ((inner != destidx || nshndx != sym->st_shndx
  			     || (shndxdata != NULL && nxshndx != xshndx))
-@@ -1252,7 +1276,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1263,7 +1287,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.  */
@@ -1604,7 +1604,7 @@
  		  }
  
  		if (destidx != inner)
-@@ -1439,11 +1463,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1450,11 +1474,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
@@ -1618,7 +1618,7 @@
  		    size_t hidx = elf_hash (name) % nbucket;
  
  		    if (bucket[hidx] == 0)
-@@ -1462,7 +1486,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1473,7 +1497,7 @@ handle_elf (int fd, Elf *elf, const char
  	    else
  	      {
  		/* Alpha and S390 64-bit use 64-bit SHT_HASH entries.  */
@@ -1627,7 +1627,7 @@
  			== sizeof (Elf64_Xword));
  
  		Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
-@@ -1493,11 +1517,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1504,11 +1528,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 31308e28..c465acb3 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,17 +1,17 @@
 Name: elfutils
-Version: 0.149
-Release: alt2
+Version: 0.151
+Release: alt1
 
 Summary: A collection of utilities and DSOs to handle compiled objects
 License: GPLv2 with exceptions
 Group: Development/C
 URL: http://fedorahosted.org/elfutils/
 
-# http://fedorahosted.org/releases/e/l/elfutils/%name-%version.tar.gz
+# http://fedorahosted.org/releases/e/l/elfutils/%version/%name-%version.tar.bz2
 Source: %name-%version.tar
 
-Patch1: elfutils-0.149-rh-portability.patch
-Patch2: elfutils-0.149-rh-robustify.patch
+Patch1: elfutils-0.151-rh-portability.patch
+Patch2: elfutils-0.151-rh-robustify.patch
 Patch3: elfutils-0.147-alt-findtextrel.patch
 Patch4: elfutils-0.147-alt-osabi.patch
 Patch5: elfutils-0.147-alt-bss.patch
diff --git a/elfutils/INSTALL b/elfutils/INSTALL
index 2550dab7..7d1c323b 100644
--- a/elfutils/INSTALL
+++ b/elfutils/INSTALL
@@ -4,8 +4,10 @@ Installation Instructions
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@ Basic Installation
    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.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@ may remove or edit it.
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@ 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
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@ Installation Names
    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'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    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
@@ -152,6 +208,13 @@ 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.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -288,7 +351,7 @@ operates.
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 
diff --git a/elfutils/NEWS b/elfutils/NEWS
index dd739638..f76b8345 100644
--- a/elfutils/NEWS
+++ b/elfutils/NEWS
@@ -1,3 +1,19 @@
+Version 0.151
+
+libdwfl: Fix for more prelink cases with separate debug file.
+
+strip: New flag --strip-sections to remove section headers entirely.
+
+Version 0.150
+
+libdw: Fix for handling huge .debug_aranges section.
+
+libdwfl: Fix for handling prelinked DSO with separate debug file.
+
+findtextrel: Fix diagnostics to work with usual section ordering.
+
+libebl: i386 backend fix for multi-register integer return value location.
+
 Version 0.149:
 
 libdw: Decode new DW_OP_GNU_implicit_pointer operation;
diff --git a/elfutils/aclocal.m4 b/elfutils/aclocal.m4
index b3852246..cc84be9e 100644
--- a/elfutils/aclocal.m4
+++ b/elfutils/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
+[m4_warning([this file was generated for autoconf 2.66.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/elfutils/backends/ChangeLog b/elfutils/backends/ChangeLog
index 9fd9745d..7865338f 100644
--- a/elfutils/backends/ChangeLog
+++ b/elfutils/backends/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-08  Roland McGrath  <roland@redhat.com>
+
+	* i386_retval.c (loc_intreg): Typo fix.
+	Reported by Thorsten Glaser <tg@mirbsd.de>.
+
 2010-04-10  Matt Fleming  <matt@console-pimps.org>
 
 	* sh_corenote.c: New file.
diff --git a/elfutils/backends/i386_retval.c b/elfutils/backends/i386_retval.c
index c3bab108..67a090d5 100644
--- a/elfutils/backends/i386_retval.c
+++ b/elfutils/backends/i386_retval.c
@@ -1,5 +1,5 @@
 /* Function return value location for Linux/i386 ABI.
-   Copyright (C) 2005, 2007 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
@@ -38,7 +38,7 @@
 static const Dwarf_Op loc_intreg[] =
   {
     { .atom = DW_OP_reg0 }, { .atom = DW_OP_piece, .number = 4 },
-    { .atom = DW_OP_reg1 }, { .atom = DW_OP_piece, .number = 4 },
+    { .atom = DW_OP_reg2 }, { .atom = DW_OP_piece, .number = 4 },
   };
 #define nloc_intreg	1
 #define nloc_intregpair	4
diff --git a/elfutils/config/config.guess b/elfutils/config/config.guess
index da833146..dc84c68e 100755
--- a/elfutils/config/config.guess
+++ b/elfutils/config/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-11-20'
 
 # 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
@@ -27,16 +27,16 @@ timestamp='2009-04-27'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -333,6 +333,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -656,7 +659,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -807,12 +810,12 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -822,6 +825,9 @@ EOF
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +857,20 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +893,17 @@ EOF
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -882,78 +913,34 @@ EOF
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	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 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-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
@@ -962,8 +949,11 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +976,6 @@ EOF
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1074,7 +1004,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1112,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1205,16 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff --git a/elfutils/config/config.sub b/elfutils/config/config.sub
index a39437d0..2a55a507 100755
--- a/elfutils/config/config.sub
+++ b/elfutils/config/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2009-11-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2009-04-17'
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -149,10 +152,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -281,6 +287,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -288,13 +295,14 @@ case $basic_machine in
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -337,7 +345,7 @@ case $basic_machine in
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -365,7 +373,7 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -374,6 +382,7 @@ case $basic_machine in
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +476,10 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -719,6 +732,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1240,6 +1256,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1260,9 +1279,9 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1302,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1613,7 +1632,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff --git a/elfutils/config/elfutils.spec.in b/elfutils/config/elfutils.spec.in
index 51b2eeef..d406daa5 100644
--- a/elfutils/config/elfutils.spec.in
+++ b/elfutils/config/elfutils.spec.in
@@ -188,6 +188,21 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libelf.a
 
 %changelog
+* Mon Nov 22 2010  <drepper@redhat.com> 0.150-1
+- libdw: Fix for handling huge .debug_aranges section.
+- libdwfl: Fix for handling prelinked DSO with separate debug file.
+- findtextrel: Fix diagnostics to work with usual section ordering.
+- libebl: i386 backend fix for multi-register integer return value 
+  location.
+
+* Mon Sep 13 2010  <drepper@redhat.com> 0.149-1
+- libdw: Decode new DW_OP_GNU_implicit_pointer operation;        new 
+  function dwarf_getlocation_implicit_pointer.
+- libdwfl: New function dwfl_dwarf_line.
+- addr2line: New flag -F/--flags to print more DWARF line information 
+  details.
+- strip: -g recognizes .gdb_index as a debugging section.
+
 * Mon Jun 28 2010  <drepper@redhat.com> 0.148-1
 - libdw: Accept DWARF 4 format: new functions dwarf_next_unit, 
   dwarf_offdie_types.        New functions dwarf_lineisa, 
diff --git a/elfutils/configure b/elfutils/configure
index a3dcbcfc..db11af71 100755
--- a/elfutils/configure
+++ b/elfutils/configure
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for Red Hat elfutils 0.149.
+# Generated by GNU Autoconf 2.66 for Red Hat elfutils 0.151.
 #
 # Report bugs to <http://bugzilla.redhat.com/bugzilla/>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -320,7 +320,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -360,19 +360,19 @@ else
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -534,7 +534,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -553,8 +553,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Red Hat elfutils'
 PACKAGE_TARNAME='elfutils'
-PACKAGE_VERSION='0.149'
-PACKAGE_STRING='Red Hat elfutils 0.149'
+PACKAGE_VERSION='0.151'
+PACKAGE_STRING='Red Hat elfutils 0.151'
 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
 PACKAGE_URL=''
 
@@ -836,7 +836,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -862,7 +862,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1066,7 +1066,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1082,7 +1082,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1112,8 +1112,8 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1121,7 +1121,7 @@ Try \`$0 --help' for more information."
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1139,13 +1139,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1168,7 +1168,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1182,8 +1182,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1198,9 +1198,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1239,11 +1239,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1269,7 +1269,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.149 to adapt to many kinds of systems.
+\`configure' configures Red Hat elfutils 0.151 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1283,7 +1283,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1339,7 +1339,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Red Hat elfutils 0.149:";;
+     short | recursive ) echo "Configuration of Red Hat elfutils 0.151:";;
    esac
   cat <<\_ACEOF
 
@@ -1451,10 +1451,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Red Hat elfutils configure 0.149
-generated by GNU Autoconf 2.65
+Red Hat elfutils configure 0.151
+generated by GNU Autoconf 2.66
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
@@ -1554,8 +1554,8 @@ 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.149, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by Red Hat elfutils $as_me 0.151, which was
+generated by GNU Autoconf 2.66.  Invocation command line was
 
   $ $0 $@
 
@@ -1665,11 +1665,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1703,11 +1701,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1720,11 +1716,9 @@ _ASBOX
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -1738,11 +1732,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -1797,7 +1789,12 @@ _ACEOF
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1812,7 +1809,11 @@ do
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -1888,7 +1889,7 @@ if $ac_cache_corrupted; then
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -1904,16 +1905,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_aux_dir=
 for ac_dir in config "$srcdir"/config; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2036,11 +2043,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2062,7 +2069,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -2072,7 +2079,7 @@ then
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2310,7 +2317,7 @@ done
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2318,7 +2325,7 @@ SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2352,7 +2359,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2368,7 +2375,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='elfutils'
- VERSION='0.149'
+ VERSION='0.151'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2456,7 +2463,7 @@ ac_config_files="$ac_config_files elfutils.spec:config/elfutils.spec.in"
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -2467,16 +2474,16 @@ else
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2501,7 +2508,7 @@ else
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -2509,7 +2516,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2850,8 +2857,8 @@ fi
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -2965,9 +2972,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3009,8 +3015,8 @@ done
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3067,9 +3073,9 @@ $as_echo "$ac_try_echo"; } >&5
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3120,8 +3126,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3751,7 +3757,7 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
+  as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
@@ -3849,7 +3855,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99" >&5
 $as_echo "$ac_cv_c99" >&6; }
 if test "x$ac_cv_c99" != xyes; then :
-  as_fn_error "gcc with C99 support required" "$LINENO" 5
+  as_fn_error $? "gcc with C99 support required" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
@@ -3888,7 +3894,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
 $as_echo "$ac_cv_tls" >&6; }
 if test "x$ac_cv_tls" != xyes; then :
-  as_fn_error "__thread support required" "$LINENO" 5
+  as_fn_error $? "__thread support required" "$LINENO" 5
 fi
 
 # Check whether --enable-largefile was given.
@@ -4102,7 +4108,7 @@ if test "${enable_generic+set}" = set; then :
     base_cpu=i386
     ;;
    *)
-    as_fn_error "no machine-specific linker for this configuration available" "$LINENO" 5
+    as_fn_error $? "no machine-specific linker for this configuration available" "$LINENO" 5
     ;;
   esac
 fi
@@ -4161,8 +4167,8 @@ fi
 if test "$use_mudflap" = fail; then
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "--enable-mudflap requires a compiler which understands this option
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "--enable-mudflap requires a compiler which understands this option
+See \`config.log' for more details" "$LINENO" 5; }
 fi
  if test "$use_mudflap" = yes; then
   MUDFLAP_TRUE=
@@ -4330,7 +4336,7 @@ if test "$ac_res" != no; then :
   with_zlib=yes
 else
   test $with_zlib = default ||
-		  as_fn_error "missing -lz for --with-zlib" "$LINENO" 5
+		  as_fn_error $? "missing -lz for --with-zlib" "$LINENO" 5
 fi
 
 fi
@@ -4412,7 +4418,7 @@ if test "$ac_res" != no; then :
   with_bzlib=yes
 else
   test $with_bzlib = default ||
-		  as_fn_error "missing -lbz2 for --with-bzlib" "$LINENO" 5
+		  as_fn_error $? "missing -lbz2 for --with-bzlib" "$LINENO" 5
 fi
 
 fi
@@ -4494,7 +4500,7 @@ if test "$ac_res" != no; then :
   with_lzma=yes
 else
   test $with_lzma = default ||
-		  as_fn_error "missing -llzma for --with-lzma" "$LINENO" 5
+		  as_fn_error $? "missing -llzma for --with-lzma" "$LINENO" 5
 fi
 
 fi
@@ -4875,7 +4881,7 @@ ac_config_files="$ac_config_files version.h:config/version.h.in"
 # 1.234<whatever> -> 1234<whatever>
 case "$PACKAGE_VERSION" in
 [0-9].*) eu_version="${PACKAGE_VERSION/./}" ;;
-*)     	   as_fn_error "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;;
+*)     	   as_fn_error $? "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;;
 esac
 case "$eu_version" in
 *.*)
@@ -4886,7 +4892,7 @@ case "$eu_version" in
   [0-9][0-9][0-9]) ;;
   [0-9][0-9])	eu_extra_version="${eu_extra_version}0" ;;
   [0-9])	   	eu_extra_version="${eu_extra_version}00" ;;
-  *) as_fn_error "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;;
+  *) as_fn_error $? "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;;
   esac
   ;;
 *)
@@ -4899,7 +4905,7 @@ case "$eu_version" in
 [0-9][0-9][0-9][0-9]) eu_version="${eu_version}$eu_extra_version" ;;
 [0-9][0-9][0-9])	      eu_version="${eu_version}0$eu_extra_version" ;;
 [0-9][0-9])	  	      eu_version="${eu_version}00$eu_extra_version";;
-*) as_fn_error "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;;
+*) as_fn_error $? "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;;
 esac
 
 # Round up to the next release API (x.y) version.
@@ -4988,6 +4994,7 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -5011,67 +5018,67 @@ else
 fi
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_LOCKS_TRUE}" && test -z "${USE_LOCKS_FALSE}"; then
-  as_fn_error "conditional \"USE_LOCKS\" was never defined.
+  as_fn_error $? "conditional \"USE_LOCKS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${NATIVE_LD_TRUE}" && test -z "${NATIVE_LD_FALSE}"; then
-  as_fn_error "conditional \"NATIVE_LD\" was never defined.
+  as_fn_error $? "conditional \"NATIVE_LD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${NEVER_TRUE}" && test -z "${NEVER_FALSE}"; then
-  as_fn_error "conditional \"NEVER\" was never defined.
+  as_fn_error $? "conditional \"NEVER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${MUDFLAP_TRUE}" && test -z "${MUDFLAP_FALSE}"; then
-  as_fn_error "conditional \"MUDFLAP\" was never defined.
+  as_fn_error $? "conditional \"MUDFLAP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GPROF_TRUE}" && test -z "${GPROF_FALSE}"; then
-  as_fn_error "conditional \"GPROF\" was never defined.
+  as_fn_error $? "conditional \"GPROF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GCOV_TRUE}" && test -z "${GCOV_FALSE}"; then
-  as_fn_error "conditional \"GCOV\" was never defined.
+  as_fn_error $? "conditional \"GCOV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_STATIC_TRUE}" && test -z "${BUILD_STATIC_FALSE}"; then
-  as_fn_error "conditional \"BUILD_STATIC\" was never defined.
+  as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then
-  as_fn_error "conditional \"TESTS_RPATH\" was never defined.
+  as_fn_error $? "conditional \"TESTS_RPATH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ZLIB_TRUE}" && test -z "${ZLIB_FALSE}"; then
-  as_fn_error "conditional \"ZLIB\" was never defined.
+  as_fn_error $? "conditional \"ZLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BZLIB_TRUE}" && test -z "${BZLIB_FALSE}"; then
-  as_fn_error "conditional \"BZLIB\" was never defined.
+  as_fn_error $? "conditional \"BZLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LZMA_TRUE}" && test -z "${LZMA_FALSE}"; then
-  as_fn_error "conditional \"LZMA\" was never defined.
+  as_fn_error $? "conditional \"LZMA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_LIBASM_TRUE}" && test -z "${HAVE_LIBASM_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBASM\" was never defined.
+  as_fn_error $? "conditional \"HAVE_LIBASM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${STANDALONE_TRUE}" && test -z "${STANDALONE_FALSE}"; then
-  as_fn_error "conditional \"STANDALONE\" was never defined.
+  as_fn_error $? "conditional \"STANDALONE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -5221,19 +5228,19 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -5429,7 +5436,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -5482,8 +5489,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.149, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by Red Hat elfutils $as_me 0.151, which was
+generated by GNU Autoconf 2.66.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -5548,11 +5555,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Red Hat elfutils config.status 0.149
-configured by $0, generated by GNU Autoconf 2.65,
+Red Hat elfutils config.status 0.151
+configured by $0, generated by GNU Autoconf 2.66,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -5608,7 +5615,7 @@ do
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -5617,7 +5624,7 @@ Try \`$0 --help' for more information.";;
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -5698,7 +5705,7 @@ do
     "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "version.h") CONFIG_FILES="$CONFIG_FILES version.h:config/version.h.in" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -5736,7 +5743,7 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -5753,7 +5760,7 @@ if test "x$ac_cr" = x; then
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -5767,18 +5774,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -5867,20 +5874,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -5908,7 +5923,7 @@ for ac_last_try in false false :; do
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -5993,7 +6008,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -6006,7 +6021,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -6034,7 +6049,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -6061,7 +6076,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -6198,22 +6213,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -6224,19 +6239,19 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -6499,7 +6514,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -6520,7 +6535,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/elfutils/configure.ac b/elfutils/configure.ac
index c233a2ff..39ecd391 100644
--- a/elfutils/configure.ac
+++ b/elfutils/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Configure input file for elfutils.                     -*-autoconf-*-
 dnl
-dnl Copyright (C) 1996-2010 Red Hat, Inc.
+dnl Copyright (C) 1996-2011 Red Hat, Inc.
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ 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.149],[http://bugzilla.redhat.com/bugzilla/],[elfutils])
+AC_INIT([Red Hat elfutils],[0.151],[http://bugzilla.redhat.com/bugzilla/],[elfutils])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_FILES([config/Makefile])
diff --git a/elfutils/elfutils.spec b/elfutils/elfutils.spec
index 0c165602..38681cc9 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.149
+Version: 0.151
 Release: 1
 License: GPLv2 with exceptions
 Group: Development/Tools
@@ -188,6 +188,21 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libelf.a
 
 %changelog
+* Mon Nov 22 2010  <drepper@redhat.com> 0.150-1
+- libdw: Fix for handling huge .debug_aranges section.
+- libdwfl: Fix for handling prelinked DSO with separate debug file.
+- findtextrel: Fix diagnostics to work with usual section ordering.
+- libebl: i386 backend fix for multi-register integer return value 
+  location.
+
+* Mon Sep 13 2010  <drepper@redhat.com> 0.149-1
+- libdw: Decode new DW_OP_GNU_implicit_pointer operation;        new 
+  function dwarf_getlocation_implicit_pointer.
+- libdwfl: New function dwfl_dwarf_line.
+- addr2line: New flag -F/--flags to print more DWARF line information 
+  details.
+- strip: -g recognizes .gdb_index as a debugging section.
+
 * Mon Jun 28 2010  <drepper@redhat.com> 0.148-1
 - libdw: Accept DWARF 4 format: new functions dwarf_next_unit, 
   dwarf_offdie_types.        New functions dwarf_lineisa, 
diff --git a/elfutils/libcpu/i386_parse.c b/elfutils/libcpu/i386_parse.c
index 09275b05..68e957b2 100644
--- a/elfutils/libcpu/i386_parse.c
+++ b/elfutils/libcpu/i386_parse.c
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 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
@@ -46,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.4.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -291,7 +290,7 @@ static size_t best_mnemonic_bits;
 
 
 /* Line 189 of yacc.c  */
-#line 295 "i386_parse.c"
+#line 294 "i386_parse.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -363,7 +362,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 367 "i386_parse.c"
+#line 366 "i386_parse.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -375,7 +374,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 379 "i386_parse.c"
+#line 378 "i386_parse.c"
 
 #ifdef short
 # undef short
@@ -425,7 +424,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -798,9 +797,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL		goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -857,7 +865,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -1596,7 +1604,7 @@ yyreduce:
     {
         case 2:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 245 "i386_parse.y"
     {
 		      if (error_message_count != 0)
@@ -1609,28 +1617,28 @@ yyreduce:
 
   case 5:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 259 "i386_parse.y"
     { new_bitfield ((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].num)); }
     break;
 
   case 6:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 261 "i386_parse.y"
     { new_bitfield ((yyvsp[(2) - (2)].str), -1); }
     break;
 
   case 7:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 263 "i386_parse.y"
     { new_bitfield ((yyvsp[(2) - (2)].str), -2); }
     break;
 
   case 8:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 265 "i386_parse.y"
     {
 		      struct synonym *newp = xmalloc (sizeof (*newp));
@@ -1647,7 +1655,7 @@ yyreduce:
 
   case 12:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 284 "i386_parse.y"
     {
 		      if ((yyvsp[(3) - (6)].field) != NULL && strcmp ((yyvsp[(3) - (6)].field)->name, "RE") != 0
@@ -1735,7 +1743,7 @@ yyreduce:
 
   case 14:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 370 "i386_parse.y"
     {
 		      struct known_bitfield search;
@@ -1755,14 +1763,14 @@ yyreduce:
 
   case 15:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 385 "i386_parse.y"
     { (yyval.field) = NULL; }
     break;
 
   case 16:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 389 "i386_parse.y"
     {
 		      check_bits ((yyvsp[(3) - (3)].bit));
@@ -1777,7 +1785,7 @@ yyreduce:
 
   case 17:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 399 "i386_parse.y"
     {
 		      check_bits ((yyvsp[(1) - (1)].bit));
@@ -1787,7 +1795,7 @@ yyreduce:
 
   case 18:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 406 "i386_parse.y"
     {
 		      struct bitvalue *runp = (yyvsp[(1) - (2)].bit);
@@ -1800,14 +1808,14 @@ yyreduce:
 
   case 19:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 414 "i386_parse.y"
     { (yyval.bit) = (yyvsp[(1) - (1)].bit); }
     break;
 
   case 20:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 418 "i386_parse.y"
     {
 		      (yyval.bit) = xmalloc (sizeof (struct bitvalue));
@@ -1819,7 +1827,7 @@ yyreduce:
 
   case 21:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 425 "i386_parse.y"
     {
 		      (yyval.bit) = xmalloc (sizeof (struct bitvalue));
@@ -1831,7 +1839,7 @@ yyreduce:
 
   case 22:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 432 "i386_parse.y"
     {
 		      (yyval.bit) = xmalloc (sizeof (struct bitvalue));
@@ -1856,21 +1864,21 @@ yyreduce:
 
   case 23:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 454 "i386_parse.y"
     { (yyval.arg) = (yyvsp[(2) - (2)].arg); }
     break;
 
   case 24:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 456 "i386_parse.y"
     { (yyval.arg) = NULL; }
     break;
 
   case 25:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 460 "i386_parse.y"
     {
 		      struct argument *runp = (yyvsp[(1) - (3)].arg);
@@ -1885,7 +1893,7 @@ yyreduce:
 
   case 26:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 470 "i386_parse.y"
     {
 		      (yyval.arg) = xmalloc (sizeof (struct argument));
@@ -1896,7 +1904,7 @@ yyreduce:
 
   case 27:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 478 "i386_parse.y"
     {
 		      struct argname *runp = (yyvsp[(1) - (2)].name);
@@ -1909,14 +1917,14 @@ yyreduce:
 
   case 28:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 486 "i386_parse.y"
     { (yyval.name) = (yyvsp[(1) - (1)].name); }
     break;
 
   case 29:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 489 "i386_parse.y"
     {
 		      (yyval.name) = xmalloc (sizeof (struct argname));
@@ -1953,7 +1961,7 @@ yyreduce:
 
   case 30:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 521 "i386_parse.y"
     {
 		      (yyval.name) = xmalloc (sizeof (struct argname));
@@ -1967,7 +1975,7 @@ yyreduce:
 
   case 31:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 530 "i386_parse.y"
     {
 		      (yyval.name) = xmalloc (sizeof (struct argname));
@@ -1979,7 +1987,7 @@ yyreduce:
 
   case 32:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 537 "i386_parse.y"
     {
 		      (yyval.name) = xmalloc (sizeof (struct argname));
@@ -1993,8 +2001,8 @@ yyreduce:
 
 
 
-/* Line 1455 of yacc.c  */
-#line 1998 "i386_parse.c"
+/* Line 1464 of yacc.c  */
+#line 2006 "i386_parse.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2205,7 +2213,7 @@ yyreturn:
 
 
 
-/* Line 1675 of yacc.c  */
+/* Line 1684 of yacc.c  */
 #line 547 "i386_parse.y"
 
 
diff --git a/elfutils/libcpu/i386_parse.h b/elfutils/libcpu/i386_parse.h
index 4a10a603..6b5df630 100644
--- a/elfutils/libcpu/i386_parse.h
+++ b/elfutils/libcpu/i386_parse.h
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 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
@@ -70,7 +69,7 @@
 typedef union YYSTYPE
 {
 
-/* Line 1676 of yacc.c  */
+/* Line 1685 of yacc.c  */
 #line 214 "i386_parse.y"
 
   unsigned long int num;
@@ -83,8 +82,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 1676 of yacc.c  */
-#line 88 "i386_parse.h"
+/* Line 1685 of yacc.c  */
+#line 87 "i386_parse.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/elfutils/libdw/ChangeLog b/elfutils/libdw/ChangeLog
index da6ed056..8ec74857 100644
--- a/elfutils/libdw/ChangeLog
+++ b/elfutils/libdw/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-13  Roland McGrath  <roland@redhat.com>
+
+	* dwarf.h: Add DW_LANG_Go.
+
+2010-10-05  Roland McGrath  <roland@redhat.com>
+
+	* dwarf_getaranges.c: Use malloc rather than alloca,
+	since the total number of elements can be quite huge.
+
 2010-07-26  Roland McGrath  <roland@redhat.com>
 
 	* dwarf_getlocation_implicit_pointer.c: New file.
diff --git a/elfutils/libdw/dwarf.h b/elfutils/libdw/dwarf.h
index edf57b49..940ffe33 100644
--- a/elfutils/libdw/dwarf.h
+++ b/elfutils/libdw/dwarf.h
@@ -580,6 +580,7 @@ enum
     DW_LANG_UPC = 0x0012,	     /* Unified Parallel C */
     DW_LANG_D = 0x0013,		     /* D */
     DW_LANG_Python = 0x0014,	     /* Python */
+    DW_LANG_Go = 0x0016,	     /* Google's Go (provisionally in DWARF5) */
 
     DW_LANG_lo_user = 0x8000,
     DW_LANG_Mips_Assembler = 0x8001,
diff --git a/elfutils/libdw/dwarf_getaranges.c b/elfutils/libdw/dwarf_getaranges.c
index cced9bf8..f18d63d0 100644
--- a/elfutils/libdw/dwarf_getaranges.c
+++ b/elfutils/libdw/dwarf_getaranges.c
@@ -67,9 +67,9 @@ struct arangelist
 static int
 compare_aranges (const void *a, const void *b)
 {
-  Dwarf_Arange *const *p1 = a, *const *p2 = b;
-  Dwarf_Arange *l1 = *p1, *l2 = *p2;
-  return l1->addr - l2->addr;
+  struct arangelist *const *p1 = a, *const *p2 = b;
+  struct arangelist *l1 = *p1, *l2 = *p2;
+  return l1->arange.addr - l2->arange.addr;
 }
 
 int
@@ -145,6 +145,13 @@ dwarf_getaranges (dbg, aranges, naranges)
 	{
 	invalid:
 	  __libdw_seterrno (DWARF_E_INVALID_DWARF);
+	fail:
+	  while (arangelist != NULL)
+	    {
+	      struct arangelist *next = arangelist->next;
+	      free (arangelist);
+	      arangelist = next;
+	    }
 	  return -1;
 	}
 
@@ -152,7 +159,7 @@ dwarf_getaranges (dbg, aranges, naranges)
       if (__libdw_read_offset_inc (dbg,
 				   IDX_debug_aranges, &readp,
 				   length_bytes, &offset, IDX_debug_info, 4))
-	return -1;
+	goto fail;
 
       unsigned int address_size = *readp++;
       if (address_size != 4 && address_size != 8)
@@ -173,7 +180,7 @@ dwarf_getaranges (dbg, aranges, naranges)
 
 	  if (__libdw_read_address_inc (dbg, IDX_debug_aranges, &readp,
 					address_size, &range_address))
-	    return -1;
+	    goto fail;
 
 	  if (address_size == 4)
 	    range_length = read_4ubyte_unaligned_inc (dbg, readp);
@@ -184,8 +191,14 @@ dwarf_getaranges (dbg, aranges, naranges)
 	  if (range_address == 0 && range_length == 0)
 	    break;
 
-	  struct arangelist *new_arange =
-	    (struct arangelist *) alloca (sizeof (struct arangelist));
+	  /* We don't use alloca for these temporary structures because
+	     the total number of them can be quite large.  */
+	  struct arangelist *new_arange = malloc (sizeof *new_arange);
+	  if (unlikely (new_arange == NULL))
+	    {
+	      __libdw_seterrno (DWARF_E_NOMEM);
+	      goto fail;
+	    }
 
 	  new_arange->arange.addr = range_address;
 	  new_arange->arange.length = range_length;
@@ -202,19 +215,20 @@ dwarf_getaranges (dbg, aranges, naranges)
 								 offset_size,
 								 false);
 
-	  /* Sanity-check the data.  */
-	  if (new_arange->arange.offset
-	      >= dbg->sectiondata[IDX_debug_info]->d_size)
-	    goto invalid;
-
 	  new_arange->next = arangelist;
 	  arangelist = new_arange;
 	  ++narangelist;
+
+	  /* Sanity-check the data.  */
+	  if (unlikely (new_arange->arange.offset
+			>= dbg->sectiondata[IDX_debug_info]->d_size))
+	    goto invalid;
 	}
     }
 
   if (narangelist == 0)
     {
+      assert (arangelist == NULL);
       if (naranges != NULL)
 	*naranges = 0;
       *aranges = NULL;
@@ -230,9 +244,9 @@ dwarf_getaranges (dbg, aranges, naranges)
      We'll write the pointers in the end of the buffer, and then
      copy into the buffer from the beginning so the overlap works.  */
   assert (sizeof (Dwarf_Arange) >= sizeof (Dwarf_Arange *));
-  Dwarf_Arange **sortaranges = (buf + sizeof (Dwarf_Aranges)
-				+ ((sizeof (Dwarf_Arange)
-				    - sizeof (Dwarf_Arange *)) * narangelist));
+  struct arangelist **sortaranges
+    = (buf + sizeof (Dwarf_Aranges)
+       + ((sizeof (Dwarf_Arange) - sizeof sortaranges[0]) * narangelist));
 
   /* The list is in LIFO order and usually they come in clumps with
      ascending addresses.  So fill from the back to probably start with
@@ -240,7 +254,7 @@ dwarf_getaranges (dbg, aranges, naranges)
   unsigned int i = narangelist;
   while (i-- > 0)
     {
-      sortaranges[i] = &arangelist->arange;
+      sortaranges[i] = arangelist;
       arangelist = arangelist->next;
     }
   assert (arangelist == NULL);
@@ -258,7 +272,11 @@ dwarf_getaranges (dbg, aranges, naranges)
   if (naranges != NULL)
     *naranges = narangelist;
   for (i = 0; i < narangelist; ++i)
-    (*aranges)->info[i] = *sortaranges[i];
+    {
+      struct arangelist *elt = sortaranges[i];
+      (*aranges)->info[i] = elt->arange;
+      free (elt);
+    }
 
   return 0;
 }
diff --git a/elfutils/libdwfl/ChangeLog b/elfutils/libdwfl/ChangeLog
index cc6dfb5b..16fb71d3 100644
--- a/elfutils/libdwfl/ChangeLog
+++ b/elfutils/libdwfl/ChangeLog
@@ -1,3 +1,70 @@
+2011-01-11  Roland McGrath  <roland@redhat.com>
+
+	* dwfl_module_getdwarf.c (open_elf): Remove section-based
+	address_sync fixup from here.
+	(find_prelink_address_sync): New function.
+	(find_debuginfo): Call it.
+	* libdwflP.h (DWFL_ERRORS): Add BAD_PRELINK error.
+
+2011-01-04  Roland McGrath  <roland@redhat.com>
+
+	* dwfl_module_getdwarf.c (open_elf): Enhance address_sync calculation
+	logic to consider section addresses, the better to survive all the
+	possible prelink machinations.
+	* libdwflP.h (struct dwfl_file): Comment change.
+
+2010-11-30  Roland McGrath  <roland@redhat.com>
+
+	* derelocate.c (dwfl_module_relocations): Remove over-eager assert.
+
+2010-11-12  Roland McGrath  <roland@redhat.com>
+
+	* libdwflP.h (struct Dwfl_Module): New member main_bias.
+	(dwfl_adjusted_address, dwfl_deadjust_address): Use it.
+	* dwfl_module_getdwarf.c (__libdwfl_getelf): Initialize it.
+
+	* libdwflP.h (dwfl_deadjust_address): New function.
+	(dwfl_deadjust_dwarf_addr, dwfl_deadjust_st_value): New functions.
+	* cu.c (addrarange): Use dwfl_deadjust_dwarf_addr.
+	* dwfl_module_addrsym.c: Use dwfl_deadjust_st_value.
+
+2010-11-11  Roland McGrath  <roland@redhat.com>
+
+	* libdwflP.h (struct dwfl_file): Remove bias member.
+	Add vaddr and address_sync members instead.
+	(dwfl_adjusted_address): Calculate using vaddr.
+	(dwfl_adjusted_dwarf_addr): Calculate using address_sync and call that.
+	(dwfl_adjusted_st_value): Use one of those calls.
+	* dwfl_module_getdwarf.c (open_elf): Initialize vaddr and address_sync.
+	* dwfl_segment_report_module.c (dwfl_segment_report_module): Likewise.
+	* derelocate.c (dwfl_module_relocations): Update ET_EXEC assertions.
+	* link_map.c (consider_executable): Adjust only MOD->low_addr for
+	detected PIE bias change.
+
+	* libdwflP.h (dwfl_adjusted_dwarf_addr): New function.
+	* dwfl_module_info.c: Use it.
+	* cu.c (addrarange): Likewise.
+	* dwfl_dwarf_line.c: Likewise.
+	* dwfl_module_dwarf_cfi.c: Likewise.
+	* dwfl_lineinfo.c: Likewise.
+	* dwfl_nextcu.c: Likewise.
+	* dwfl_module_getdwarf.c (dwfl_module_getdwarf): Likewise.
+
+	* libdwflP.h (dwfl_adjusted_st_value): New function.
+	* relocate.c (resolve_symbol): Use it.
+	* dwfl_module_getsym.c: Likewise.
+	* dwfl_module_addrsym.c: Likewise.
+	* dwfl_module_info.c: Likewise.
+
+	* libdwflP.h (dwfl_adjusted_address): New function.
+	* dwfl_module_build_id.c (__libdwfl_find_build_id): Use it.
+	* relocate.c (__libdwfl_relocate_value): Likewise.
+	* derelocate.c (cache_sections): Likewise.
+	(dwfl_module_address_section): Likewise.
+	* dwfl_module_getelf.c: Likewise.
+	* dwfl_module_eh_cfi.c: Likewise.
+	* link_map.c (consider_executable): Likewise.
+
 2010-08-24  Roland McGrath  <roland@redhat.com>
 
 	* dwfl_dwarf_line.c: New file.
diff --git a/elfutils/libdwfl/cu.c b/elfutils/libdwfl/cu.c
index 5f73d2a3..515aff3b 100644
--- a/elfutils/libdwfl/cu.c
+++ b/elfutils/libdwfl/cu.c
@@ -106,7 +106,7 @@ addrarange (Dwfl_Module *mod, Dwarf_Addr addr, struct dwfl_arange **arange)
     }
 
   /* The address must be inside the module to begin with.  */
-  addr -= mod->debug.bias;
+  addr = dwfl_deadjust_dwarf_addr (mod, addr);
 
   /* The ranges are sorted by address, so we can use binary search.  */
   size_t l = 0, u = mod->naranges;
diff --git a/elfutils/libdwfl/derelocate.c b/elfutils/libdwfl/derelocate.c
index 56ba25af..ba6d9db4 100644
--- a/elfutils/libdwfl/derelocate.c
+++ b/elfutils/libdwfl/derelocate.c
@@ -1,5 +1,5 @@
 /* Recover relocatibility for addresses computed from debug information.
-   Copyright (C) 2005-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
@@ -134,7 +134,7 @@ cache_sections (Dwfl_Module *mod)
 	  newref->scn = scn;
 	  newref->relocs = NULL;
 	  newref->name = name;
-	  newref->start = shdr->sh_addr + mod->main.bias;
+	  newref->start = dwfl_adjusted_address (mod, shdr->sh_addr);
 	  newref->end = newref->start + shdr->sh_size;
 	  newref->next = refs;
 	  refs = newref;
@@ -239,8 +239,7 @@ dwfl_module_relocations (Dwfl_Module *mod)
       return 1;
 
     case ET_EXEC:
-      assert (mod->main.bias == 0);
-      assert (mod->debug.bias == 0);
+      assert (mod->main.vaddr == mod->low_addr);
       break;
     }
 
@@ -406,7 +405,7 @@ dwfl_module_address_section (Dwfl_Module *mod, Dwarf_Addr *address,
 	}
     }
 
-  *bias = mod->main.bias;
+  *bias = dwfl_adjusted_address (mod, 0);
   return mod->reloc_info->refs[idx].scn;
 }
 INTDEF (dwfl_module_address_section)
diff --git a/elfutils/libdwfl/dwfl_dwarf_line.c b/elfutils/libdwfl/dwfl_dwarf_line.c
index ee522db4..eb085e4a 100644
--- a/elfutils/libdwfl/dwfl_dwarf_line.c
+++ b/elfutils/libdwfl/dwfl_dwarf_line.c
@@ -59,6 +59,6 @@ dwfl_dwarf_line (Dwfl_Line *line, Dwarf_Addr *bias)
   struct dwfl_cu *cu = dwfl_linecu (line);
   const Dwarf_Line *info = &cu->die.cu->lines->info[line->idx];
 
-  *bias = cu->mod->debug.bias;
+  *bias = dwfl_adjusted_dwarf_addr (cu->mod, 0);
   return (Dwarf_Line *) info;
 }
diff --git a/elfutils/libdwfl/dwfl_lineinfo.c b/elfutils/libdwfl/dwfl_lineinfo.c
index 0d8a6887..6049de84 100644
--- a/elfutils/libdwfl/dwfl_lineinfo.c
+++ b/elfutils/libdwfl/dwfl_lineinfo.c
@@ -1,5 +1,5 @@
 /* Get information from a source line record returned by libdwfl.
-   Copyright (C) 2005, 2006 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
@@ -61,7 +61,7 @@ dwfl_lineinfo (Dwfl_Line *line, Dwarf_Addr *addr, int *linep, int *colp,
   const Dwarf_Line *info = &cu->die.cu->lines->info[line->idx];
 
   if (addr != NULL)
-    *addr = info->addr + cu->mod->debug.bias;
+    *addr = dwfl_adjusted_dwarf_addr (cu->mod, info->addr);
   if (linep != NULL)
     *linep = info->line;
   if (colp != NULL)
diff --git a/elfutils/libdwfl/dwfl_module_addrsym.c b/elfutils/libdwfl/dwfl_module_addrsym.c
index 72280d11..a9f98f44 100644
--- a/elfutils/libdwfl/dwfl_module_addrsym.c
+++ b/elfutils/libdwfl/dwfl_module_addrsym.c
@@ -1,5 +1,5 @@
 /* Find debugging and symbol information for a module in libdwfl.
-   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -71,7 +71,7 @@ dwfl_module_addrsym (Dwfl_Module *mod, GElf_Addr addr,
       /* Figure out what section ADDR lies in.  */
       if (addr_shndx == SHN_UNDEF)
 	{
-	  GElf_Addr mod_addr = addr - mod->symfile->bias;
+	  GElf_Addr mod_addr = dwfl_deadjust_st_value (mod, addr);
 	  Elf_Scn *scn = NULL;
 	  addr_shndx = SHN_ABS;
 	  while ((scn = elf_nextscn (mod->symfile->elf, scn)) != NULL)
diff --git a/elfutils/libdwfl/dwfl_module_build_id.c b/elfutils/libdwfl/dwfl_module_build_id.c
index 9dc7f678..f9888660 100644
--- a/elfutils/libdwfl/dwfl_module_build_id.c
+++ b/elfutils/libdwfl/dwfl_module_build_id.c
@@ -124,7 +124,7 @@ __libdwfl_find_build_id (Dwfl_Module *mod, bool set, Elf *elf)
 							phdr->p_offset,
 							phdr->p_filesz,
 							ELF_T_NHDR),
-				  phdr->p_vaddr + mod->main.bias);
+				  dwfl_adjusted_address (mod, phdr->p_vaddr));
 	}
     }
   else
@@ -139,7 +139,7 @@ __libdwfl_find_build_id (Dwfl_Module *mod, bool set, Elf *elf)
 	    if (!(shdr->sh_flags & SHF_ALLOC))
 	      vaddr = NO_VADDR;
 	    else if (mod->e_type != ET_REL)
-	      vaddr = shdr->sh_addr + mod->main.bias;
+	      vaddr = dwfl_adjusted_address (mod, shdr->sh_addr);
 	    else if (__libdwfl_relocate_value (mod, elf, &shstrndx,
 					       elf_ndxscn (scn), &vaddr))
 	      vaddr = NO_VADDR;
diff --git a/elfutils/libdwfl/dwfl_module_dwarf_cfi.c b/elfutils/libdwfl/dwfl_module_dwarf_cfi.c
index e851a1f4..96e60fbf 100644
--- a/elfutils/libdwfl/dwfl_module_dwarf_cfi.c
+++ b/elfutils/libdwfl/dwfl_module_dwarf_cfi.c
@@ -1,5 +1,5 @@
 /* Find DWARF CFI for a module in libdwfl.
-   Copyright (C) 2009 Red Hat, Inc.
+   Copyright (C) 2009-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
@@ -81,7 +81,7 @@ dwfl_module_dwarf_cfi (mod, bias)
 
   if (mod->dwarf_cfi != NULL)
     {
-      *bias = mod->debug.bias;
+      *bias = dwfl_adjusted_dwarf_addr (mod, 0);
       return mod->dwarf_cfi;
     }
 
diff --git a/elfutils/libdwfl/dwfl_module_eh_cfi.c b/elfutils/libdwfl/dwfl_module_eh_cfi.c
index 36a495f1..79c8279c 100644
--- a/elfutils/libdwfl/dwfl_module_eh_cfi.c
+++ b/elfutils/libdwfl/dwfl_module_eh_cfi.c
@@ -1,5 +1,5 @@
 /* Find EH CFI for a module in libdwfl.
-   Copyright (C) 2009 Red Hat, Inc.
+   Copyright (C) 2009-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
@@ -60,7 +60,7 @@ dwfl_module_eh_cfi (mod, bias)
 
   if (mod->eh_cfi != NULL)
     {
-      *bias = mod->main.bias;
+      *bias = dwfl_adjusted_address (mod, 0);
       return mod->eh_cfi;
     }
 
@@ -71,7 +71,7 @@ dwfl_module_eh_cfi (mod, bias)
       return NULL;
     }
 
-  *bias = mod->main.bias;
+  *bias = dwfl_adjusted_address (mod, 0);
   return __libdwfl_set_cfi (mod, &mod->eh_cfi,
 			    INTUSE(dwarf_getcfi_elf) (mod->main.elf));
 }
diff --git a/elfutils/libdwfl/dwfl_module_getdwarf.c b/elfutils/libdwfl/dwfl_module_getdwarf.c
index 41ed0730..0825722d 100644
--- a/elfutils/libdwfl/dwfl_module_getdwarf.c
+++ b/elfutils/libdwfl/dwfl_module_getdwarf.c
@@ -1,5 +1,5 @@
 /* Find debugging and symbol information for a module in libdwfl.
-   Copyright (C) 2005-2010 Red Hat, Inc.
+   Copyright (C) 2005-2011 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -55,7 +55,7 @@
 
 
 /* Open libelf FILE->fd and compute the load base of ELF as loaded in MOD.
-   When we return success, FILE->elf and FILE->bias are set up.  */
+   When we return success, FILE->elf and FILE->vaddr are set up.  */
 static inline Dwfl_Error
 open_elf (Dwfl_Module *mod, struct dwfl_file *file)
 {
@@ -93,35 +93,55 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file)
       return DWFL_E (LIBELF, elf_errno ());
     }
 
-  /* The addresses in an ET_EXEC file are absolute.  The lowest p_vaddr of
-     the main file can differ from that of the debug file due to prelink.
-     But that doesn't not change addresses that symbols, debuginfo, or
-     sh_addr of any program sections refer to.  */
-  file->bias = 0;
-  if (mod->e_type != ET_EXEC)
+  if (mod->e_type != ET_REL)
     {
+      /* In any non-ET_REL file, we compute the "synchronization address".
+
+	 We start with the address at the end of the first PT_LOAD
+	 segment.  When prelink converts REL to RELA in an ET_DYN
+	 file, it expands the space between the beginning of the
+	 segment and the actual code/data addresses.  Since that
+	 change wasn't made in the debug file, the distance from
+	 p_vaddr to an address of interest (in an st_value or DWARF
+	 data) now differs between the main and debug files.  The
+	 distance from address_sync to an address of interest remains
+	 consistent.
+
+	 If there are no section headers at all (full stripping), then
+	 the end of the first segment is a valid synchronization address.
+	 This cannot happen in a prelinked file, since prelink itself
+	 relies on section headers for prelinking and for undoing it.
+	 (If you do full stripping on a prelinked file, then you get what
+	 you deserve--you can neither undo the prelinking, nor expect to
+	 line it up with a debug file separated before prelinking.)
+
+	 However, when prelink processes an ET_EXEC file, it can do
+	 something different.  There it juggles the "special" sections
+	 (SHT_DYNSYM et al) to make space for the additional prelink
+	 special sections.  Sometimes it will do this by moving a special
+	 section like .dynstr after the real program sections in the first
+	 PT_LOAD segment--i.e. to the end.  That changes the end address of
+	 the segment, so it no longer lines up correctly and is not a valid
+	 synchronization address to use.  Because of this, we need to apply
+	 a different prelink-savvy means to discover the synchronization
+	 address when there is a separate debug file and a prelinked main
+	 file.  That is done in find_debuginfo, below.  */
+
       size_t phnum;
       if (unlikely (elf_getphdrnum (file->elf, &phnum) != 0))
 	goto elf_error;
 
+      file->vaddr = file->address_sync = 0;
       for (size_t i = 0; i < phnum; ++i)
 	{
 	  GElf_Phdr ph_mem;
 	  GElf_Phdr *ph = gelf_getphdr (file->elf, i, &ph_mem);
-	  if (ph == NULL)
+	  if (unlikely (ph == NULL))
 	    goto elf_error;
 	  if (ph->p_type == PT_LOAD)
 	    {
-	      GElf_Addr align = mod->dwfl->segment_align;
-	      if (align <= 1)
-		{
-		  if ((mod->low_addr & (ph->p_align - 1)) == 0)
-		    align = ph->p_align;
-		  else
-		    align = ((GElf_Addr) 1 << ffsll (mod->low_addr)) >> 1;
-		}
-
-	      file->bias = ((mod->low_addr & -align) - (ph->p_vaddr & -align));
+	      file->vaddr = ph->p_vaddr & -ph->p_align;
+	      file->address_sync = ph->p_vaddr + ph->p_memsz;
 	      break;
 	    }
 	}
@@ -130,7 +150,7 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file)
   mod->e_type = ehdr->e_type;
 
   /* Relocatable Linux kernels are ET_EXEC but act like ET_DYN.  */
-  if (mod->e_type == ET_EXEC && file->bias != 0)
+  if (mod->e_type == ET_EXEC && file->vaddr != mod->low_addr)
     mod->e_type = ET_DYN;
 
   return DWFL_E_NOERROR;
@@ -198,6 +218,8 @@ __libdwfl_getelf (Dwfl_Module *mod)
 	  mod->main.fd = -1;
 	}
     }
+
+  mod->main_bias = mod->e_type == ET_REL ? 0 : mod->low_addr - mod->main.vaddr;
 }
 
 /* Search an ELF file for a ".gnu_debuglink" section.  */
@@ -260,6 +282,224 @@ find_debuglink (Elf *elf, GElf_Word *crc)
   return rawdata->d_buf;
 }
 
+/* If the main file might have been prelinked, then we need to
+   discover the correct synchronization address between the main and
+   debug files.  Because of prelink's section juggling, we cannot rely
+   on the address_sync computed from PT_LOAD segments (see open_elf).
+
+   We will attempt to discover a synchronization address based on the
+   section headers instead.  But finding a section address that is
+   safe to use requires identifying which sections are SHT_PROGBITS.
+   We can do that in the main file, but in the debug file all the
+   allocated sections have been transformed into SHT_NOBITS so we have
+   lost the means to match them up correctly.
+
+   The only method left to us is to decode the .gnu.prelink_undo
+   section in the prelinked main file.  This shows what the sections
+   looked like before prelink juggled them--when they still had a
+   direct correspondence to the debug file.  */
+static Dwfl_Error
+find_prelink_address_sync (Dwfl_Module *mod)
+{
+  /* The magic section is only identified by name.  */
+  size_t shstrndx;
+  if (elf_getshdrstrndx (mod->main.elf, &shstrndx) < 0)
+    return DWFL_E_LIBELF;
+
+  Elf_Scn *scn = NULL;
+  while ((scn = elf_nextscn (mod->main.elf, scn)) != NULL)
+    {
+      GElf_Shdr shdr_mem;
+      GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
+      if (unlikely (shdr == NULL))
+	return DWFL_E_LIBELF;
+      if (shdr->sh_type == SHT_PROGBITS
+	  && !(shdr->sh_flags & SHF_ALLOC)
+	  && shdr->sh_name != 0)
+	{
+	  const char *secname = elf_strptr (mod->main.elf, shstrndx,
+					    shdr->sh_name);
+	  if (unlikely (secname == NULL))
+	    return DWFL_E_LIBELF;
+	  if (!strcmp (secname, ".gnu.prelink_undo"))
+	    break;
+	}
+    }
+
+  if (scn == NULL)
+    /* There was no .gnu.prelink_undo section.  */
+    return DWFL_E_NOERROR;
+
+  Elf_Data *undodata = elf_rawdata (scn, NULL);
+  if (unlikely (undodata == NULL))
+    return DWFL_E_LIBELF;
+
+  /* Decode the section.  It consists of the original ehdr, phdrs,
+     and shdrs (but omits section 0).  */
+
+  union
+  {
+    Elf32_Ehdr e32;
+    Elf64_Ehdr e64;
+  } ehdr;
+  Elf_Data dst =
+    {
+      .d_buf = &ehdr,
+      .d_size = sizeof ehdr,
+      .d_type = ELF_T_EHDR,
+      .d_version = EV_CURRENT
+    };
+  Elf_Data src = *undodata;
+  src.d_size = gelf_fsize (mod->main.elf, ELF_T_EHDR, 1, EV_CURRENT);
+  src.d_type = ELF_T_EHDR;
+  if (unlikely (gelf_xlatetom (mod->main.elf, &dst, &src,
+			       elf_getident (mod->main.elf, NULL)[EI_DATA])
+		== NULL))
+    return DWFL_E_LIBELF;
+
+  size_t shentsize = gelf_fsize (mod->main.elf, ELF_T_SHDR, 1, EV_CURRENT);
+  size_t phentsize = gelf_fsize (mod->main.elf, ELF_T_PHDR, 1, EV_CURRENT);
+
+  uint_fast16_t phnum;
+  uint_fast16_t shnum;
+  if (ehdr.e32.e_ident[EI_CLASS] == ELFCLASS32)
+    {
+      if (ehdr.e32.e_shentsize != shentsize
+	  || ehdr.e32.e_phentsize != phentsize)
+	return DWFL_E_BAD_PRELINK;
+      phnum = ehdr.e32.e_phnum;
+      shnum = ehdr.e32.e_shnum;
+    }
+  else
+    {
+      if (ehdr.e64.e_shentsize != shentsize
+	  || ehdr.e64.e_phentsize != phentsize)
+	return DWFL_E_BAD_PRELINK;
+      phnum = ehdr.e64.e_phnum;
+      shnum = ehdr.e64.e_shnum;
+    }
+
+  /* Since prelink does not store the zeroth section header in the undo
+     section, it cannot support SHN_XINDEX encoding.  */
+  if (unlikely (shnum >= SHN_LORESERVE)
+      || unlikely (undodata->d_size != (src.d_size
+					+ phnum * phentsize
+					+ (shnum - 1) * shentsize)))
+    return DWFL_E_BAD_PRELINK;
+
+  /* We look at the allocated SHT_PROGBITS (or SHT_NOBITS) sections.  (Most
+     every file will have some SHT_PROGBITS sections, but it's possible to
+     have one with nothing but .bss, i.e. SHT_NOBITS.)  The special sections
+     that can be moved around have different sh_type values--except for
+     .interp, the section that became the PT_INTERP segment.  So we exclude
+     the SHT_PROGBITS section whose address matches the PT_INTERP p_vaddr.
+     For this reason, we must examine the phdrs first to find PT_INTERP.  */
+
+  src.d_buf += src.d_size;
+  src.d_type = ELF_T_PHDR;
+  src.d_size = phnum * phentsize;
+
+  GElf_Addr interp = 0;
+  {
+    union
+    {
+      Elf32_Phdr p32[phnum];
+      Elf64_Phdr p64[phnum];
+    } phdr;
+    dst.d_buf = &phdr;
+    dst.d_size = sizeof phdr;
+    if (unlikely (gelf_xlatetom (mod->main.elf, &dst, &src,
+				 ehdr.e32.e_ident[EI_DATA]) == NULL))
+      return DWFL_E_LIBELF;
+    if (ehdr.e32.e_ident[EI_CLASS] == ELFCLASS32)
+      {
+	for (uint_fast16_t i = 0; i < phnum; ++i)
+	  if (phdr.p32[i].p_type == PT_INTERP)
+	    {
+	      interp = phdr.p32[i].p_vaddr;
+	      break;
+	    }
+      }
+    else
+      {
+	for (uint_fast16_t i = 0; i < phnum; ++i)
+	  if (phdr.p32[i].p_type == PT_INTERP)
+	    {
+	      interp = phdr.p32[i].p_vaddr;
+	      break;
+	    }
+      }
+  }
+
+  src.d_buf += src.d_size;
+  src.d_type = ELF_T_SHDR;
+  src.d_size = gelf_fsize (mod->main.elf, ELF_T_SHDR, shnum - 1, EV_CURRENT);
+
+  union
+  {
+    Elf32_Shdr s32[shnum - 1];
+    Elf64_Shdr s64[shnum - 1];
+  } shdr;
+  dst.d_buf = &shdr;
+  dst.d_size = sizeof shdr;
+  if (unlikely (gelf_xlatetom (mod->main.elf, &dst, &src,
+			       ehdr.e32.e_ident[EI_DATA]) == NULL))
+    return DWFL_E_LIBELF;
+
+  /* Now we can look at the original section headers of the main file
+     before it was prelinked.  First we'll apply our method to the main
+     file sections as they are after prelinking, to calculate the
+     synchronization address of the main file.  Then we'll apply that
+     same method to the saved section headers, to calculate the matching
+     synchronization address of the debug file.  */
+
+  GElf_Addr highest;
+
+  inline void consider_shdr (GElf_Word sh_type,
+			     GElf_Xword sh_flags,
+			     GElf_Addr sh_addr)
+  {
+    if ((sh_flags & SHF_ALLOC)
+	&& ((sh_type == SHT_PROGBITS && sh_addr != interp)
+	    || sh_type == SHT_NOBITS))
+      {
+	if (sh_addr > highest)
+	  highest = sh_addr;
+      }
+  }
+
+  highest = 0;
+  scn = NULL;
+  while ((scn = elf_nextscn (mod->main.elf, scn)) != NULL)
+    {
+      GElf_Shdr sh_mem;
+      GElf_Shdr *sh = gelf_getshdr (scn, &sh_mem);
+      if (unlikely (sh == NULL))
+	return DWFL_E_LIBELF;
+      consider_shdr (sh->sh_type, sh->sh_flags, sh->sh_addr);
+    }
+  if (highest > mod->main.vaddr)
+    {
+      mod->main.address_sync = highest;
+
+      highest = 0;
+      if (ehdr.e32.e_ident[EI_CLASS] == ELFCLASS32)
+	for (size_t i = 0; i < shnum - 1; ++i)
+	  consider_shdr (shdr.s32[i].sh_type, shdr.s32[i].sh_flags,
+			 shdr.s32[i].sh_addr);
+      else
+	for (size_t i = 0; i < shnum - 1; ++i)
+	  consider_shdr (shdr.s64[i].sh_type, shdr.s64[i].sh_flags,
+			 shdr.s64[i].sh_addr);
+
+      if (highest > mod->debug.vaddr)
+	mod->debug.address_sync = highest;
+      else
+	return DWFL_E_BAD_PRELINK;
+    }
+
+  return DWFL_E_NOERROR;
+}
 
 /* Find the separate debuginfo file for this module and open libelf on it.
    When we return success, MOD->debug is set up.  */
@@ -277,7 +517,10 @@ find_debuginfo (Dwfl_Module *mod)
 							   debuglink_file,
 							   debuglink_crc,
 							   &mod->debug.name);
-  return open_elf (mod, &mod->debug);
+  Dwfl_Error result = open_elf (mod, &mod->debug);
+  if (result == DWFL_E_NOERROR && mod->debug.address_sync != 0)
+    result = find_prelink_address_sync (mod);
+  return result;
 }
 
 
@@ -733,7 +976,7 @@ find_dw (Dwfl_Module *mod)
     {
     case DWFL_E_NOERROR:
       mod->debug.elf = mod->main.elf;
-      mod->debug.bias = mod->main.bias;
+      mod->debug.address_sync = mod->main.address_sync;
       return;
 
     case DWFL_E_NO_DWARF:
@@ -782,7 +1025,7 @@ dwfl_module_getdwarf (Dwfl_Module *mod, Dwarf_Addr *bias)
 	    (void) __libdwfl_relocate (mod, mod->debug.elf, false);
 	}
 
-      *bias = mod->debug.bias;
+      *bias = dwfl_adjusted_dwarf_addr (mod, 0);
       return mod->dw;
     }
 
diff --git a/elfutils/libdwfl/dwfl_module_getelf.c b/elfutils/libdwfl/dwfl_module_getelf.c
index 6414a9d3..b4e4a2b7 100644
--- a/elfutils/libdwfl/dwfl_module_getelf.c
+++ b/elfutils/libdwfl/dwfl_module_getelf.c
@@ -1,5 +1,5 @@
 /* Find debugging and symbol information for a module in libdwfl.
-   Copyright (C) 2009 Red Hat, Inc.
+   Copyright (C) 2009-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
@@ -78,7 +78,7 @@ dwfl_module_getelf (Dwfl_Module *mod, GElf_Addr *loadbase)
 	    }
 	}
 
-      *loadbase = mod->main.bias;
+      *loadbase = dwfl_adjusted_address (mod, 0);
       return mod->main.elf;
     }
 
diff --git a/elfutils/libdwfl/dwfl_module_getsym.c b/elfutils/libdwfl/dwfl_module_getsym.c
index f78e6ec0..6bc063bb 100644
--- a/elfutils/libdwfl/dwfl_module_getsym.c
+++ b/elfutils/libdwfl/dwfl_module_getsym.c
@@ -1,5 +1,5 @@
 /* Find debugging and symbol information for a module in libdwfl.
-   Copyright (C) 2006,2007,2009 Red Hat, Inc.
+   Copyright (C) 2006-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
@@ -114,7 +114,7 @@ dwfl_module_getsym (Dwfl_Module *mod, int ndx,
 	}
       else if (alloc)
 	/* Apply the bias to the symbol value.  */
-	sym->st_value += mod->symfile->bias;
+	sym->st_value = dwfl_adjusted_st_value (mod, sym->st_value);
       break;
     }
 
diff --git a/elfutils/libdwfl/dwfl_module_info.c b/elfutils/libdwfl/dwfl_module_info.c
index 759cb621..bfde6fc1 100644
--- a/elfutils/libdwfl/dwfl_module_info.c
+++ b/elfutils/libdwfl/dwfl_module_info.c
@@ -1,5 +1,5 @@
 /* Return information about a module.
-   Copyright (C) 2005 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
@@ -66,9 +66,11 @@ dwfl_module_info (Dwfl_Module *mod, void ***userdata,
     *end = mod->high_addr;
 
   if (dwbias)
-    *dwbias = mod->debug.elf == NULL ? (Dwarf_Addr) -1 : mod->debug.bias;
+    *dwbias = (mod->debug.elf == NULL ? (Dwarf_Addr) -1
+	       : dwfl_adjusted_dwarf_addr (mod, 0));
   if (symbias)
-    *symbias = mod->symfile == NULL ? (Dwarf_Addr) -1 : mod->symfile->bias;
+    *symbias = (mod->symfile == NULL ? (Dwarf_Addr) -1
+		: dwfl_adjusted_st_value (mod, 0));
 
   if (mainfile)
     *mainfile = mod->main.name;
diff --git a/elfutils/libdwfl/dwfl_nextcu.c b/elfutils/libdwfl/dwfl_nextcu.c
index 6db3e0f1..90862d20 100644
--- a/elfutils/libdwfl/dwfl_nextcu.c
+++ b/elfutils/libdwfl/dwfl_nextcu.c
@@ -1,5 +1,5 @@
 /* Iterate through DWARF compilation units across all modules.
-   Copyright (C) 2005 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
@@ -75,7 +75,7 @@ dwfl_nextcu (Dwfl *dwfl, Dwarf_Die *lastcu, Dwarf_Addr *bias)
 
       if (cu != NULL)
 	{
-	  *bias = mod->debug.bias;
+	  *bias = dwfl_adjusted_dwarf_addr (mod, 0);
 	  return &cu->die;
 	}
 
diff --git a/elfutils/libdwfl/dwfl_report_elf.c b/elfutils/libdwfl/dwfl_report_elf.c
index 062a647f..4c4132b1 100644
--- a/elfutils/libdwfl/dwfl_report_elf.c
+++ b/elfutils/libdwfl/dwfl_report_elf.c
@@ -72,6 +72,8 @@ __libdwfl_report_elf (Dwfl *dwfl, const char *name, const char *file_name,
       return NULL;
     }
 
+  GElf_Addr vaddr = 0;
+  GElf_Addr address_sync = 0;
   GElf_Addr start = 0, end = 0, bias = 0;
   switch (ehdr->e_type)
     {
@@ -198,13 +200,15 @@ __libdwfl_report_elf (Dwfl *dwfl, const char *name, const char *file_name,
 	    goto elf_error;
 	  if (ph->p_type == PT_LOAD)
 	    {
+	      vaddr = ph->p_vaddr & -ph->p_align;
+	      address_sync = ph->p_vaddr + ph->p_memsz;
 	      if ((base & (ph->p_align - 1)) != 0)
 		base = (base + ph->p_align - 1) & -ph->p_align;
 	      start = base + (ph->p_vaddr & -ph->p_align);
 	      break;
 	    }
 	}
-      bias = base;
+      bias = start - vaddr;
 
       for (size_t i = phnum; i-- > 0;)
 	{
@@ -248,13 +252,16 @@ __libdwfl_report_elf (Dwfl *dwfl, const char *name, const char *file_name,
       if (m->main.elf == NULL)
 	{
 	  m->main.elf = elf;
-	  m->main.bias = bias;
+	  m->main.vaddr = vaddr;
+	  m->main.address_sync = address_sync;
+	  m->main_bias = bias;
 	  m->e_type = ehdr->e_type;
 	}
       else
 	{
 	  elf_end (elf);
-	  if (m->main.bias != base)
+	  if (m->main_bias != bias
+	      || m->main.vaddr != vaddr || m->main.address_sync != address_sync)
 	    goto overlap;
 	}
     }
diff --git a/elfutils/libdwfl/dwfl_segment_report_module.c b/elfutils/libdwfl/dwfl_segment_report_module.c
index 3f77cfc7..012a0fde 100644
--- a/elfutils/libdwfl/dwfl_segment_report_module.c
+++ b/elfutils/libdwfl/dwfl_segment_report_module.c
@@ -270,6 +270,7 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
   /* Collect the unbiased bounds of the module here.  */
   GElf_Addr module_start = -1l;
   GElf_Addr module_end = 0;
+  GElf_Addr module_address_sync = 0;
 
   /* If we see PT_DYNAMIC, record it here.  */
   GElf_Addr dyn_vaddr = 0;
@@ -400,9 +401,11 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
 	    found_bias = true;
 	  }
 
-	vaddr &= -align;
-	if (vaddr < module_start)
-	  module_start = vaddr;
+	if ((vaddr & -align) < module_start)
+	  {
+	    module_start = vaddr & -align;
+	    module_address_sync = vaddr + memsz;
+	  }
 
 	if (module_end < vaddr_end)
 	  module_end = vaddr_end;
@@ -662,7 +665,8 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
     {
       /* Install the file in the module.  */
       mod->main.elf = elf;
-      mod->main.bias = bias;
+      mod->main.vaddr = module_start - bias;
+      mod->main.address_sync = module_address_sync;
     }
 
   return finish ();
diff --git a/elfutils/libdwfl/libdwflP.h b/elfutils/libdwfl/libdwflP.h
index e4c7e7c8..1f7532bf 100644
--- a/elfutils/libdwfl/libdwflP.h
+++ b/elfutils/libdwfl/libdwflP.h
@@ -1,5 +1,5 @@
 /* Internal definitions for libdwfl.
-   Copyright (C) 2005-2010 Red Hat, Inc.
+   Copyright (C) 2005-2011 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -94,7 +94,8 @@
   DWFL_ERROR (ALREADY_ELF, N_("ELF file opened"))			      \
   DWFL_ERROR (BADELF, N_("not a valid ELF file"))			      \
   DWFL_ERROR (WEIRD_TYPE, N_("cannot handle DWARF type description"))	      \
-  DWFL_ERROR (WRONG_ID_ELF, N_("ELF file does not match build ID"))
+  DWFL_ERROR (WRONG_ID_ELF, N_("ELF file does not match build ID"))	      \
+  DWFL_ERROR (BAD_PRELINK, N_("corrupt .gnu.prelink_undo section data"))
 
 #define DWFL_ERROR(name, text) DWFL_E_##name,
 typedef enum { DWFL_ERRORS DWFL_E_NUM } Dwfl_Error;
@@ -140,7 +141,14 @@ struct dwfl_file
   bool relocated;		/* Partial relocation of all sections done.  */
 
   Elf *elf;
-  GElf_Addr bias;		/* Actual load address - p_vaddr.  */
+
+  /* This is the lowest p_vaddr in this ELF file, aligned to p_align.
+     For a file without phdrs, this is zero.  */
+  GElf_Addr vaddr;
+
+  /* This is an address chosen for synchronization between the main file
+     and the debug file.  See dwfl_module_getdwarf.c for how it's chosen.  */
+  GElf_Addr address_sync;
 };
 
 struct Dwfl_Module
@@ -154,6 +162,7 @@ struct Dwfl_Module
   GElf_Addr low_addr, high_addr;
 
   struct dwfl_file main, debug;
+  GElf_Addr main_bias;
   Ebl *ebl;
   GElf_Half e_type;		/* GElf_Ehdr.e_type cache.  */
   Dwfl_Error elferr;		/* Previous failure to open main file.  */
@@ -236,6 +245,50 @@ dwfl_linecu_inline (const Dwfl_Line *line)
 }
 #define dwfl_linecu dwfl_linecu_inline
 
+static inline GElf_Addr
+dwfl_adjusted_address (Dwfl_Module *mod, GElf_Addr addr)
+{
+  return addr + mod->main_bias;
+}
+
+static inline GElf_Addr
+dwfl_deadjust_address (Dwfl_Module *mod, GElf_Addr addr)
+{
+  return addr - mod->main_bias;
+}
+
+static inline Dwarf_Addr
+dwfl_adjusted_dwarf_addr (Dwfl_Module *mod, Dwarf_Addr addr)
+{
+  return dwfl_adjusted_address (mod, (addr
+				      - mod->debug.address_sync
+				      + mod->main.address_sync));
+}
+
+static inline Dwarf_Addr
+dwfl_deadjust_dwarf_addr (Dwfl_Module *mod, Dwarf_Addr addr)
+{
+  return (dwfl_deadjust_address (mod, addr)
+	  - mod->main.address_sync
+	  + mod->debug.address_sync);
+}
+
+static inline GElf_Addr
+dwfl_adjusted_st_value (Dwfl_Module *mod, GElf_Addr addr)
+{
+  if (mod->symfile == &mod->main)
+    return dwfl_adjusted_address (mod, addr);
+  return dwfl_adjusted_dwarf_addr (mod, addr);
+}
+
+static inline GElf_Addr
+dwfl_deadjust_st_value (Dwfl_Module *mod, GElf_Addr addr)
+{
+  if (mod->symfile == &mod->main)
+    return dwfl_deadjust_address (mod, addr);
+  return dwfl_deadjust_dwarf_addr (mod, addr);
+}
+
 /* This describes a contiguous address range that lies in a single CU.
    We condense runs of Dwarf_Arange entries for the same CU into this.  */
 struct dwfl_arange
diff --git a/elfutils/libdwfl/link_map.c b/elfutils/libdwfl/link_map.c
index 8ec06269..05839b3a 100644
--- a/elfutils/libdwfl/link_map.c
+++ b/elfutils/libdwfl/link_map.c
@@ -515,11 +515,11 @@ consider_executable (Dwfl_Module *mod, GElf_Addr at_phdr, GElf_Addr at_entry,
 
 	      /* If we're changing the module's address range,
 		 we've just invalidated the module lookup table.  */
-	      if (bias != mod->main.bias)
+	      GElf_Addr mod_bias = dwfl_adjusted_address (mod, 0);
+	      if (bias != mod_bias)
 		{
-		  mod->low_addr -= mod->main.bias;
-		  mod->high_addr -= mod->main.bias;
-		  mod->main.bias = bias;
+		  mod->low_addr -= mod_bias;
+		  mod->high_addr -= mod_bias;
 		  mod->low_addr += bias;
 		  mod->high_addr += bias;
 
@@ -554,7 +554,7 @@ consider_executable (Dwfl_Module *mod, GElf_Addr at_phdr, GElf_Addr at_entry,
   if (d_val_vaddr != 0)
     {
       /* Now we have the final address from which to read &r_debug.  */
-      d_val_vaddr += mod->main.bias;
+      d_val_vaddr = dwfl_adjusted_address (mod, d_val_vaddr);
 
       void *buffer = NULL;
       size_t buffer_available = addrsize (ehdr.e_ident[EI_CLASS]);
diff --git a/elfutils/libdwfl/relocate.c b/elfutils/libdwfl/relocate.c
index 0075c7f9..95206f47 100644
--- a/elfutils/libdwfl/relocate.c
+++ b/elfutils/libdwfl/relocate.c
@@ -99,7 +99,7 @@ __libdwfl_relocate_value (Dwfl_Module *mod, Elf *elf, size_t *shstrndx,
 
   if (refshdr->sh_flags & SHF_ALLOC)
     /* Apply the adjustment.  */
-    *value += refshdr->sh_addr + mod->main.bias;
+    *value += dwfl_adjusted_address (mod, refshdr->sh_addr);
 
   return DWFL_E_NOERROR;
 }
@@ -275,7 +275,7 @@ resolve_symbol (Dwfl_Module *referer, struct reloc_symtab_cache *symtab,
 
 		if (m->e_type != ET_REL)
 		  {
-		    sym->st_value += m->symfile->bias;
+		    sym->st_value = dwfl_adjusted_st_value (m, sym->st_value);
 		    return DWFL_E_NOERROR;
 		  }
 
diff --git a/elfutils/libelf/ChangeLog b/elfutils/libelf/ChangeLog
index a8ded88e..d88e2fe5 100644
--- a/elfutils/libelf/ChangeLog
+++ b/elfutils/libelf/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf_getdata_rawchunk.c (elf_getdata_rawchunk): Fix off64_t overflow
+	when MAXIMUM_SIZE == ~0.
+
 2010-08-18  Roland McGrath  <roland@redhat.com>
 
 	* gelf_fsize.c (__libelf_type_sizes): Add entries for ELF_T_LIB
diff --git a/elfutils/libelf/elf_getdata_rawchunk.c b/elfutils/libelf/elf_getdata_rawchunk.c
index 5af0f7f3..3ec2100a 100644
--- a/elfutils/libelf/elf_getdata_rawchunk.c
+++ b/elfutils/libelf/elf_getdata_rawchunk.c
@@ -78,8 +78,8 @@ elf_getdata_rawchunk (elf, offset, size, type)
       return NULL;
     }
 
-  if (unlikely (size > elf->maximum_size
-		|| (off64_t) (elf->maximum_size - size) < offset))
+  if (unlikely (offset < 0 || offset + (off64_t) size < offset
+		|| offset + size > elf->maximum_size))
     {
       /* Invalid request.  */
       __libelf_seterrno (ELF_E_INVALID_OP);
diff --git a/elfutils/po/de.gmo b/elfutils/po/de.gmo
index 5a0f6a0f..88abb6e4 100644
--- a/elfutils/po/de.gmo
+++ b/elfutils/po/de.gmo
diff --git a/elfutils/po/de.po b/elfutils/po/de.po
index 3f38aab8..a93d4778 100644
--- a/elfutils/po/de.po
+++ b/elfutils/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elfutils VERSION\n"
 "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
-"POT-Creation-Date: 2010-09-13 09:45-0700\n"
+"POT-Creation-Date: 2011-01-12 17:51-0500\n"
 "PO-Revision-Date: 2009-06-29 15:15+0200\n"
 "Last-Translator: Michael Münch <micm@fedoraproject.org>\n"
 "Language-Team: German\n"
@@ -367,6 +367,11 @@ msgstr "konnte Elf-Deskriptor nicht erzeugen: %s"
 msgid "ELF file does not match build ID"
 msgstr ""
 
+#: libdwfl/libdwflP.h:98
+#, fuzzy
+msgid "corrupt .gnu.prelink_undo section data"
+msgstr "konnte Abschnittsdaten nicht holen: %s"
+
 #: libebl/eblbackendname.c:63
 msgid "No backend"
 msgstr "Kein Backend"
@@ -597,7 +602,7 @@ msgstr ""
 #: src/addr2line.c:189 src/ar.c:289 src/elfcmp.c:555 src/elflint.c:239
 #: src/findtextrel.c:170 src/ld.c:957 src/nm.c:253 src/objdump.c:181
 #: src/ranlib.c:136 src/readelf.c:456 src/size.c:219 src/strings.c:227
-#: src/strip.c:204 src/unstrip.c:234
+#: src/strip.c:210 src/unstrip.c:234
 #, c-format
 msgid ""
 "Copyright (C) %s Red Hat, Inc.\n"
@@ -612,7 +617,7 @@ msgstr ""
 #: src/addr2line.c:194 src/ar.c:294 src/elfcmp.c:560 src/elflint.c:244
 #: src/findtextrel.c:175 src/ld.c:962 src/nm.c:258 src/objdump.c:186
 #: src/ranlib.c:141 src/readelf.c:461 src/size.c:224 src/strings.c:232
-#: src/strip.c:209 src/unstrip.c:239
+#: src/strip.c:215 src/unstrip.c:239
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
@@ -1018,7 +1023,7 @@ msgstr ""
 
 #: src/elfcmp.c:607 src/findtextrel.c:229 src/ldgeneric.c:1767
 #: src/ldgeneric.c:4257 src/nm.c:363 src/ranlib.c:169 src/size.c:301
-#: src/strings.c:183 src/strip.c:433 src/strip.c:468 src/unstrip.c:1913
+#: src/strings.c:183 src/strip.c:443 src/strip.c:478 src/unstrip.c:1913
 #: src/unstrip.c:1942
 #, c-format
 msgid "cannot open '%s'"
@@ -2682,7 +2687,7 @@ msgid "Locate source of text relocations in FILEs (a.out by default)."
 msgstr ""
 
 #: src/findtextrel.c:84 src/nm.c:111 src/objdump.c:80 src/size.c:92
-#: src/strings.c:92 src/strip.c:97
+#: src/strings.c:92 src/strip.c:100
 msgid "[FILE...]"
 msgstr ""
 
@@ -2696,72 +2701,72 @@ msgstr ""
 msgid "'%s' is not a DSO or PIE"
 msgstr ""
 
-#: src/findtextrel.c:274
+#: src/findtextrel.c:277
 #, c-format
 msgid "getting get section header of section %zu: %s"
 msgstr ""
 
-#: src/findtextrel.c:292
+#: src/findtextrel.c:300
 #, c-format
 msgid "cannot read dynamic section: %s"
 msgstr ""
 
-#: src/findtextrel.c:307
+#: src/findtextrel.c:321
 #, c-format
 msgid "no text relocations reported in '%s'"
 msgstr ""
 
-#: src/findtextrel.c:319
+#: src/findtextrel.c:333
 #, c-format
 msgid "while reading ELF file"
 msgstr ""
 
-#: src/findtextrel.c:328 src/findtextrel.c:345
+#: src/findtextrel.c:342 src/findtextrel.c:359
 #, c-format
 msgid "cannot get program header index at offset %d: %s"
 msgstr ""
 
-#: src/findtextrel.c:397
+#: src/findtextrel.c:411
 #, c-format
 msgid "cannot get section header of section %Zu: %s"
 msgstr ""
 
-#: src/findtextrel.c:409
+#: src/findtextrel.c:423
 #, c-format
 msgid "cannot get symbol table section %zu in '%s': %s"
 msgstr ""
 
-#: src/findtextrel.c:429 src/findtextrel.c:452
+#: src/findtextrel.c:443 src/findtextrel.c:466
 #, c-format
 msgid "cannot get relocation at index %d in section %zu in '%s': %s"
 msgstr ""
 
-#: src/findtextrel.c:517
+#: src/findtextrel.c:531
 #, c-format
 msgid "%s not compiled with -fpic/-fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:570
+#: src/findtextrel.c:584
 #, c-format
 msgid ""
 "the file containing the function '%s' is not compiled with -fpic/-fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:577 src/findtextrel.c:597
+#: src/findtextrel.c:591 src/findtextrel.c:611
 #, c-format
 msgid ""
 "the file containing the function '%s' might not be compiled with -fpic/-"
 "fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:585
+#: src/findtextrel.c:599
 #, c-format
 msgid ""
 "either the file containing the function '%s' or the file containing the "
 "function '%s' is not compiled with -fpic/-fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:605
+#: src/findtextrel.c:619
 #, c-format
 msgid ""
 "a relocation modifies memory at offset %llu in a write-protected segment\n"
@@ -3168,7 +3173,7 @@ msgstr ""
 msgid "Warning: size of `%s' changed from %<PRIu64> in %s to %<PRIu64> in %s"
 msgstr ""
 
-#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:543
+#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:553
 #, c-format
 msgid "cannot determine number of sections: %s"
 msgstr ""
@@ -3465,7 +3470,7 @@ msgstr ""
 msgid "default visibility set as local and global"
 msgstr "Standard-Sichtbarkeit auf lokal und global gesetzt"
 
-#: src/nm.c:74 src/strip.c:73
+#: src/nm.c:74 src/strip.c:74
 msgid "Output selection:"
 msgstr ""
 
@@ -3531,7 +3536,7 @@ msgstr "Kennzeichne schwache Symbole"
 msgid "Print size of defined symbols"
 msgstr "Zeige Grösse der definierten Symbole"
 
-#: src/nm.c:98 src/size.c:80 src/strip.c:78 src/unstrip.c:81
+#: src/nm.c:98 src/size.c:80 src/strip.c:79 src/unstrip.c:81
 msgid "Output options:"
 msgstr "Ausgabeoptionen:"
 
@@ -3551,18 +3556,18 @@ msgstr "Sortierreihenfolge umkehren"
 msgid "List symbols from FILEs (a.out by default)."
 msgstr ""
 
-#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:121
+#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:124
 #, c-format
 msgid "%s: INTERNAL ERROR %d (%s-%s): %s"
 msgstr "%s: INTERNER FEHLER %d (%s-%s): %s"
 
 #: src/nm.c:380 src/nm.c:392 src/size.c:317 src/size.c:326 src/size.c:337
-#: src/strip.c:1816
+#: src/strip.c:1878
 #, c-format
 msgid "while closing '%s'"
 msgstr "beim Schliessen von '%s'"
 
-#: src/nm.c:402 src/objdump.c:296 src/strip.c:359
+#: src/nm.c:402 src/objdump.c:296 src/strip.c:369
 #, c-format
 msgid "%s: File format not recognized"
 msgstr "%s: Dateiformat nicht erkannt"
@@ -3605,7 +3610,7 @@ msgstr "Kann Suchbaum nicht erstellen"
 #: src/readelf.c:1742 src/readelf.c:1952 src/readelf.c:2206 src/readelf.c:2272
 #: src/readelf.c:2350 src/readelf.c:2848 src/readelf.c:2884 src/readelf.c:2946
 #: src/readelf.c:6934 src/readelf.c:7832 src/readelf.c:7979 src/readelf.c:8047
-#: src/size.c:425 src/size.c:499 src/strip.c:483
+#: src/size.c:425 src/size.c:499 src/strip.c:493
 #, c-format
 msgid "cannot get section header string table index"
 msgstr ""
@@ -5320,149 +5325,158 @@ msgstr "re-mmap fehlgeschlagen"
 msgid "mprotect failed"
 msgstr "mprotect fehlgeschlagen"
 
-#: src/strip.c:74
+#: src/strip.c:75
 msgid "Place stripped output into FILE"
 msgstr ""
 
-#: src/strip.c:75
+#: src/strip.c:76
 msgid "Extract the removed sections into FILE"
 msgstr ""
 
-#: src/strip.c:76
+#: src/strip.c:77
 msgid "Embed name FILE instead of -f argument"
 msgstr ""
 
-#: src/strip.c:80
+#: src/strip.c:81
 msgid "Remove all debugging symbols"
 msgstr ""
 
-#: src/strip.c:84
+#: src/strip.c:85
+msgid "Remove section headers (not recommended)"
+msgstr ""
+
+#: src/strip.c:87
 msgid "Copy modified/access timestamps to the output"
 msgstr ""
 
-#: src/strip.c:86
+#: src/strip.c:89
 msgid "Remove .comment section"
 msgstr ""
 
-#: src/strip.c:89
+#: src/strip.c:92
 msgid "Relax a few rules to handle slightly broken ELF files"
 msgstr ""
 
-#: src/strip.c:94
+#: src/strip.c:97
 msgid "Discard symbols from object files."
 msgstr ""
 
-#: src/strip.c:186
+#: src/strip.c:192
 #, c-format
 msgid "Only one input file allowed together with '-o' and '-f'"
 msgstr ""
 
-#: src/strip.c:222
+#: src/strip.c:228
 #, c-format
 msgid "-f option specified twice"
 msgstr ""
 
-#: src/strip.c:231
+#: src/strip.c:237
 #, c-format
 msgid "-F option specified twice"
 msgstr ""
 
-#: src/strip.c:240 src/unstrip.c:125
+#: src/strip.c:246 src/unstrip.c:125
 #, c-format
 msgid "-o option specified twice"
 msgstr ""
 
-#: src/strip.c:260
+#: src/strip.c:266
 #, c-format
 msgid "-R option supports only .comment section"
 msgstr ""
 
-#: src/strip.c:298 src/strip.c:322
+#: src/strip.c:308 src/strip.c:332
 #, c-format
 msgid "cannot stat input file '%s'"
 msgstr ""
 
-#: src/strip.c:312
+#: src/strip.c:322
 #, c-format
 msgid "while opening '%s'"
 msgstr ""
 
-#: src/strip.c:350
+#: src/strip.c:360
 #, c-format
 msgid "%s: cannot use -o or -f when stripping archive"
 msgstr ""
 
-#: src/strip.c:448
+#: src/strip.c:458
 #, c-format
 msgid "cannot open EBL backend"
 msgstr ""
 
-#: src/strip.c:498 src/strip.c:522
+#: src/strip.c:508 src/strip.c:532
 #, c-format
 msgid "cannot create new file '%s': %s"
 msgstr ""
 
-#: src/strip.c:582
+#: src/strip.c:592
 #, c-format
 msgid "illformed file '%s'"
 msgstr ""
 
-#: src/strip.c:869 src/strip.c:956
+#: src/strip.c:880 src/strip.c:967
 #, c-format
 msgid "while generating output file: %s"
 msgstr ""
 
-#: src/strip.c:929 src/strip.c:1668
+#: src/strip.c:940 src/strip.c:1683
 #, c-format
 msgid "%s: error while creating ELF header: %s"
 msgstr ""
 
-#: src/strip.c:943
+#: src/strip.c:954
 #, c-format
 msgid "while preparing output for '%s'"
 msgstr ""
 
-#: src/strip.c:994 src/strip.c:1050
+#: src/strip.c:1005 src/strip.c:1061
 #, c-format
 msgid "while create section header section: %s"
 msgstr ""
 
-#: src/strip.c:1000
+#: src/strip.c:1011
 #, c-format
 msgid "cannot allocate section data: %s"
 msgstr ""
 
-#: src/strip.c:1059
+#: src/strip.c:1070
 #, c-format
 msgid "while create section header string table: %s"
 msgstr ""
 
-#: src/strip.c:1593 src/strip.c:1690
+#: src/strip.c:1595 src/strip.c:1705
 #, c-format
 msgid "while writing '%s': %s"
 msgstr ""
 
-#: src/strip.c:1604
+#: src/strip.c:1606
 #, c-format
 msgid "while creating '%s'"
 msgstr ""
 
-#: src/strip.c:1616
+#: src/strip.c:1628
 #, c-format
 msgid "while computing checksum for debug information"
 msgstr ""
 
-#: src/strip.c:1676
+#: src/strip.c:1691
 #, c-format
 msgid "%s: error while reading the file: %s"
 msgstr ""
 
-#: src/strip.c:1722 src/strip.c:1729
+#: src/strip.c:1730 src/strip.c:1750
+#, fuzzy, c-format
+msgid "while writing '%s'"
+msgstr "beim Schliessen von '%s'"
+
+#: src/strip.c:1784 src/strip.c:1791
 #, c-format
 msgid "error while finishing '%s': %s"
 msgstr ""
 
-#: src/strip.c:1752 src/strip.c:1809
+#: src/strip.c:1814 src/strip.c:1871
 #, c-format
 msgid "cannot set access and modification date of '%s'"
 msgstr ""
diff --git a/elfutils/po/elfutils.pot b/elfutils/po/elfutils.pot
index d7ec1cec..014a4eec 100644
--- a/elfutils/po/elfutils.pot
+++ b/elfutils/po/elfutils.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: elfutils 0.149\n"
+"Project-Id-Version: elfutils 0.151\n"
 "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
-"POT-Creation-Date: 2010-09-13 09:45-0700\n"
+"POT-Creation-Date: 2011-01-12 17:51-0500\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"
@@ -356,6 +356,10 @@ msgstr ""
 msgid "ELF file does not match build ID"
 msgstr ""
 
+#: libdwfl/libdwflP.h:98
+msgid "corrupt .gnu.prelink_undo section data"
+msgstr ""
+
 #: libebl/eblbackendname.c:63
 msgid "No backend"
 msgstr ""
@@ -584,7 +588,7 @@ msgstr ""
 #: src/addr2line.c:189 src/ar.c:289 src/elfcmp.c:555 src/elflint.c:239
 #: src/findtextrel.c:170 src/ld.c:957 src/nm.c:253 src/objdump.c:181
 #: src/ranlib.c:136 src/readelf.c:456 src/size.c:219 src/strings.c:227
-#: src/strip.c:204 src/unstrip.c:234
+#: src/strip.c:210 src/unstrip.c:234
 #, c-format
 msgid ""
 "Copyright (C) %s Red Hat, Inc.\n"
@@ -595,7 +599,7 @@ msgstr ""
 #: src/addr2line.c:194 src/ar.c:294 src/elfcmp.c:560 src/elflint.c:244
 #: src/findtextrel.c:175 src/ld.c:962 src/nm.c:258 src/objdump.c:186
 #: src/ranlib.c:141 src/readelf.c:461 src/size.c:224 src/strings.c:232
-#: src/strip.c:209 src/unstrip.c:239
+#: src/strip.c:215 src/unstrip.c:239
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
@@ -999,7 +1003,7 @@ msgstr ""
 
 #: src/elfcmp.c:607 src/findtextrel.c:229 src/ldgeneric.c:1767
 #: src/ldgeneric.c:4257 src/nm.c:363 src/ranlib.c:169 src/size.c:301
-#: src/strings.c:183 src/strip.c:433 src/strip.c:468 src/unstrip.c:1913
+#: src/strings.c:183 src/strip.c:443 src/strip.c:478 src/unstrip.c:1913
 #: src/unstrip.c:1942
 #, c-format
 msgid "cannot open '%s'"
@@ -2663,7 +2667,7 @@ msgid "Locate source of text relocations in FILEs (a.out by default)."
 msgstr ""
 
 #: src/findtextrel.c:84 src/nm.c:111 src/objdump.c:80 src/size.c:92
-#: src/strings.c:92 src/strip.c:97
+#: src/strings.c:92 src/strip.c:100
 msgid "[FILE...]"
 msgstr ""
 
@@ -2677,72 +2681,72 @@ msgstr ""
 msgid "'%s' is not a DSO or PIE"
 msgstr ""
 
-#: src/findtextrel.c:274
+#: src/findtextrel.c:277
 #, c-format
 msgid "getting get section header of section %zu: %s"
 msgstr ""
 
-#: src/findtextrel.c:292
+#: src/findtextrel.c:300
 #, c-format
 msgid "cannot read dynamic section: %s"
 msgstr ""
 
-#: src/findtextrel.c:307
+#: src/findtextrel.c:321
 #, c-format
 msgid "no text relocations reported in '%s'"
 msgstr ""
 
-#: src/findtextrel.c:319
+#: src/findtextrel.c:333
 #, c-format
 msgid "while reading ELF file"
 msgstr ""
 
-#: src/findtextrel.c:328 src/findtextrel.c:345
+#: src/findtextrel.c:342 src/findtextrel.c:359
 #, c-format
 msgid "cannot get program header index at offset %d: %s"
 msgstr ""
 
-#: src/findtextrel.c:397
+#: src/findtextrel.c:411
 #, c-format
 msgid "cannot get section header of section %Zu: %s"
 msgstr ""
 
-#: src/findtextrel.c:409
+#: src/findtextrel.c:423
 #, c-format
 msgid "cannot get symbol table section %zu in '%s': %s"
 msgstr ""
 
-#: src/findtextrel.c:429 src/findtextrel.c:452
+#: src/findtextrel.c:443 src/findtextrel.c:466
 #, c-format
 msgid "cannot get relocation at index %d in section %zu in '%s': %s"
 msgstr ""
 
-#: src/findtextrel.c:517
+#: src/findtextrel.c:531
 #, c-format
 msgid "%s not compiled with -fpic/-fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:570
+#: src/findtextrel.c:584
 #, c-format
 msgid ""
 "the file containing the function '%s' is not compiled with -fpic/-fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:577 src/findtextrel.c:597
+#: src/findtextrel.c:591 src/findtextrel.c:611
 #, c-format
 msgid ""
 "the file containing the function '%s' might not be compiled with -fpic/-"
 "fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:585
+#: src/findtextrel.c:599
 #, c-format
 msgid ""
 "either the file containing the function '%s' or the file containing the "
 "function '%s' is not compiled with -fpic/-fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:605
+#: src/findtextrel.c:619
 #, c-format
 msgid ""
 "a relocation modifies memory at offset %llu in a write-protected segment\n"
@@ -3149,7 +3153,7 @@ msgstr ""
 msgid "Warning: size of `%s' changed from %<PRIu64> in %s to %<PRIu64> in %s"
 msgstr ""
 
-#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:543
+#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:553
 #, c-format
 msgid "cannot determine number of sections: %s"
 msgstr ""
@@ -3446,7 +3450,7 @@ msgstr ""
 msgid "default visibility set as local and global"
 msgstr ""
 
-#: src/nm.c:74 src/strip.c:73
+#: src/nm.c:74 src/strip.c:74
 msgid "Output selection:"
 msgstr ""
 
@@ -3508,7 +3512,7 @@ msgstr ""
 msgid "Print size of defined symbols"
 msgstr ""
 
-#: src/nm.c:98 src/size.c:80 src/strip.c:78 src/unstrip.c:81
+#: src/nm.c:98 src/size.c:80 src/strip.c:79 src/unstrip.c:81
 msgid "Output options:"
 msgstr ""
 
@@ -3528,18 +3532,18 @@ msgstr ""
 msgid "List symbols from FILEs (a.out by default)."
 msgstr ""
 
-#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:121
+#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:124
 #, c-format
 msgid "%s: INTERNAL ERROR %d (%s-%s): %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:1816
+#: src/strip.c:1878
 #, c-format
 msgid "while closing '%s'"
 msgstr ""
 
-#: src/nm.c:402 src/objdump.c:296 src/strip.c:359
+#: src/nm.c:402 src/objdump.c:296 src/strip.c:369
 #, c-format
 msgid "%s: File format not recognized"
 msgstr ""
@@ -3580,7 +3584,7 @@ msgstr ""
 #: src/readelf.c:1742 src/readelf.c:1952 src/readelf.c:2206 src/readelf.c:2272
 #: src/readelf.c:2350 src/readelf.c:2848 src/readelf.c:2884 src/readelf.c:2946
 #: src/readelf.c:6934 src/readelf.c:7832 src/readelf.c:7979 src/readelf.c:8047
-#: src/size.c:425 src/size.c:499 src/strip.c:483
+#: src/size.c:425 src/size.c:499 src/strip.c:493
 #, c-format
 msgid "cannot get section header string table index"
 msgstr ""
@@ -5283,149 +5287,158 @@ msgstr ""
 msgid "mprotect failed"
 msgstr ""
 
-#: src/strip.c:74
+#: src/strip.c:75
 msgid "Place stripped output into FILE"
 msgstr ""
 
-#: src/strip.c:75
+#: src/strip.c:76
 msgid "Extract the removed sections into FILE"
 msgstr ""
 
-#: src/strip.c:76
+#: src/strip.c:77
 msgid "Embed name FILE instead of -f argument"
 msgstr ""
 
-#: src/strip.c:80
+#: src/strip.c:81
 msgid "Remove all debugging symbols"
 msgstr ""
 
-#: src/strip.c:84
+#: src/strip.c:85
+msgid "Remove section headers (not recommended)"
+msgstr ""
+
+#: src/strip.c:87
 msgid "Copy modified/access timestamps to the output"
 msgstr ""
 
-#: src/strip.c:86
+#: src/strip.c:89
 msgid "Remove .comment section"
 msgstr ""
 
-#: src/strip.c:89
+#: src/strip.c:92
 msgid "Relax a few rules to handle slightly broken ELF files"
 msgstr ""
 
-#: src/strip.c:94
+#: src/strip.c:97
 msgid "Discard symbols from object files."
 msgstr ""
 
-#: src/strip.c:186
+#: src/strip.c:192
 #, c-format
 msgid "Only one input file allowed together with '-o' and '-f'"
 msgstr ""
 
-#: src/strip.c:222
+#: src/strip.c:228
 #, c-format
 msgid "-f option specified twice"
 msgstr ""
 
-#: src/strip.c:231
+#: src/strip.c:237
 #, c-format
 msgid "-F option specified twice"
 msgstr ""
 
-#: src/strip.c:240 src/unstrip.c:125
+#: src/strip.c:246 src/unstrip.c:125
 #, c-format
 msgid "-o option specified twice"
 msgstr ""
 
-#: src/strip.c:260
+#: src/strip.c:266
 #, c-format
 msgid "-R option supports only .comment section"
 msgstr ""
 
-#: src/strip.c:298 src/strip.c:322
+#: src/strip.c:308 src/strip.c:332
 #, c-format
 msgid "cannot stat input file '%s'"
 msgstr ""
 
-#: src/strip.c:312
+#: src/strip.c:322
 #, c-format
 msgid "while opening '%s'"
 msgstr ""
 
-#: src/strip.c:350
+#: src/strip.c:360
 #, c-format
 msgid "%s: cannot use -o or -f when stripping archive"
 msgstr ""
 
-#: src/strip.c:448
+#: src/strip.c:458
 #, c-format
 msgid "cannot open EBL backend"
 msgstr ""
 
-#: src/strip.c:498 src/strip.c:522
+#: src/strip.c:508 src/strip.c:532
 #, c-format
 msgid "cannot create new file '%s': %s"
 msgstr ""
 
-#: src/strip.c:582
+#: src/strip.c:592
 #, c-format
 msgid "illformed file '%s'"
 msgstr ""
 
-#: src/strip.c:869 src/strip.c:956
+#: src/strip.c:880 src/strip.c:967
 #, c-format
 msgid "while generating output file: %s"
 msgstr ""
 
-#: src/strip.c:929 src/strip.c:1668
+#: src/strip.c:940 src/strip.c:1683
 #, c-format
 msgid "%s: error while creating ELF header: %s"
 msgstr ""
 
-#: src/strip.c:943
+#: src/strip.c:954
 #, c-format
 msgid "while preparing output for '%s'"
 msgstr ""
 
-#: src/strip.c:994 src/strip.c:1050
+#: src/strip.c:1005 src/strip.c:1061
 #, c-format
 msgid "while create section header section: %s"
 msgstr ""
 
-#: src/strip.c:1000
+#: src/strip.c:1011
 #, c-format
 msgid "cannot allocate section data: %s"
 msgstr ""
 
-#: src/strip.c:1059
+#: src/strip.c:1070
 #, c-format
 msgid "while create section header string table: %s"
 msgstr ""
 
-#: src/strip.c:1593 src/strip.c:1690
+#: src/strip.c:1595 src/strip.c:1705
 #, c-format
 msgid "while writing '%s': %s"
 msgstr ""
 
-#: src/strip.c:1604
+#: src/strip.c:1606
 #, c-format
 msgid "while creating '%s'"
 msgstr ""
 
-#: src/strip.c:1616
+#: src/strip.c:1628
 #, c-format
 msgid "while computing checksum for debug information"
 msgstr ""
 
-#: src/strip.c:1676
+#: src/strip.c:1691
 #, c-format
 msgid "%s: error while reading the file: %s"
 msgstr ""
 
-#: src/strip.c:1722 src/strip.c:1729
+#: src/strip.c:1730 src/strip.c:1750
+#, c-format
+msgid "while writing '%s'"
+msgstr ""
+
+#: src/strip.c:1784 src/strip.c:1791
 #, c-format
 msgid "error while finishing '%s': %s"
 msgstr ""
 
-#: src/strip.c:1752 src/strip.c:1809
+#: src/strip.c:1814 src/strip.c:1871
 #, c-format
 msgid "cannot set access and modification date of '%s'"
 msgstr ""
diff --git a/elfutils/po/en@boldquot.gmo b/elfutils/po/en@boldquot.gmo
index 82981ecd..b5e2f852 100644
--- a/elfutils/po/en@boldquot.gmo
+++ b/elfutils/po/en@boldquot.gmo
diff --git a/elfutils/po/en@boldquot.po b/elfutils/po/en@boldquot.po
index 6f59cebb..6495da4d 100644
--- a/elfutils/po/en@boldquot.po
+++ b/elfutils/po/en@boldquot.po
@@ -1,7 +1,7 @@
 # English translations for elfutils package.
-# Copyright (C) 2010 Red Hat, Inc.
+# Copyright (C) 2011 Red Hat, Inc.
 # This file is distributed under the same license as the elfutils package.
-# Automatically generated, 2010.
+# Automatically generated, 2011.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: elfutils 0.149\n"
+"Project-Id-Version: elfutils 0.151\n"
 "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
-"POT-Creation-Date: 2010-09-13 09:45-0700\n"
-"PO-Revision-Date: 2010-09-13 09:45-0700\n"
+"POT-Creation-Date: 2011-01-12 17:51-0500\n"
+"PO-Revision-Date: 2011-01-12 17:51-0500\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -382,6 +382,10 @@ msgstr "cannot handle DWARF type description"
 msgid "ELF file does not match build ID"
 msgstr "ELF file does not match build ID"
 
+#: libdwfl/libdwflP.h:98
+msgid "corrupt .gnu.prelink_undo section data"
+msgstr "corrupt .gnu.prelink_undo section data"
+
 #: libebl/eblbackendname.c:63
 msgid "No backend"
 msgstr "No backend"
@@ -612,7 +616,7 @@ msgstr "[ADDR...]"
 #: src/addr2line.c:189 src/ar.c:289 src/elfcmp.c:555 src/elflint.c:239
 #: src/findtextrel.c:170 src/ld.c:957 src/nm.c:253 src/objdump.c:181
 #: src/ranlib.c:136 src/readelf.c:456 src/size.c:219 src/strings.c:227
-#: src/strip.c:204 src/unstrip.c:234
+#: src/strip.c:210 src/unstrip.c:234
 #, c-format
 msgid ""
 "Copyright (C) %s Red Hat, Inc.\n"
@@ -626,7 +630,7 @@ msgstr ""
 #: src/addr2line.c:194 src/ar.c:294 src/elfcmp.c:560 src/elflint.c:244
 #: src/findtextrel.c:175 src/ld.c:962 src/nm.c:258 src/objdump.c:186
 #: src/ranlib.c:141 src/readelf.c:461 src/size.c:224 src/strings.c:232
-#: src/strip.c:209 src/unstrip.c:239
+#: src/strip.c:215 src/unstrip.c:239
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
@@ -1034,7 +1038,7 @@ msgstr "Invalid value ‘%s’ for --gaps parameter."
 
 #: src/elfcmp.c:607 src/findtextrel.c:229 src/ldgeneric.c:1767
 #: src/ldgeneric.c:4257 src/nm.c:363 src/ranlib.c:169 src/size.c:301
-#: src/strings.c:183 src/strip.c:433 src/strip.c:468 src/unstrip.c:1913
+#: src/strings.c:183 src/strip.c:443 src/strip.c:478 src/unstrip.c:1913
 #: src/unstrip.c:1942
 #, c-format
 msgid "cannot open '%s'"
@@ -2844,7 +2848,7 @@ msgid "Locate source of text relocations in FILEs (a.out by default)."
 msgstr "Locate source of text relocations in FILEs (a.out by default)."
 
 #: src/findtextrel.c:84 src/nm.c:111 src/objdump.c:80 src/size.c:92
-#: src/strings.c:92 src/strip.c:97
+#: src/strings.c:92 src/strip.c:100
 msgid "[FILE...]"
 msgstr "[FILE...]"
 
@@ -2858,52 +2862,52 @@ msgstr "cannot get ELF header '%s': %s"
 msgid "'%s' is not a DSO or PIE"
 msgstr "‘%s’ is not a DSO or PIE"
 
-#: src/findtextrel.c:274
+#: src/findtextrel.c:277
 #, c-format
 msgid "getting get section header of section %zu: %s"
 msgstr "getting get section header of section %zu: %s"
 
-#: src/findtextrel.c:292
+#: src/findtextrel.c:300
 #, c-format
 msgid "cannot read dynamic section: %s"
 msgstr "cannot read dynamic section: %s"
 
-#: src/findtextrel.c:307
+#: src/findtextrel.c:321
 #, c-format
 msgid "no text relocations reported in '%s'"
 msgstr "no text relocations reported in ‘%s’"
 
-#: src/findtextrel.c:319
+#: src/findtextrel.c:333
 #, c-format
 msgid "while reading ELF file"
 msgstr "while reading ELF file"
 
-#: src/findtextrel.c:328 src/findtextrel.c:345
+#: src/findtextrel.c:342 src/findtextrel.c:359
 #, c-format
 msgid "cannot get program header index at offset %d: %s"
 msgstr "cannot get program header index at offset %d: %s"
 
-#: src/findtextrel.c:397
+#: src/findtextrel.c:411
 #, c-format
 msgid "cannot get section header of section %Zu: %s"
 msgstr "cannot get section header of section %Zu: %s"
 
-#: src/findtextrel.c:409
+#: src/findtextrel.c:423
 #, c-format
 msgid "cannot get symbol table section %zu in '%s': %s"
 msgstr "cannot get symbol table section %zu in '%s': %s"
 
-#: src/findtextrel.c:429 src/findtextrel.c:452
+#: src/findtextrel.c:443 src/findtextrel.c:466
 #, c-format
 msgid "cannot get relocation at index %d in section %zu in '%s': %s"
 msgstr "cannot get relocation at index %d in section %zu in '%s': %s"
 
-#: src/findtextrel.c:517
+#: src/findtextrel.c:531
 #, c-format
 msgid "%s not compiled with -fpic/-fPIC\n"
 msgstr "%s not compiled with -fpic/-fPIC\n"
 
-#: src/findtextrel.c:570
+#: src/findtextrel.c:584
 #, c-format
 msgid ""
 "the file containing the function '%s' is not compiled with -fpic/-fPIC\n"
@@ -2911,7 +2915,7 @@ msgstr ""
 "the file containing the function ‘%s’ is not compiled with -fpic/-"
 "fPIC\n"
 
-#: src/findtextrel.c:577 src/findtextrel.c:597
+#: src/findtextrel.c:591 src/findtextrel.c:611
 #, c-format
 msgid ""
 "the file containing the function '%s' might not be compiled with -fpic/-"
@@ -2920,7 +2924,7 @@ msgstr ""
 "the file containing the function ‘%s’ might not be compiled with -"
 "fpic/-fPIC\n"
 
-#: src/findtextrel.c:585
+#: src/findtextrel.c:599
 #, c-format
 msgid ""
 "either the file containing the function '%s' or the file containing the "
@@ -2929,7 +2933,7 @@ msgstr ""
 "either the file containing the function ‘%s’ or the file containing "
 "the function ‘%s’ is not compiled with -fpic/-fPIC\n"
 
-#: src/findtextrel.c:605
+#: src/findtextrel.c:619
 #, c-format
 msgid ""
 "a relocation modifies memory at offset %llu in a write-protected segment\n"
@@ -3339,7 +3343,7 @@ msgid "Warning: size of `%s' changed from %<PRIu64> in %s to %<PRIu64> in %s"
 msgstr ""
 "Warning: size of ‘%s’ changed from %<PRIu64> in %s to %<PRIu64> in %s"
 
-#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:543
+#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:553
 #, c-format
 msgid "cannot determine number of sections: %s"
 msgstr "cannot determine number of sections: %s"
@@ -3643,7 +3647,7 @@ msgstr ""
 msgid "default visibility set as local and global"
 msgstr "default visibility set as local and global"
 
-#: src/nm.c:74 src/strip.c:73
+#: src/nm.c:74 src/strip.c:74
 msgid "Output selection:"
 msgstr "Output selection:"
 
@@ -3707,7 +3711,7 @@ msgstr "Mark weak symbols"
 msgid "Print size of defined symbols"
 msgstr "Print size of defined symbols"
 
-#: src/nm.c:98 src/size.c:80 src/strip.c:78 src/unstrip.c:81
+#: src/nm.c:98 src/size.c:80 src/strip.c:79 src/unstrip.c:81
 msgid "Output options:"
 msgstr "Output options:"
 
@@ -3727,18 +3731,18 @@ msgstr "Reverse the sense of the sort"
 msgid "List symbols from FILEs (a.out by default)."
 msgstr "List symbols from FILEs (a.out by default)."
 
-#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:121
+#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:124
 #, c-format
 msgid "%s: INTERNAL ERROR %d (%s-%s): %s"
 msgstr "%s: INTERNAL ERROR %d (%s-%s): %s"
 
 #: src/nm.c:380 src/nm.c:392 src/size.c:317 src/size.c:326 src/size.c:337
-#: src/strip.c:1816
+#: src/strip.c:1878
 #, c-format
 msgid "while closing '%s'"
 msgstr "while closing ‘%s’"
 
-#: src/nm.c:402 src/objdump.c:296 src/strip.c:359
+#: src/nm.c:402 src/objdump.c:296 src/strip.c:369
 #, c-format
 msgid "%s: File format not recognized"
 msgstr "%s: File format not recognized"
@@ -3781,7 +3785,7 @@ msgstr "cannot create search tree"
 #: src/readelf.c:1742 src/readelf.c:1952 src/readelf.c:2206 src/readelf.c:2272
 #: src/readelf.c:2350 src/readelf.c:2848 src/readelf.c:2884 src/readelf.c:2946
 #: src/readelf.c:6934 src/readelf.c:7832 src/readelf.c:7979 src/readelf.c:8047
-#: src/size.c:425 src/size.c:499 src/strip.c:483
+#: src/size.c:425 src/size.c:499 src/strip.c:493
 #, c-format
 msgid "cannot get section header string table index"
 msgstr "cannot get section header string table index"
@@ -5693,149 +5697,158 @@ msgstr "re-mmap failed"
 msgid "mprotect failed"
 msgstr "mprotect failed"
 
-#: src/strip.c:74
+#: src/strip.c:75
 msgid "Place stripped output into FILE"
 msgstr "Place stripped output into FILE"
 
-#: src/strip.c:75
+#: src/strip.c:76
 msgid "Extract the removed sections into FILE"
 msgstr "Extract the removed sections into FILE"
 
-#: src/strip.c:76
+#: src/strip.c:77
 msgid "Embed name FILE instead of -f argument"
 msgstr "Embed name FILE instead of -f argument"
 
-#: src/strip.c:80
+#: src/strip.c:81
 msgid "Remove all debugging symbols"
 msgstr "Remove all debugging symbols"
 
-#: src/strip.c:84
+#: src/strip.c:85
+msgid "Remove section headers (not recommended)"
+msgstr "Remove section headers (not recommended)"
+
+#: src/strip.c:87
 msgid "Copy modified/access timestamps to the output"
 msgstr "Copy modified/access timestamps to the output"
 
-#: src/strip.c:86
+#: src/strip.c:89
 msgid "Remove .comment section"
 msgstr "Remove .comment section"
 
-#: src/strip.c:89
+#: src/strip.c:92
 msgid "Relax a few rules to handle slightly broken ELF files"
 msgstr "Relax a few rules to handle slightly broken ELF files"
 
-#: src/strip.c:94
+#: src/strip.c:97
 msgid "Discard symbols from object files."
 msgstr "Discard symbols from object files."
 
-#: src/strip.c:186
+#: src/strip.c:192
 #, c-format
 msgid "Only one input file allowed together with '-o' and '-f'"
 msgstr "Only one input file allowed together with ‘-o’ and ‘-f’"
 
-#: src/strip.c:222
+#: src/strip.c:228
 #, c-format
 msgid "-f option specified twice"
 msgstr "-f option specified twice"
 
-#: src/strip.c:231
+#: src/strip.c:237
 #, c-format
 msgid "-F option specified twice"
 msgstr "-F option specified twice"
 
-#: src/strip.c:240 src/unstrip.c:125
+#: src/strip.c:246 src/unstrip.c:125
 #, c-format
 msgid "-o option specified twice"
 msgstr "-o option specified twice"
 
-#: src/strip.c:260
+#: src/strip.c:266
 #, c-format
 msgid "-R option supports only .comment section"
 msgstr "-R option supports only .comment section"
 
-#: src/strip.c:298 src/strip.c:322
+#: src/strip.c:308 src/strip.c:332
 #, c-format
 msgid "cannot stat input file '%s'"
 msgstr "cannot stat input file ‘%s’"
 
-#: src/strip.c:312
+#: src/strip.c:322
 #, c-format
 msgid "while opening '%s'"
 msgstr "while opening ‘%s’"
 
-#: src/strip.c:350
+#: src/strip.c:360
 #, c-format
 msgid "%s: cannot use -o or -f when stripping archive"
 msgstr "%s: cannot use -o or -f when stripping archive"
 
-#: src/strip.c:448
+#: src/strip.c:458
 #, c-format
 msgid "cannot open EBL backend"
 msgstr "cannot open EBL backend"
 
-#: src/strip.c:498 src/strip.c:522
+#: src/strip.c:508 src/strip.c:532
 #, c-format
 msgid "cannot create new file '%s': %s"
 msgstr "cannot create new file '%s': %s"
 
-#: src/strip.c:582
+#: src/strip.c:592
 #, c-format
 msgid "illformed file '%s'"
 msgstr "illformed file ‘%s’"
 
-#: src/strip.c:869 src/strip.c:956
+#: src/strip.c:880 src/strip.c:967
 #, c-format
 msgid "while generating output file: %s"
 msgstr "while generating output file: %s"
 
-#: src/strip.c:929 src/strip.c:1668
+#: src/strip.c:940 src/strip.c:1683
 #, c-format
 msgid "%s: error while creating ELF header: %s"
 msgstr "%s: error while creating ELF header: %s"
 
-#: src/strip.c:943
+#: src/strip.c:954
 #, c-format
 msgid "while preparing output for '%s'"
 msgstr "while preparing output for ‘%s’"
 
-#: src/strip.c:994 src/strip.c:1050
+#: src/strip.c:1005 src/strip.c:1061
 #, c-format
 msgid "while create section header section: %s"
 msgstr "while create section header section: %s"
 
-#: src/strip.c:1000
+#: src/strip.c:1011
 #, c-format
 msgid "cannot allocate section data: %s"
 msgstr "cannot allocate section data: %s"
 
-#: src/strip.c:1059
+#: src/strip.c:1070
 #, c-format
 msgid "while create section header string table: %s"
 msgstr "while create section header string table: %s"
 
-#: src/strip.c:1593 src/strip.c:1690
+#: src/strip.c:1595 src/strip.c:1705
 #, c-format
 msgid "while writing '%s': %s"
 msgstr "while writing '%s': %s"
 
-#: src/strip.c:1604
+#: src/strip.c:1606
 #, c-format
 msgid "while creating '%s'"
 msgstr "while creating ‘%s’"
 
-#: src/strip.c:1616
+#: src/strip.c:1628
 #, c-format
 msgid "while computing checksum for debug information"
 msgstr "while computing checksum for debug information"
 
-#: src/strip.c:1676
+#: src/strip.c:1691
 #, c-format
 msgid "%s: error while reading the file: %s"
 msgstr "%s: error while reading the file: %s"
 
-#: src/strip.c:1722 src/strip.c:1729
+#: src/strip.c:1730 src/strip.c:1750
+#, c-format
+msgid "while writing '%s'"
+msgstr "while writing ‘%s’"
+
+#: src/strip.c:1784 src/strip.c:1791
 #, c-format
 msgid "error while finishing '%s': %s"
 msgstr "error while finishing '%s': %s"
 
-#: src/strip.c:1752 src/strip.c:1809
+#: src/strip.c:1814 src/strip.c:1871
 #, c-format
 msgid "cannot set access and modification date of '%s'"
 msgstr "cannot set access and modification date of ‘%s’"
diff --git a/elfutils/po/en@quot.gmo b/elfutils/po/en@quot.gmo
index 434670d3..1358583a 100644
--- a/elfutils/po/en@quot.gmo
+++ b/elfutils/po/en@quot.gmo
diff --git a/elfutils/po/en@quot.po b/elfutils/po/en@quot.po
index a8aaaf5e..4a60b51f 100644
--- a/elfutils/po/en@quot.po
+++ b/elfutils/po/en@quot.po
@@ -1,7 +1,7 @@
 # English translations for elfutils package.
-# Copyright (C) 2010 Red Hat, Inc.
+# Copyright (C) 2011 Red Hat, Inc.
 # This file is distributed under the same license as the elfutils package.
-# Automatically generated, 2010.
+# Automatically generated, 2011.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: elfutils 0.149\n"
+"Project-Id-Version: elfutils 0.151\n"
 "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
-"POT-Creation-Date: 2010-09-13 09:45-0700\n"
-"PO-Revision-Date: 2010-09-13 09:45-0700\n"
+"POT-Creation-Date: 2011-01-12 17:51-0500\n"
+"PO-Revision-Date: 2011-01-12 17:51-0500\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -379,6 +379,10 @@ msgstr "cannot handle DWARF type description"
 msgid "ELF file does not match build ID"
 msgstr "ELF file does not match build ID"
 
+#: libdwfl/libdwflP.h:98
+msgid "corrupt .gnu.prelink_undo section data"
+msgstr "corrupt .gnu.prelink_undo section data"
+
 #: libebl/eblbackendname.c:63
 msgid "No backend"
 msgstr "No backend"
@@ -609,7 +613,7 @@ msgstr "[ADDR...]"
 #: src/addr2line.c:189 src/ar.c:289 src/elfcmp.c:555 src/elflint.c:239
 #: src/findtextrel.c:170 src/ld.c:957 src/nm.c:253 src/objdump.c:181
 #: src/ranlib.c:136 src/readelf.c:456 src/size.c:219 src/strings.c:227
-#: src/strip.c:204 src/unstrip.c:234
+#: src/strip.c:210 src/unstrip.c:234
 #, c-format
 msgid ""
 "Copyright (C) %s Red Hat, Inc.\n"
@@ -623,7 +627,7 @@ msgstr ""
 #: src/addr2line.c:194 src/ar.c:294 src/elfcmp.c:560 src/elflint.c:244
 #: src/findtextrel.c:175 src/ld.c:962 src/nm.c:258 src/objdump.c:186
 #: src/ranlib.c:141 src/readelf.c:461 src/size.c:224 src/strings.c:232
-#: src/strip.c:209 src/unstrip.c:239
+#: src/strip.c:215 src/unstrip.c:239
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
@@ -1029,7 +1033,7 @@ msgstr "Invalid value ‘%s’ for --gaps parameter."
 
 #: src/elfcmp.c:607 src/findtextrel.c:229 src/ldgeneric.c:1767
 #: src/ldgeneric.c:4257 src/nm.c:363 src/ranlib.c:169 src/size.c:301
-#: src/strings.c:183 src/strip.c:433 src/strip.c:468 src/unstrip.c:1913
+#: src/strings.c:183 src/strip.c:443 src/strip.c:478 src/unstrip.c:1913
 #: src/unstrip.c:1942
 #, c-format
 msgid "cannot open '%s'"
@@ -2830,7 +2834,7 @@ msgid "Locate source of text relocations in FILEs (a.out by default)."
 msgstr "Locate source of text relocations in FILEs (a.out by default)."
 
 #: src/findtextrel.c:84 src/nm.c:111 src/objdump.c:80 src/size.c:92
-#: src/strings.c:92 src/strip.c:97
+#: src/strings.c:92 src/strip.c:100
 msgid "[FILE...]"
 msgstr "[FILE...]"
 
@@ -2844,59 +2848,59 @@ msgstr "cannot get ELF header '%s': %s"
 msgid "'%s' is not a DSO or PIE"
 msgstr "‘%s’ is not a DSO or PIE"
 
-#: src/findtextrel.c:274
+#: src/findtextrel.c:277
 #, c-format
 msgid "getting get section header of section %zu: %s"
 msgstr "getting get section header of section %zu: %s"
 
-#: src/findtextrel.c:292
+#: src/findtextrel.c:300
 #, c-format
 msgid "cannot read dynamic section: %s"
 msgstr "cannot read dynamic section: %s"
 
-#: src/findtextrel.c:307
+#: src/findtextrel.c:321
 #, c-format
 msgid "no text relocations reported in '%s'"
 msgstr "no text relocations reported in ‘%s’"
 
-#: src/findtextrel.c:319
+#: src/findtextrel.c:333
 #, c-format
 msgid "while reading ELF file"
 msgstr "while reading ELF file"
 
-#: src/findtextrel.c:328 src/findtextrel.c:345
+#: src/findtextrel.c:342 src/findtextrel.c:359
 #, c-format
 msgid "cannot get program header index at offset %d: %s"
 msgstr "cannot get program header index at offset %d: %s"
 
-#: src/findtextrel.c:397
+#: src/findtextrel.c:411
 #, c-format
 msgid "cannot get section header of section %Zu: %s"
 msgstr "cannot get section header of section %Zu: %s"
 
-#: src/findtextrel.c:409
+#: src/findtextrel.c:423
 #, c-format
 msgid "cannot get symbol table section %zu in '%s': %s"
 msgstr "cannot get symbol table section %zu in '%s': %s"
 
-#: src/findtextrel.c:429 src/findtextrel.c:452
+#: src/findtextrel.c:443 src/findtextrel.c:466
 #, c-format
 msgid "cannot get relocation at index %d in section %zu in '%s': %s"
 msgstr "cannot get relocation at index %d in section %zu in '%s': %s"
 
-#: src/findtextrel.c:517
+#: src/findtextrel.c:531
 #, c-format
 msgid "%s not compiled with -fpic/-fPIC\n"
 msgstr "%s not compiled with -fpic/-fPIC\n"
 
-#: src/findtextrel.c:570
+#: src/findtextrel.c:584
 #, c-format
 msgid ""
 "the file containing the function '%s' is not compiled with -fpic/-fPIC\n"
 msgstr ""
 "the file containing the function ‘%s’ is not compiled with -fpic/-fPIC\n"
 
-#: src/findtextrel.c:577 src/findtextrel.c:597
+#: src/findtextrel.c:591 src/findtextrel.c:611
 #, c-format
 msgid ""
 "the file containing the function '%s' might not be compiled with -fpic/-"
@@ -2905,7 +2909,7 @@ msgstr ""
 "the file containing the function ‘%s’ might not be compiled with -fpic/-"
 "fPIC\n"
 
-#: src/findtextrel.c:585
+#: src/findtextrel.c:599
 #, c-format
 msgid ""
 "either the file containing the function '%s' or the file containing the "
@@ -2914,7 +2918,7 @@ msgstr ""
 "either the file containing the function ‘%s’ or the file containing the "
 "function ‘%s’ is not compiled with -fpic/-fPIC\n"
 
-#: src/findtextrel.c:605
+#: src/findtextrel.c:619
 #, c-format
 msgid ""
 "a relocation modifies memory at offset %llu in a write-protected segment\n"
@@ -3323,7 +3327,7 @@ msgstr "Warning: type of ‘%s’ changed from %s in %s to %s in %s"
 msgid "Warning: size of `%s' changed from %<PRIu64> in %s to %<PRIu64> in %s"
 msgstr "Warning: size of ‘%s’ changed from %<PRIu64> in %s to %<PRIu64> in %s"
 
-#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:543
+#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:553
 #, c-format
 msgid "cannot determine number of sections: %s"
 msgstr "cannot determine number of sections: %s"
@@ -3624,7 +3628,7 @@ msgstr "symbol ‘%s’ is declared both local and global for version ‘%s’"
 msgid "default visibility set as local and global"
 msgstr "default visibility set as local and global"
 
-#: src/nm.c:74 src/strip.c:73
+#: src/nm.c:74 src/strip.c:74
 msgid "Output selection:"
 msgstr "Output selection:"
 
@@ -3688,7 +3692,7 @@ msgstr "Mark weak symbols"
 msgid "Print size of defined symbols"
 msgstr "Print size of defined symbols"
 
-#: src/nm.c:98 src/size.c:80 src/strip.c:78 src/unstrip.c:81
+#: src/nm.c:98 src/size.c:80 src/strip.c:79 src/unstrip.c:81
 msgid "Output options:"
 msgstr "Output options:"
 
@@ -3708,18 +3712,18 @@ msgstr "Reverse the sense of the sort"
 msgid "List symbols from FILEs (a.out by default)."
 msgstr "List symbols from FILEs (a.out by default)."
 
-#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:121
+#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:124
 #, c-format
 msgid "%s: INTERNAL ERROR %d (%s-%s): %s"
 msgstr "%s: INTERNAL ERROR %d (%s-%s): %s"
 
 #: src/nm.c:380 src/nm.c:392 src/size.c:317 src/size.c:326 src/size.c:337
-#: src/strip.c:1816
+#: src/strip.c:1878
 #, c-format
 msgid "while closing '%s'"
 msgstr "while closing ‘%s’"
 
-#: src/nm.c:402 src/objdump.c:296 src/strip.c:359
+#: src/nm.c:402 src/objdump.c:296 src/strip.c:369
 #, c-format
 msgid "%s: File format not recognized"
 msgstr "%s: File format not recognized"
@@ -3762,7 +3766,7 @@ msgstr "cannot create search tree"
 #: src/readelf.c:1742 src/readelf.c:1952 src/readelf.c:2206 src/readelf.c:2272
 #: src/readelf.c:2350 src/readelf.c:2848 src/readelf.c:2884 src/readelf.c:2946
 #: src/readelf.c:6934 src/readelf.c:7832 src/readelf.c:7979 src/readelf.c:8047
-#: src/size.c:425 src/size.c:499 src/strip.c:483
+#: src/size.c:425 src/size.c:499 src/strip.c:493
 #, c-format
 msgid "cannot get section header string table index"
 msgstr "cannot get section header string table index"
@@ -5657,149 +5661,158 @@ msgstr "re-mmap failed"
 msgid "mprotect failed"
 msgstr "mprotect failed"
 
-#: src/strip.c:74
+#: src/strip.c:75
 msgid "Place stripped output into FILE"
 msgstr "Place stripped output into FILE"
 
-#: src/strip.c:75
+#: src/strip.c:76
 msgid "Extract the removed sections into FILE"
 msgstr "Extract the removed sections into FILE"
 
-#: src/strip.c:76
+#: src/strip.c:77
 msgid "Embed name FILE instead of -f argument"
 msgstr "Embed name FILE instead of -f argument"
 
-#: src/strip.c:80
+#: src/strip.c:81
 msgid "Remove all debugging symbols"
 msgstr "Remove all debugging symbols"
 
-#: src/strip.c:84
+#: src/strip.c:85
+msgid "Remove section headers (not recommended)"
+msgstr "Remove section headers (not recommended)"
+
+#: src/strip.c:87
 msgid "Copy modified/access timestamps to the output"
 msgstr "Copy modified/access timestamps to the output"
 
-#: src/strip.c:86
+#: src/strip.c:89
 msgid "Remove .comment section"
 msgstr "Remove .comment section"
 
-#: src/strip.c:89
+#: src/strip.c:92
 msgid "Relax a few rules to handle slightly broken ELF files"
 msgstr "Relax a few rules to handle slightly broken ELF files"
 
-#: src/strip.c:94
+#: src/strip.c:97
 msgid "Discard symbols from object files."
 msgstr "Discard symbols from object files."
 
-#: src/strip.c:186
+#: src/strip.c:192
 #, c-format
 msgid "Only one input file allowed together with '-o' and '-f'"
 msgstr "Only one input file allowed together with ‘-o’ and ‘-f’"
 
-#: src/strip.c:222
+#: src/strip.c:228
 #, c-format
 msgid "-f option specified twice"
 msgstr "-f option specified twice"
 
-#: src/strip.c:231
+#: src/strip.c:237
 #, c-format
 msgid "-F option specified twice"
 msgstr "-F option specified twice"
 
-#: src/strip.c:240 src/unstrip.c:125
+#: src/strip.c:246 src/unstrip.c:125
 #, c-format
 msgid "-o option specified twice"
 msgstr "-o option specified twice"
 
-#: src/strip.c:260
+#: src/strip.c:266
 #, c-format
 msgid "-R option supports only .comment section"
 msgstr "-R option supports only .comment section"
 
-#: src/strip.c:298 src/strip.c:322
+#: src/strip.c:308 src/strip.c:332
 #, c-format
 msgid "cannot stat input file '%s'"
 msgstr "cannot stat input file ‘%s’"
 
-#: src/strip.c:312
+#: src/strip.c:322
 #, c-format
 msgid "while opening '%s'"
 msgstr "while opening ‘%s’"
 
-#: src/strip.c:350
+#: src/strip.c:360
 #, c-format
 msgid "%s: cannot use -o or -f when stripping archive"
 msgstr "%s: cannot use -o or -f when stripping archive"
 
-#: src/strip.c:448
+#: src/strip.c:458
 #, c-format
 msgid "cannot open EBL backend"
 msgstr "cannot open EBL backend"
 
-#: src/strip.c:498 src/strip.c:522
+#: src/strip.c:508 src/strip.c:532
 #, c-format
 msgid "cannot create new file '%s': %s"
 msgstr "cannot create new file '%s': %s"
 
-#: src/strip.c:582
+#: src/strip.c:592
 #, c-format
 msgid "illformed file '%s'"
 msgstr "illformed file ‘%s’"
 
-#: src/strip.c:869 src/strip.c:956
+#: src/strip.c:880 src/strip.c:967
 #, c-format
 msgid "while generating output file: %s"
 msgstr "while generating output file: %s"
 
-#: src/strip.c:929 src/strip.c:1668
+#: src/strip.c:940 src/strip.c:1683
 #, c-format
 msgid "%s: error while creating ELF header: %s"
 msgstr "%s: error while creating ELF header: %s"
 
-#: src/strip.c:943
+#: src/strip.c:954
 #, c-format
 msgid "while preparing output for '%s'"
 msgstr "while preparing output for ‘%s’"
 
-#: src/strip.c:994 src/strip.c:1050
+#: src/strip.c:1005 src/strip.c:1061
 #, c-format
 msgid "while create section header section: %s"
 msgstr "while create section header section: %s"
 
-#: src/strip.c:1000
+#: src/strip.c:1011
 #, c-format
 msgid "cannot allocate section data: %s"
 msgstr "cannot allocate section data: %s"
 
-#: src/strip.c:1059
+#: src/strip.c:1070
 #, c-format
 msgid "while create section header string table: %s"
 msgstr "while create section header string table: %s"
 
-#: src/strip.c:1593 src/strip.c:1690
+#: src/strip.c:1595 src/strip.c:1705
 #, c-format
 msgid "while writing '%s': %s"
 msgstr "while writing '%s': %s"
 
-#: src/strip.c:1604
+#: src/strip.c:1606
 #, c-format
 msgid "while creating '%s'"
 msgstr "while creating ‘%s’"
 
-#: src/strip.c:1616
+#: src/strip.c:1628
 #, c-format
 msgid "while computing checksum for debug information"
 msgstr "while computing checksum for debug information"
 
-#: src/strip.c:1676
+#: src/strip.c:1691
 #, c-format
 msgid "%s: error while reading the file: %s"
 msgstr "%s: error while reading the file: %s"
 
-#: src/strip.c:1722 src/strip.c:1729
+#: src/strip.c:1730 src/strip.c:1750
+#, c-format
+msgid "while writing '%s'"
+msgstr "while writing ‘%s’"
+
+#: src/strip.c:1784 src/strip.c:1791
 #, c-format
 msgid "error while finishing '%s': %s"
 msgstr "error while finishing '%s': %s"
 
-#: src/strip.c:1752 src/strip.c:1809
+#: src/strip.c:1814 src/strip.c:1871
 #, c-format
 msgid "cannot set access and modification date of '%s'"
 msgstr "cannot set access and modification date of ‘%s’"
diff --git a/elfutils/po/es.gmo b/elfutils/po/es.gmo
index e0e347d2..5ecea6a7 100644
--- a/elfutils/po/es.gmo
+++ b/elfutils/po/es.gmo
diff --git a/elfutils/po/es.po b/elfutils/po/es.po
index aa5be2b5..bdbb337c 100644
--- a/elfutils/po/es.po
+++ b/elfutils/po/es.po
@@ -10,9 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elfutils.master.es\n"
 "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
-"POT-Creation-Date: 2010-09-13 09:45-0700\n"
-"PO-Revision-Date: 2010-08-26 08:59-0300\n"
-"Last-Translator: Héctor Daniel Cabrera <logan@fedoraproject.org>\n"
+"POT-Creation-Date: 2011-01-12 17:51-0500\n"
+"PO-Revision-Date: 2011-01-10 15:17-0300\n"
+"Last-Translator: Claudio Rodrigo Pereyra Diaz <claudiorodrigo@pereyradiaz."
+"com.ar>\n"
 "Language-Team: Fedora Spanish <trans-es@lists.fedoraproject.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -363,6 +364,11 @@ msgstr "no es posible manipular tipo de descripción DWARF"
 msgid "ELF file does not match build ID"
 msgstr "El archivo ELF no coincide con el ID construido"
 
+#: libdwfl/libdwflP.h:98
+#, fuzzy
+msgid "corrupt .gnu.prelink_undo section data"
+msgstr "no se puede leer sección '.gnu.prelink_undo': %s"
+
 #: libebl/eblbackendname.c:63
 msgid "No backend"
 msgstr "No hay segundo plano (Backend)"
@@ -596,7 +602,7 @@ msgstr "[DIREC...]"
 #: src/addr2line.c:189 src/ar.c:289 src/elfcmp.c:555 src/elflint.c:239
 #: src/findtextrel.c:170 src/ld.c:957 src/nm.c:253 src/objdump.c:181
 #: src/ranlib.c:136 src/readelf.c:456 src/size.c:219 src/strings.c:227
-#: src/strip.c:204 src/unstrip.c:234
+#: src/strip.c:210 src/unstrip.c:234
 #, c-format
 msgid ""
 "Copyright (C) %s Red Hat, Inc.\n"
@@ -612,7 +618,7 @@ msgstr ""
 #: src/addr2line.c:194 src/ar.c:294 src/elfcmp.c:560 src/elflint.c:244
 #: src/findtextrel.c:175 src/ld.c:962 src/nm.c:258 src/objdump.c:186
 #: src/ranlib.c:141 src/readelf.c:461 src/size.c:224 src/strings.c:232
-#: src/strip.c:209 src/unstrip.c:239
+#: src/strip.c:215 src/unstrip.c:239
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -1019,7 +1025,7 @@ msgstr "Valor inválido '%s' para parámetro --gaps"
 
 #: src/elfcmp.c:607 src/findtextrel.c:229 src/ldgeneric.c:1767
 #: src/ldgeneric.c:4257 src/nm.c:363 src/ranlib.c:169 src/size.c:301
-#: src/strings.c:183 src/strip.c:433 src/strip.c:468 src/unstrip.c:1913
+#: src/strings.c:183 src/strip.c:443 src/strip.c:478 src/unstrip.c:1913
 #: src/unstrip.c:1942
 #, c-format
 msgid "cannot open '%s'"
@@ -2954,7 +2960,7 @@ msgstr ""
 "Localizar origen de reubicaciones de texto en FICHEROS (a.out por defecto)."
 
 #: src/findtextrel.c:84 src/nm.c:111 src/objdump.c:80 src/size.c:92
-#: src/strings.c:92 src/strip.c:97
+#: src/strings.c:92 src/strip.c:100
 msgid "[FILE...]"
 msgstr "[FICHERO...]"
 
@@ -2968,62 +2974,62 @@ msgstr "No se puede obtener encabezamiento ELF '%s': %s"
 msgid "'%s' is not a DSO or PIE"
 msgstr "'%s' es no un DSO o PIE"
 
-#: src/findtextrel.c:274
+#: src/findtextrel.c:277
 #, c-format
 msgid "getting get section header of section %zu: %s"
 msgstr "obtener encabezamiento de sección get de sección %zu: %s"
 
-#: src/findtextrel.c:292
+#: src/findtextrel.c:300
 #, c-format
 msgid "cannot read dynamic section: %s"
 msgstr "No se puede leer sección dinámica: %s"
 
-#: src/findtextrel.c:307
+#: src/findtextrel.c:321
 #, c-format
 msgid "no text relocations reported in '%s'"
 msgstr "no hay reubicaciones de texto reportado en '%s'"
 
-#: src/findtextrel.c:319
+#: src/findtextrel.c:333
 #, c-format
 msgid "while reading ELF file"
 msgstr "Error al leer fichero ELF"
 
-#: src/findtextrel.c:328 src/findtextrel.c:345
+#: src/findtextrel.c:342 src/findtextrel.c:359
 #, c-format
 msgid "cannot get program header index at offset %d: %s"
 msgstr ""
 "Nos se puede obtener el índice de encabezamiento de programa en compensación "
 "%d: %s"
 
-#: src/findtextrel.c:397
+#: src/findtextrel.c:411
 #, c-format
 msgid "cannot get section header of section %Zu: %s"
 msgstr "No se puede obtener encabezamiento de sección %Zu: %s"
 
-#: src/findtextrel.c:409
+#: src/findtextrel.c:423
 #, c-format
 msgid "cannot get symbol table section %zu in '%s': %s"
 msgstr "No se puede obtener tabla de símbolos %zu en '%s': %s"
 
-#: src/findtextrel.c:429 src/findtextrel.c:452
+#: src/findtextrel.c:443 src/findtextrel.c:466
 #, c-format
 msgid "cannot get relocation at index %d in section %zu in '%s': %s"
 msgstr ""
 "No se puede obtener reubicación en índice %d en sección %zu en '%s': %s"
 
-#: src/findtextrel.c:517
+#: src/findtextrel.c:531
 #, c-format
 msgid "%s not compiled with -fpic/-fPIC\n"
 msgstr "%s no compilado con -fpic/-fPIC\n"
 
-#: src/findtextrel.c:570
+#: src/findtextrel.c:584
 #, c-format
 msgid ""
 "the file containing the function '%s' is not compiled with -fpic/-fPIC\n"
 msgstr ""
 "El archivo que contiene la función '%s' no está compilado con -fpic/-fPIC\n"
 
-#: src/findtextrel.c:577 src/findtextrel.c:597
+#: src/findtextrel.c:591 src/findtextrel.c:611
 #, c-format
 msgid ""
 "the file containing the function '%s' might not be compiled with -fpic/-"
@@ -3032,7 +3038,7 @@ msgstr ""
 "el fichero que contiene la función '%s' podría no estar compilado con -fpic/-"
 "fPIC\n"
 
-#: src/findtextrel.c:585
+#: src/findtextrel.c:599
 #, c-format
 msgid ""
 "either the file containing the function '%s' or the file containing the "
@@ -3041,7 +3047,7 @@ msgstr ""
 "Tanto el fichero que contiene la función '%s' como el fichero que contiene "
 "la función '%s' no están compilados con -fpic/-fPIC\n"
 
-#: src/findtextrel.c:605
+#: src/findtextrel.c:619
 #, c-format
 msgid ""
 "a relocation modifies memory at offset %llu in a write-protected segment\n"
@@ -3465,7 +3471,7 @@ msgid "Warning: size of `%s' changed from %<PRIu64> in %s to %<PRIu64> in %s"
 msgstr ""
 "Advertencia: el tamaño de `%s' cambió de %<PRIu64> en %s a %<PRIu64> en %s"
 
-#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:543
+#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:553
 #, c-format
 msgid "cannot determine number of sections: %s"
 msgstr "no se pudieron determinar el número de secciones: %s"
@@ -3792,7 +3798,7 @@ msgstr ""
 msgid "default visibility set as local and global"
 msgstr "la visibilidad establecida por defecto establecida como local y global"
 
-#: src/nm.c:74 src/strip.c:73
+#: src/nm.c:74 src/strip.c:74
 msgid "Output selection:"
 msgstr "Selección de salida:"
 
@@ -3856,7 +3862,7 @@ msgstr "Marcar símbolos débiles"
 msgid "Print size of defined symbols"
 msgstr "Tamaño de impresión de símbolos definidos"
 
-#: src/nm.c:98 src/size.c:80 src/strip.c:78 src/unstrip.c:81
+#: src/nm.c:98 src/size.c:80 src/strip.c:79 src/unstrip.c:81
 msgid "Output options:"
 msgstr "Opciones de salida:"
 
@@ -3876,18 +3882,18 @@ msgstr "Invertir el orden"
 msgid "List symbols from FILEs (a.out by default)."
 msgstr "Listar símbolos de FICHEROS (a.out por defecto)."
 
-#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:121
+#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:124
 #, c-format
 msgid "%s: INTERNAL ERROR %d (%s-%s): %s"
 msgstr "%s: ERROR INTERNO %d (%s-%s): %s"
 
 #: src/nm.c:380 src/nm.c:392 src/size.c:317 src/size.c:326 src/size.c:337
-#: src/strip.c:1816
+#: src/strip.c:1878
 #, c-format
 msgid "while closing '%s'"
 msgstr "error al cerrar '%s'"
 
-#: src/nm.c:402 src/objdump.c:296 src/strip.c:359
+#: src/nm.c:402 src/objdump.c:296 src/strip.c:369
 #, c-format
 msgid "%s: File format not recognized"
 msgstr "%s: No se reconoce el formato del fichero"
@@ -3930,7 +3936,7 @@ msgstr "No se puede crear el árbol de búsqueda"
 #: src/readelf.c:1742 src/readelf.c:1952 src/readelf.c:2206 src/readelf.c:2272
 #: src/readelf.c:2350 src/readelf.c:2848 src/readelf.c:2884 src/readelf.c:2946
 #: src/readelf.c:6934 src/readelf.c:7832 src/readelf.c:7979 src/readelf.c:8047
-#: src/size.c:425 src/size.c:499 src/strip.c:483
+#: src/size.c:425 src/size.c:499 src/strip.c:493
 #, c-format
 msgid "cannot get section header string table index"
 msgstr "no se puede obtener índice de cadena de encabezamiento de sección"
@@ -5014,22 +5020,22 @@ msgstr "%*s[%4<PRIuMAX>] %s  <TRUNCATED>\n"
 #: src/readelf.c:4295
 #, c-format
 msgid "%s %#<PRIx64> used with different address sizes"
-msgstr ""
+msgstr "%s %#<PRIx64> utilizado con direcciones de diferente tamaño"
 
 #: src/readelf.c:4302
 #, c-format
 msgid "%s %#<PRIx64> used with different offset sizes"
-msgstr ""
+msgstr "%s %#<PRIx64> utilizado con offsetr de diferente tamaño"
 
 #: src/readelf.c:4381
 #, c-format
 msgid " [%6tx]  <UNUSED GARBAGE IN REST OF SECTION>\n"
-msgstr ""
+msgstr " [%6tx] <MATERIAL INUTIL SIN UTILIZAR EN EL RESTO DE LA SECCION>\n"
 
 #: src/readelf.c:4389
 #, c-format
 msgid " [%6tx]  <UNUSED GARBAGE> ... %<PRIu64> bytes ...\n"
-msgstr ""
+msgstr " [%6tx]  <MATERIAL INUTIL NO UTILIZADO> ... %<PRIu64> bytes ...\n"
 
 #: src/readelf.c:4409
 #, c-format
@@ -5128,11 +5134,9 @@ msgid " [%6tx]  base address %s\n"
 msgstr " [%6tx]   (dirección base) %s\n"
 
 #: src/readelf.c:4596 src/readelf.c:6367
-#, fuzzy, c-format
+#, c-format
 msgid " [%6tx]  empty list\n"
-msgstr ""
-"\n"
-" [%6tx] Terminator cero\n"
+msgstr " [%6tx]  lista vacía\n"
 
 #: src/readelf.c:4605
 #, c-format
@@ -5489,9 +5493,8 @@ msgid "           %s..%s"
 msgstr "           %s..%s"
 
 #: src/readelf.c:6388
-#, fuzzy
 msgid "   <INVALID DATA>\n"
-msgstr " [%6tx]  <DATOS INV�LIDOS>\n"
+msgstr "   <DATOS INV�LIDOS>\n"
 
 #: src/readelf.c:6440
 #, c-format
@@ -5861,149 +5864,158 @@ msgstr "re-mmap falló"
 msgid "mprotect failed"
 msgstr "mprotect falló"
 
-#: src/strip.c:74
+#: src/strip.c:75
 msgid "Place stripped output into FILE"
 msgstr "Colocar la salida obtenida en FICHERO"
 
-#: src/strip.c:75
+#: src/strip.c:76
 msgid "Extract the removed sections into FILE"
 msgstr "Extraer secciones eliminadas en FICHERO"
 
-#: src/strip.c:76
+#: src/strip.c:77
 msgid "Embed name FILE instead of -f argument"
 msgstr "Incorporar nombre FILE en lugar de argumento -f"
 
-#: src/strip.c:80
+#: src/strip.c:81
 msgid "Remove all debugging symbols"
 msgstr "Elimina todos los símbolos de depuración"
 
-#: src/strip.c:84
+#: src/strip.c:85
+msgid "Remove section headers (not recommended)"
+msgstr "Quitar sección de cabeceras (no recomendado)"
+
+#: src/strip.c:87
 msgid "Copy modified/access timestamps to the output"
 msgstr "Copiar marcas de tiempo modificadas/acceso a la salida"
 
-#: src/strip.c:86
+#: src/strip.c:89
 msgid "Remove .comment section"
 msgstr "Quitar sección de comentario"
 
-#: src/strip.c:89
+#: src/strip.c:92
 msgid "Relax a few rules to handle slightly broken ELF files"
 msgstr "Relaja algunas reglas para manejar ficheros ELF rotos"
 
-#: src/strip.c:94
+#: src/strip.c:97
 msgid "Discard symbols from object files."
 msgstr "Descarta símbolos de archivos objeto."
 
-#: src/strip.c:186
+#: src/strip.c:192
 #, c-format
 msgid "Only one input file allowed together with '-o' and '-f'"
 msgstr "Sólo se permite ingresar un archivo junto con '-o' y '-f'"
 
-#: src/strip.c:222
+#: src/strip.c:228
 #, c-format
 msgid "-f option specified twice"
 msgstr "opción -f especificada dos veces"
 
-#: src/strip.c:231
+#: src/strip.c:237
 #, c-format
 msgid "-F option specified twice"
 msgstr "opción -F especificada dos veces"
 
-#: src/strip.c:240 src/unstrip.c:125
+#: src/strip.c:246 src/unstrip.c:125
 #, c-format
 msgid "-o option specified twice"
 msgstr "opción -o especificada dos veces"
 
-#: src/strip.c:260
+#: src/strip.c:266
 #, c-format
 msgid "-R option supports only .comment section"
 msgstr "la opción -R soporta únicamente. sección de comentario"
 
-#: src/strip.c:298 src/strip.c:322
+#: src/strip.c:308 src/strip.c:332
 #, c-format
 msgid "cannot stat input file '%s'"
 msgstr "no sepuede stat fichero de entrada '%s'"
 
-#: src/strip.c:312
+#: src/strip.c:322
 #, c-format
 msgid "while opening '%s'"
 msgstr "mientras se abría '%s'"
 
-#: src/strip.c:350
+#: src/strip.c:360
 #, c-format
 msgid "%s: cannot use -o or -f when stripping archive"
 msgstr "%s: no puede utilizarse -o o -f cuando se extrae un archivo"
 
-#: src/strip.c:448
+#: src/strip.c:458
 #, c-format
 msgid "cannot open EBL backend"
 msgstr "No se puede abrir el segundo plano EBL"
 
-#: src/strip.c:498 src/strip.c:522
+#: src/strip.c:508 src/strip.c:532
 #, c-format
 msgid "cannot create new file '%s': %s"
 msgstr "no se puede crear fichero nuevo '%s': %s"
 
-#: src/strip.c:582
+#: src/strip.c:592
 #, c-format
 msgid "illformed file '%s'"
 msgstr "Fichero illformed '%s'"
 
-#: src/strip.c:869 src/strip.c:956
+#: src/strip.c:880 src/strip.c:967
 #, c-format
 msgid "while generating output file: %s"
 msgstr "al generar fichero de salida: %s"
 
-#: src/strip.c:929 src/strip.c:1668
+#: src/strip.c:940 src/strip.c:1683
 #, c-format
 msgid "%s: error while creating ELF header: %s"
 msgstr "%s: error al crear encabezamiento ELF: %s"
 
-#: src/strip.c:943
+#: src/strip.c:954
 #, c-format
 msgid "while preparing output for '%s'"
 msgstr "al preparar salida para '%s'"
 
-#: src/strip.c:994 src/strip.c:1050
+#: src/strip.c:1005 src/strip.c:1061
 #, c-format
 msgid "while create section header section: %s"
 msgstr "al crear sección de encabezamiento de sección: %s"
 
-#: src/strip.c:1000
+#: src/strip.c:1011
 #, c-format
 msgid "cannot allocate section data: %s"
 msgstr "no se puede asignar espacio para los datos: %s"
 
-#: src/strip.c:1059
+#: src/strip.c:1070
 #, c-format
 msgid "while create section header string table: %s"
 msgstr "al crear tabla de cadenas de encabezamiento de sección: %s"
 
-#: src/strip.c:1593 src/strip.c:1690
+#: src/strip.c:1595 src/strip.c:1705
 #, c-format
 msgid "while writing '%s': %s"
 msgstr "al escribir '%s': %s"
 
-#: src/strip.c:1604
+#: src/strip.c:1606
 #, c-format
 msgid "while creating '%s'"
 msgstr "al crear '%s'"
 
-#: src/strip.c:1616
+#: src/strip.c:1628
 #, c-format
 msgid "while computing checksum for debug information"
 msgstr "al computar la suma de verificación para información de depuración"
 
-#: src/strip.c:1676
+#: src/strip.c:1691
 #, c-format
 msgid "%s: error while reading the file: %s"
 msgstr "%s: error al leer el fichero: %s"
 
-#: src/strip.c:1722 src/strip.c:1729
+#: src/strip.c:1730 src/strip.c:1750
+#, c-format
+msgid "while writing '%s'"
+msgstr "al escribir '%s'"
+
+#: src/strip.c:1784 src/strip.c:1791
 #, c-format
 msgid "error while finishing '%s': %s"
 msgstr "Error al terminar '%s': %s"
 
-#: src/strip.c:1752 src/strip.c:1809
+#: src/strip.c:1814 src/strip.c:1871
 #, c-format
 msgid "cannot set access and modification date of '%s'"
 msgstr "no es posible establecer acceso y fecha de modificación de '%s'"
diff --git a/elfutils/po/ja.gmo b/elfutils/po/ja.gmo
index 35249418..0060d381 100644
--- a/elfutils/po/ja.gmo
+++ b/elfutils/po/ja.gmo
diff --git a/elfutils/po/ja.po b/elfutils/po/ja.po
index a7a489c8..006134de 100644
--- a/elfutils/po/ja.po
+++ b/elfutils/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
-"POT-Creation-Date: 2010-09-13 09:45-0700\n"
+"POT-Creation-Date: 2011-01-12 17:51-0500\n"
 "PO-Revision-Date: 2009-09-20 15:32+0900\n"
 "Last-Translator: Hyu_gabaru Ryu_ichi <hyu_gabaru@yahoo.co.jp>\n"
 "Language-Team: Japanese <jp@li.org>\n"
@@ -365,6 +365,11 @@ msgstr "Elf 記述�を生�����ん: %s"
 msgid "ELF file does not match build ID"
 msgstr ""
 
+#: libdwfl/libdwflP.h:98
+#, fuzzy
+msgid "corrupt .gnu.prelink_undo section data"
+msgstr "ラインデータセクションデータを得られ��ん: %s"
+
 #: libebl/eblbackendname.c:63
 msgid "No backend"
 msgstr "�ックエンド��り��ん"
@@ -596,7 +601,7 @@ msgstr ""
 #: src/addr2line.c:189 src/ar.c:289 src/elfcmp.c:555 src/elflint.c:239
 #: src/findtextrel.c:170 src/ld.c:957 src/nm.c:253 src/objdump.c:181
 #: src/ranlib.c:136 src/readelf.c:456 src/size.c:219 src/strings.c:227
-#: src/strip.c:204 src/unstrip.c:234
+#: src/strip.c:210 src/unstrip.c:234
 #, c-format
 msgid ""
 "Copyright (C) %s Red Hat, Inc.\n"
@@ -610,7 +615,7 @@ msgstr ""
 #: src/addr2line.c:194 src/ar.c:294 src/elfcmp.c:560 src/elflint.c:244
 #: src/findtextrel.c:175 src/ld.c:962 src/nm.c:258 src/objdump.c:186
 #: src/ranlib.c:141 src/readelf.c:461 src/size.c:224 src/strings.c:232
-#: src/strip.c:209 src/unstrip.c:239
+#: src/strip.c:215 src/unstrip.c:239
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s �よ��書�れ���。\n"
@@ -1014,7 +1019,7 @@ msgstr ""
 
 #: src/elfcmp.c:607 src/findtextrel.c:229 src/ldgeneric.c:1767
 #: src/ldgeneric.c:4257 src/nm.c:363 src/ranlib.c:169 src/size.c:301
-#: src/strings.c:183 src/strip.c:433 src/strip.c:468 src/unstrip.c:1913
+#: src/strings.c:183 src/strip.c:443 src/strip.c:478 src/unstrip.c:1913
 #: src/unstrip.c:1942
 #, c-format
 msgid "cannot open '%s'"
@@ -2751,7 +2756,7 @@ msgid "Locate source of text relocations in FILEs (a.out by default)."
 msgstr ""
 
 #: src/findtextrel.c:84 src/nm.c:111 src/objdump.c:80 src/size.c:92
-#: src/strings.c:92 src/strip.c:97
+#: src/strings.c:92 src/strip.c:100
 msgid "[FILE...]"
 msgstr "[���る...]"
 
@@ -2765,72 +2770,72 @@ msgstr ""
 msgid "'%s' is not a DSO or PIE"
 msgstr ""
 
-#: src/findtextrel.c:274
+#: src/findtextrel.c:277
 #, c-format
 msgid "getting get section header of section %zu: %s"
 msgstr ""
 
-#: src/findtextrel.c:292
+#: src/findtextrel.c:300
 #, c-format
 msgid "cannot read dynamic section: %s"
 msgstr ""
 
-#: src/findtextrel.c:307
+#: src/findtextrel.c:321
 #, c-format
 msgid "no text relocations reported in '%s'"
 msgstr ""
 
-#: src/findtextrel.c:319
+#: src/findtextrel.c:333
 #, c-format
 msgid "while reading ELF file"
 msgstr ""
 
-#: src/findtextrel.c:328 src/findtextrel.c:345
+#: src/findtextrel.c:342 src/findtextrel.c:359
 #, c-format
 msgid "cannot get program header index at offset %d: %s"
 msgstr ""
 
-#: src/findtextrel.c:397
+#: src/findtextrel.c:411
 #, c-format
 msgid "cannot get section header of section %Zu: %s"
 msgstr ""
 
-#: src/findtextrel.c:409
+#: src/findtextrel.c:423
 #, c-format
 msgid "cannot get symbol table section %zu in '%s': %s"
 msgstr ""
 
-#: src/findtextrel.c:429 src/findtextrel.c:452
+#: src/findtextrel.c:443 src/findtextrel.c:466
 #, c-format
 msgid "cannot get relocation at index %d in section %zu in '%s': %s"
 msgstr ""
 
-#: src/findtextrel.c:517
+#: src/findtextrel.c:531
 #, c-format
 msgid "%s not compiled with -fpic/-fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:570
+#: src/findtextrel.c:584
 #, c-format
 msgid ""
 "the file containing the function '%s' is not compiled with -fpic/-fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:577 src/findtextrel.c:597
+#: src/findtextrel.c:591 src/findtextrel.c:611
 #, c-format
 msgid ""
 "the file containing the function '%s' might not be compiled with -fpic/-"
 "fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:585
+#: src/findtextrel.c:599
 #, c-format
 msgid ""
 "either the file containing the function '%s' or the file containing the "
 "function '%s' is not compiled with -fpic/-fPIC\n"
 msgstr ""
 
-#: src/findtextrel.c:605
+#: src/findtextrel.c:619
 #, c-format
 msgid ""
 "a relocation modifies memory at offset %llu in a write-protected segment\n"
@@ -3244,7 +3249,7 @@ msgstr ""
 "警告: `%1$s �大��� %3$s � %2$<PRIu64> �ら %5$s � %4$<PRIu64> �変更�"
 "れ���"
 
-#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:543
+#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:553
 #, c-format
 msgid "cannot determine number of sections: %s"
 msgstr "セクション数を決定����ん: %s"
@@ -3549,7 +3554,7 @@ msgstr "ãƒ�ージョン '%2$s' 用ã�®ãƒ­ãƒ¼ã‚«ãƒ«ã�¨ã‚°ãƒ­ãƒ¼ãƒ�ルã�§å®£è¨€ã�•ã
 msgid "default visibility set as local and global"
 msgstr "ローカル�グロー�ル�設定�れ�デフォルト��視性"
 
-#: src/nm.c:74 src/strip.c:73
+#: src/nm.c:74 src/strip.c:74
 msgid "Output selection:"
 msgstr "出力�択:"
 
@@ -3613,7 +3618,7 @@ msgstr "弱�シンボル��を点�る"
 msgid "Print size of defined symbols"
 msgstr "定義�れ�シンボル��刷サイズ"
 
-#: src/nm.c:98 src/size.c:80 src/strip.c:78 src/unstrip.c:81
+#: src/nm.c:98 src/size.c:80 src/strip.c:79 src/unstrip.c:81
 msgid "Output options:"
 msgstr "出力オプション:"
 
@@ -3633,18 +3638,18 @@ msgstr "並�替���味を逆��る"
 msgid "List symbols from FILEs (a.out by default)."
 msgstr "���る �らシンボルを表示 (デフォルト��a.out)。"
 
-#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:121
+#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:124
 #, c-format
 msgid "%s: INTERNAL ERROR %d (%s-%s): %s"
 msgstr "%s: 内部エラー %d (%s-%s): %s"
 
 #: src/nm.c:380 src/nm.c:392 src/size.c:317 src/size.c:326 src/size.c:337
-#: src/strip.c:1816
+#: src/strip.c:1878
 #, c-format
 msgid "while closing '%s'"
 msgstr "'%s' を閉���る最中"
 
-#: src/nm.c:402 src/objdump.c:296 src/strip.c:359
+#: src/nm.c:402 src/objdump.c:296 src/strip.c:369
 #, c-format
 msgid "%s: File format not recognized"
 msgstr "%s: ファイル形�を�識����ん���"
@@ -3687,7 +3692,7 @@ msgstr "検索ツリーを生�����ん"
 #: src/readelf.c:1742 src/readelf.c:1952 src/readelf.c:2206 src/readelf.c:2272
 #: src/readelf.c:2350 src/readelf.c:2848 src/readelf.c:2884 src/readelf.c:2946
 #: src/readelf.c:6934 src/readelf.c:7832 src/readelf.c:7979 src/readelf.c:8047
-#: src/size.c:425 src/size.c:499 src/strip.c:483
+#: src/size.c:425 src/size.c:499 src/strip.c:493
 #, c-format
 msgid "cannot get section header string table index"
 msgstr "セクションヘッダー文字列テーブル索引�得られ��ん"
@@ -5555,149 +5560,158 @@ msgstr ""
 msgid "mprotect failed"
 msgstr ""
 
-#: src/strip.c:74
+#: src/strip.c:75
 msgid "Place stripped output into FILE"
 msgstr "�����出力を ���る �置�"
 
-#: src/strip.c:75
+#: src/strip.c:76
 msgid "Extract the removed sections into FILE"
 msgstr "抽出���り除��セクションを ���る �置�"
 
-#: src/strip.c:76
+#: src/strip.c:77
 msgid "Embed name FILE instead of -f argument"
 msgstr "-f パラメーター�代�り� �� ���る を有効��る"
 
-#: src/strip.c:80
+#: src/strip.c:81
 msgid "Remove all debugging symbols"
 msgstr "デ�ッグ用�シンボルを全��り除�"
 
-#: src/strip.c:84
+#: src/strip.c:85
+msgid "Remove section headers (not recommended)"
+msgstr ""
+
+#: src/strip.c:87
 msgid "Copy modified/access timestamps to the output"
 msgstr "修正/アクセスタイムスタンプを出力�複写�る"
 
-#: src/strip.c:86
+#: src/strip.c:89
 msgid "Remove .comment section"
 msgstr ".comment セクションを�り除�"
 
-#: src/strip.c:89
+#: src/strip.c:92
 msgid "Relax a few rules to handle slightly broken ELF files"
 msgstr "少�壊れ� ELF ファイルを�り扱����ルールを少�緩和�る"
 
-#: src/strip.c:94
+#: src/strip.c:97
 msgid "Discard symbols from object files."
 msgstr "オブジェクトファイル�らシンボルを破棄�る"
 
-#: src/strip.c:186
+#: src/strip.c:192
 #, c-format
 msgid "Only one input file allowed together with '-o' and '-f'"
 msgstr "'-o' � '-f' �一緒�場��入力ファイル� 1 �����られ��ん"
 
-#: src/strip.c:222
+#: src/strip.c:228
 #, c-format
 msgid "-f option specified twice"
 msgstr "-f オプション� 2 回指定�れ����"
 
-#: src/strip.c:231
+#: src/strip.c:237
 #, c-format
 msgid "-F option specified twice"
 msgstr "-F オプション� 2 回指定�れ����"
 
-#: src/strip.c:240 src/unstrip.c:125
+#: src/strip.c:246 src/unstrip.c:125
 #, c-format
 msgid "-o option specified twice"
 msgstr "-o オプション� 2 回指定�れ����"
 
-#: src/strip.c:260
+#: src/strip.c:266
 #, c-format
 msgid "-R option supports only .comment section"
 msgstr "-R オプション� .comment セクション��をサ�ート���"
 
-#: src/strip.c:298 src/strip.c:322
+#: src/strip.c:308 src/strip.c:332
 #, c-format
 msgid "cannot stat input file '%s'"
 msgstr "入力ファイル '%s' を stat ����ん"
 
-#: src/strip.c:312
+#: src/strip.c:322
 #, c-format
 msgid "while opening '%s'"
 msgstr "'%s' を開���る間"
 
-#: src/strip.c:350
+#: src/strip.c:360
 #, c-format
 msgid "%s: cannot use -o or -f when stripping archive"
 msgstr "%s: アーカイブ�ら抜�出���る時� -o や -f �使���ん"
 
-#: src/strip.c:448
+#: src/strip.c:458
 #, c-format
 msgid "cannot open EBL backend"
 msgstr "EBL �ックエンドを開���ん"
 
-#: src/strip.c:498 src/strip.c:522
+#: src/strip.c:508 src/strip.c:532
 #, c-format
 msgid "cannot create new file '%s': %s"
 msgstr "新��ファイル '%s' を生�����ん: %s"
 
-#: src/strip.c:582
+#: src/strip.c:592
 #, c-format
 msgid "illformed file '%s'"
 msgstr "��格�ファイル '%s'"
 
-#: src/strip.c:869 src/strip.c:956
+#: src/strip.c:880 src/strip.c:967
 #, c-format
 msgid "while generating output file: %s"
 msgstr "出力ファイルを生����る間: %s"
 
-#: src/strip.c:929 src/strip.c:1668
+#: src/strip.c:940 src/strip.c:1683
 #, c-format
 msgid "%s: error while creating ELF header: %s"
 msgstr "%s: ELF ヘッダーを生����る間�エラー: %s"
 
-#: src/strip.c:943
+#: src/strip.c:954
 #, c-format
 msgid "while preparing output for '%s'"
 msgstr "'%s' ����出力を準備���る間"
 
-#: src/strip.c:994 src/strip.c:1050
+#: src/strip.c:1005 src/strip.c:1061
 #, c-format
 msgid "while create section header section: %s"
 msgstr "セクションヘッダーセクションを生����る間: %s"
 
-#: src/strip.c:1000
+#: src/strip.c:1011
 #, c-format
 msgid "cannot allocate section data: %s"
 msgstr "セクションデータを割り当�られ��ん: %s"
 
-#: src/strip.c:1059
+#: src/strip.c:1070
 #, c-format
 msgid "while create section header string table: %s"
 msgstr "セクションヘッダー文字列テーブルを生�中: %s"
 
-#: src/strip.c:1593 src/strip.c:1690
+#: src/strip.c:1595 src/strip.c:1705
 #, c-format
 msgid "while writing '%s': %s"
 msgstr "'%s' を書込�中: %s"
 
-#: src/strip.c:1604
+#: src/strip.c:1606
 #, c-format
 msgid "while creating '%s'"
 msgstr "'%s' を生�中"
 
-#: src/strip.c:1616
+#: src/strip.c:1628
 #, c-format
 msgid "while computing checksum for debug information"
 msgstr "デ�ッグ情報��ェックサムを計算中"
 
-#: src/strip.c:1676
+#: src/strip.c:1691
 #, c-format
 msgid "%s: error while reading the file: %s"
 msgstr "%s: ファイルを読込�中�エラー: %s"
 
-#: src/strip.c:1722 src/strip.c:1729
+#: src/strip.c:1730 src/strip.c:1750
+#, fuzzy, c-format
+msgid "while writing '%s'"
+msgstr "'%s' を書込�中: %s"
+
+#: src/strip.c:1784 src/strip.c:1791
 #, c-format
 msgid "error while finishing '%s': %s"
 msgstr "'%s' �終了中�エラー: %s"
 
-#: src/strip.c:1752 src/strip.c:1809
+#: src/strip.c:1814 src/strip.c:1871
 #, c-format
 msgid "cannot set access and modification date of '%s'"
 msgstr "'%s' �アクセス�変更日付を設定����ん"
diff --git a/elfutils/po/pl.gmo b/elfutils/po/pl.gmo
index 160a8c5b..b4a7bfe9 100644
--- a/elfutils/po/pl.gmo
+++ b/elfutils/po/pl.gmo
diff --git a/elfutils/po/pl.po b/elfutils/po/pl.po
index 9de85fcb..bd4e6ed8 100644
--- a/elfutils/po/pl.po
+++ b/elfutils/po/pl.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
-"POT-Creation-Date: 2010-09-13 09:45-0700\n"
-"PO-Revision-Date: 2010-08-23 18:13+0200\n"
+"POT-Creation-Date: 2011-01-12 17:51-0500\n"
+"PO-Revision-Date: 2011-01-08 08:49+0100\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "Language: pl\n"
@@ -327,7 +327,7 @@ msgstr "Nie odnaleziono informacji DWARF"
 
 #: libdwfl/libdwflP.h:88
 msgid "No symbol table found"
-msgstr "Nie odnaleziono tablicy symboli"
+msgstr "Nie odnaleziono tabeli symboli"
 
 #: libdwfl/libdwflP.h:89
 msgid "No ELF program headers"
@@ -357,6 +357,11 @@ msgstr "nie można obsłużyć opisu typu DWARF"
 msgid "ELF file does not match build ID"
 msgstr "plik ELF nie posiada pasujÄ…cego identyfikatora kopii"
 
+#: libdwfl/libdwflP.h:98
+#, fuzzy
+msgid "corrupt .gnu.prelink_undo section data"
+msgstr "nie można odczytać sekcji \".gnu.prelink_undo\": %s"
+
 #: libebl/eblbackendname.c:63
 msgid "No backend"
 msgstr "Brak zaplecza"
@@ -563,9 +568,8 @@ msgid "Also show symbol or section names"
 msgstr "Wyświetla także nazwy symboli ub sekcji"
 
 #: src/addr2line.c:72
-#, fuzzy
 msgid "Also show line table flags"
-msgstr "Wyświetla także nazwy funkcji"
+msgstr "Wyświetla także flagi tabeli wierszy"
 
 #: src/addr2line.c:74
 msgid "Treat addresses as offsets relative to NAME section."
@@ -590,7 +594,7 @@ msgstr "[ADRES...]"
 #: src/addr2line.c:189 src/ar.c:289 src/elfcmp.c:555 src/elflint.c:239
 #: src/findtextrel.c:170 src/ld.c:957 src/nm.c:253 src/objdump.c:181
 #: src/ranlib.c:136 src/readelf.c:456 src/size.c:219 src/strings.c:227
-#: src/strip.c:204 src/unstrip.c:234
+#: src/strip.c:210 src/unstrip.c:234
 #, c-format
 msgid ""
 "Copyright (C) %s Red Hat, Inc.\n"
@@ -606,7 +610,7 @@ msgstr ""
 #: src/addr2line.c:194 src/ar.c:294 src/elfcmp.c:560 src/elflint.c:244
 #: src/findtextrel.c:175 src/ld.c:962 src/nm.c:258 src/objdump.c:186
 #: src/ranlib.c:141 src/readelf.c:461 src/size.c:224 src/strings.c:232
-#: src/strip.c:209 src/unstrip.c:239
+#: src/strip.c:215 src/unstrip.c:239
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napisane przez %s.\n"
@@ -689,7 +693,7 @@ msgstr "Wyświetla więcej informacji."
 
 #: src/ar.c:94
 msgid "Force regeneration of symbol table."
-msgstr "Wymusza ponowne utworzenie tablicy symboli."
+msgstr "Wymusza ponowne utworzenie tabeli symboli."
 
 #: src/ar.c:95
 msgid "Insert file after [MEMBER]."
@@ -791,12 +795,12 @@ msgstr "brak wpisu %s w archiwum\n"
 #: src/ar.c:487 src/ar.c:929 src/ar.c:1129
 #, c-format
 msgid "cannot create hash table"
-msgstr "nie można utworzyć tabeli skrótów"
+msgstr "nie można utworzyć tabeli mieszającej"
 
 #: src/ar.c:494 src/ar.c:936 src/ar.c:1138
 #, c-format
 msgid "cannot insert into hash table"
-msgstr "nie można umieścić w tabeli skrótów"
+msgstr "nie można umieścić w tabeli mieszającej"
 
 #: src/ar.c:502 src/ranlib.c:176
 #, c-format
@@ -1012,7 +1016,7 @@ msgstr "Nieprawidłowa wartość \"%s\" dla parametru --gaps."
 
 #: src/elfcmp.c:607 src/findtextrel.c:229 src/ldgeneric.c:1767
 #: src/ldgeneric.c:4257 src/nm.c:363 src/ranlib.c:169 src/size.c:301
-#: src/strings.c:183 src/strip.c:433 src/strip.c:468 src/unstrip.c:1913
+#: src/strings.c:183 src/strip.c:443 src/strip.c:478 src/unstrip.c:1913
 #: src/unstrip.c:1942
 #, c-format
 msgid "cannot open '%s'"
@@ -1189,7 +1193,7 @@ msgstr "nieprawidłowy indeks nagłówka sekcji\n"
 #: src/elflint.c:480
 #, c-format
 msgid "invalid number of program header table entries\n"
-msgstr "nieprawidłowa liczba wpisów tablicy nagłówka programu\n"
+msgstr "nieprawidłowa liczba wpisów tabeli nagłówka programu\n"
 
 #: src/elflint.c:489
 #, c-format
@@ -1492,7 +1496,7 @@ msgid ""
 "section [%2d] '%s': symbol %zu: symbol in dynamic symbol table with non-"
 "default visibility\n"
 msgstr ""
-"sekcja [%2d] \"%s\": symbol %zu: symbol w dynamicznej tablicy symboli z "
+"sekcja [%2d] \"%s\": symbol %zu: symbol w dynamicznej tabeli symboli z "
 "niedomyślną widocznością\n"
 
 #: src/elflint.c:1014
@@ -1809,13 +1813,13 @@ msgstr ""
 msgid ""
 "section [%2d] '%s': hash table section is too small (is %ld, expected %ld)\n"
 msgstr ""
-"sekcja [%2d] \"%s\": sekcja tablicy mieszającej jest za mała (%ld, "
-"oczekiwano %ld)\n"
+"sekcja [%2d] \"%s\": sekcja tabeli mieszającej jest za mała (%ld, oczekiwano "
+"%ld)\n"
 
 #: src/elflint.c:1967 src/elflint.c:2008
 #, c-format
 msgid "section [%2d] '%s': chain array too large\n"
-msgstr "sekcja [%2d] \"%s\": tablica łańcuchowa jest za duża\n"
+msgstr "sekcja [%2d] \"%s\": tabela łańcuchowa jest za duża\n"
 
 #: src/elflint.c:1976 src/elflint.c:2017
 #, c-format
@@ -1847,8 +1851,8 @@ msgid ""
 "section [%2d] '%s': hash table section is too small (is %ld, expected at "
 "least%ld)\n"
 msgstr ""
-"sekcja [%2d] \"%s\": sekcja tablicy mieszającej jest za mała (%ld, "
-"oczekiwano co najmniej %ld)\n"
+"sekcja [%2d] \"%s\": sekcja tabeli mieszającej jest za mała (%ld, oczekiwano "
+"co najmniej %ld)\n"
 
 #: src/elflint.c:2057
 #, c-format
@@ -1900,25 +1904,25 @@ msgstr ""
 #, c-format
 msgid "section [%2d] '%s': bitmask does not match names in the hash table\n"
 msgstr ""
-"sekcja [%2d] \"%s\": maska bitowa nie pasuje do nazw w tablicy mieszajÄ…cej\n"
+"sekcja [%2d] \"%s\": maska bitowa nie pasuje do nazw w tabeli mieszajÄ…cej\n"
 
 #: src/elflint.c:2176
 #, c-format
 msgid "section [%2d] '%s': relocatable files cannot have hash tables\n"
 msgstr ""
-"sekcja [%2d] \"%s\": pliki relokowalne nie mogą posiadać tablic "
+"sekcja [%2d] \"%s\": pliki relokowalne nie mogą posiadać tabeli "
 "mieszajÄ…cych\n"
 
 #: src/elflint.c:2194
 #, c-format
 msgid "section [%2d] '%s': hash table not for dynamic symbol table\n"
 msgstr ""
-"sekcja [%2d] \"%s\": tablica mieszajÄ…ca nie dla tabeli dynamicznych symboli\n"
+"sekcja [%2d] \"%s\": tabela mieszajÄ…ca nie dla tabeli dynamicznych symboli\n"
 
 #: src/elflint.c:2202
 #, c-format
 msgid "section [%2d] '%s': hash table entry size incorrect\n"
-msgstr "sekcja [%2d] \"%s\": niepoprawny rozmiar wpisu tablicy mieszajÄ…cej\n"
+msgstr "sekcja [%2d] \"%s\": niepoprawny rozmiar wpisu tabeli mieszajÄ…cej\n"
 
 #: src/elflint.c:2207
 #, c-format
@@ -1931,7 +1935,7 @@ msgid ""
 "section [%2d] '%s': hash table has not even room for initial administrative "
 "entries\n"
 msgstr ""
-"sekcja [%2d] \"%s\": tablica mieszajÄ…ca nie posiada miejsca nawet na "
+"sekcja [%2d] \"%s\": tabela mieszajÄ…ca nie posiada miejsca nawet na "
 "poczÄ…tkowe wpisy administracyjne\n"
 
 #: src/elflint.c:2260
@@ -1951,8 +1955,8 @@ msgid ""
 "symbol %d referenced in new hash table in [%2zu] '%s' but not in old hash "
 "table in [%2zu] '%s'\n"
 msgstr ""
-"symbol %d wymieniony w nowej tablicy mieszajÄ…cej w [%2zu] \"%s\", ale nie w "
-"poprzedniej tablicy mieszajÄ…cej [%2zu] \"%s\"\n"
+"symbol %d wymieniony w nowej tabeli mieszajÄ…cej w [%2zu] \"%s\", ale nie w "
+"poprzedniej tabeli mieszajÄ…cej [%2zu] \"%s\"\n"
 
 #: src/elflint.c:2361
 #, c-format
@@ -1960,8 +1964,8 @@ msgid ""
 "symbol %d referenced in old hash table in [%2zu] '%s' but not in new hash "
 "table in [%2zu] '%s'\n"
 msgstr ""
-"symbol %d wymieniony w poprzedniej tablicy mieszajÄ…cej w [%2zu] \"%s\", ale "
-"nie w nowej tablicy mieszajÄ…cej w [%2zu] \"%s\"\n"
+"symbol %d wymieniony w poprzedniej tabeli mieszajÄ…cej w [%2zu] \"%s\", ale "
+"nie w nowej tabeli mieszajÄ…cej w [%2zu] \"%s\"\n"
 
 #: src/elflint.c:2377
 #, c-format
@@ -2806,50 +2810,53 @@ msgstr ""
 "offsety nagłówka programu w nagłówku ELF i wpisie PHDR nie zgadzają się"
 
 #: src/elflint.c:4259
-#, fuzzy, c-format
+#, c-format
 msgid "call frame search table reference in program header has wrong offset\n"
 msgstr ""
-"odniesienie sekcji dynamicznej w nagłówku programu posiada błędny offset\n"
+"odniesienie tabeli wyszukiwania ramki wywołania w nagłówku programu posiada "
+"błędny offset\n"
 
 #: src/elflint.c:4262
-#, fuzzy, c-format
+#, c-format
 msgid "call frame search table size mismatch in program and section header\n"
-msgstr "różne rozmiary sekcji dynamicznej w nagłówku programu i sekcji\n"
+msgstr ""
+"różne rozmiary tabel wyszukiwania ramki wywołania w nagłówku programu i "
+"sekcji\n"
 
 #: src/elflint.c:4275
-#, fuzzy, c-format
+#, c-format
 msgid "PT_GNU_EH_FRAME present but no .eh_frame_hdr section\n"
-msgstr "Tworzenie sekcji .eh_frame_hdr"
+msgstr "PT_GNU_EH_FRAME jest obecne, ale brak sekcji .eh_frame_hdr\n"
 
 #: src/elflint.c:4283
 #, c-format
 msgid "call frame search table must be allocated\n"
-msgstr ""
+msgstr "tabela wyszukiwania ramki wywołania musi być przydzielona\n"
 
 #: src/elflint.c:4286
-#, fuzzy, c-format
+#, c-format
 msgid "section [%2zu] '%s' must be allocated\n"
-msgstr "sekcja [%2d] \"%s\": nie oznaczona do przydzielenia\n"
+msgstr "sekcja [%2zu] \"%s\": musi być przydzielona\n"
 
 #: src/elflint.c:4290
 #, c-format
 msgid "call frame search table must not be writable\n"
-msgstr ""
+msgstr "tabela wyszukiwania ramki wywołania nie może być zapisywalna\n"
 
 #: src/elflint.c:4293
-#, fuzzy, c-format
+#, c-format
 msgid "section [%2zu] '%s' must not be writable\n"
-msgstr "sekcja [%2zu] \"%s\" obecna w pliku obiektu\n"
+msgstr "sekcja [%2zu] \"%s\" nie może być zapisywalna\n"
 
 #: src/elflint.c:4298
 #, c-format
 msgid "call frame search table must not be executable\n"
-msgstr ""
+msgstr "tabela wyszukiwania ramki wywołania nie może być wykonywalna\n"
 
 #: src/elflint.c:4301
-#, fuzzy, c-format
+#, c-format
 msgid "section [%2zu] '%s' must not be executable\n"
-msgstr "sekcja [%2zu] \"%s\" obecna w pliku obiektu\n"
+msgstr "sekcja [%2zu] \"%s\" nie może być wykonywalna\n"
 
 #: src/elflint.c:4312
 #, c-format
@@ -2876,6 +2883,8 @@ msgid ""
 "executable/DSO with .eh_frame_hdr section does not have a PT_GNU_EH_FRAME "
 "program header entry"
 msgstr ""
+"plik wykonywalny/DSO z sekcją .eh_frame_hdr nie posiada wpisu nagłówka "
+"programu PT_GNU_EH_FRAME"
 
 #: src/elflint.c:4369
 #, c-format
@@ -2885,7 +2894,7 @@ msgstr "nie można odczytać nagłówka ELF: %s\n"
 #: src/elflint.c:4395
 #, c-format
 msgid "text relocation flag set but not needed\n"
-msgstr "flagi relokacji tekstu ustawione, ale niepotrzebne\n"
+msgstr "flaga relokacji tekstu jest ustawiona, ale niepotrzebna\n"
 
 #: src/findtextrel.c:70
 msgid "Input Selection:"
@@ -2893,18 +2902,18 @@ msgstr "Wybór wejścia:"
 
 #: src/findtextrel.c:71
 msgid "Prepend PATH to all file names"
-msgstr "Dołączenie ŚCIEŻKI do wszystkich nazw plików"
+msgstr "Dołącza ŚCIEŻKĘ do wszystkich nazw plików"
 
 #: src/findtextrel.c:73
 msgid "Use PATH as root of debuginfo hierarchy"
-msgstr "Użycie ŚCIEŻKI jako korzenia dla hierarchii debuginfo"
+msgstr "Używa ŚCIEŻKI jako korzenia dla hierarchii debuginfo"
 
 #: src/findtextrel.c:80
 msgid "Locate source of text relocations in FILEs (a.out by default)."
-msgstr "Odnajdywanie źródeł relokacji tekstu w PLIKACH (domyślnie a.out)."
+msgstr "Odnajduje źródło relokacji tekstu w PLIKACH (domyślnie a.out)."
 
 #: src/findtextrel.c:84 src/nm.c:111 src/objdump.c:80 src/size.c:92
-#: src/strings.c:92 src/strip.c:97
+#: src/strings.c:92 src/strip.c:100
 msgid "[FILE...]"
 msgstr "[PLIK...]"
 
@@ -2918,59 +2927,59 @@ msgstr "nie można uzyskać nagłówka ELF \"%s\": %s"
 msgid "'%s' is not a DSO or PIE"
 msgstr "\"%s\" nie jest DSO ani PIE"
 
-#: src/findtextrel.c:274
+#: src/findtextrel.c:277
 #, c-format
 msgid "getting get section header of section %zu: %s"
-msgstr "podczas pobierania nagłówka sekcji dla sekcji %zu: %s"
+msgstr "uzyskiwanie nagłówka sekcji dla sekcji %zu: %s"
 
-#: src/findtextrel.c:292
+#: src/findtextrel.c:300
 #, c-format
 msgid "cannot read dynamic section: %s"
 msgstr "nie można odczytać sekcji dynamicznej: %s"
 
-#: src/findtextrel.c:307
+#: src/findtextrel.c:321
 #, c-format
 msgid "no text relocations reported in '%s'"
 msgstr "brak relokacji tekstu w \"%s\""
 
-#: src/findtextrel.c:319
+#: src/findtextrel.c:333
 #, c-format
 msgid "while reading ELF file"
-msgstr "podczas odczytu pliku ELF"
+msgstr "podczas odczytywania pliku ELF"
 
-#: src/findtextrel.c:328 src/findtextrel.c:345
+#: src/findtextrel.c:342 src/findtextrel.c:359
 #, c-format
 msgid "cannot get program header index at offset %d: %s"
 msgstr "nie można uzyskać indeksu nagłówka programu pod offsetem %d: %s"
 
-#: src/findtextrel.c:397
+#: src/findtextrel.c:411
 #, c-format
 msgid "cannot get section header of section %Zu: %s"
 msgstr "nie można uzyskać nagłówka sekcji dla sekcji %Zu: %s"
 
-#: src/findtextrel.c:409
+#: src/findtextrel.c:423
 #, c-format
 msgid "cannot get symbol table section %zu in '%s': %s"
 msgstr "nie można uzyskać sekcji tabeli symboli %zu w \"%s\": %s"
 
-#: src/findtextrel.c:429 src/findtextrel.c:452
+#: src/findtextrel.c:443 src/findtextrel.c:466
 #, c-format
 msgid "cannot get relocation at index %d in section %zu in '%s': %s"
 msgstr "nie można uzyskać relokacji pod indeksem %d w sekcji %zu w \"%s\": %s"
 
-#: src/findtextrel.c:517
+#: src/findtextrel.c:531
 #, c-format
 msgid "%s not compiled with -fpic/-fPIC\n"
 msgstr "%s nie został skompilowany z -fpic/-fPIC\n"
 
-#: src/findtextrel.c:570
+#: src/findtextrel.c:584
 #, c-format
 msgid ""
 "the file containing the function '%s' is not compiled with -fpic/-fPIC\n"
 msgstr ""
 "plik zawierający funkcję \"%s\" nie został skompilowany z -fpic/-fPIC\n"
 
-#: src/findtextrel.c:577 src/findtextrel.c:597
+#: src/findtextrel.c:591 src/findtextrel.c:611
 #, c-format
 msgid ""
 "the file containing the function '%s' might not be compiled with -fpic/-"
@@ -2978,7 +2987,7 @@ msgid ""
 msgstr ""
 "plik zawierający funkcję \"%s\" mógł nie zostać skompilowany z -fpic/-fPIC\n"
 
-#: src/findtextrel.c:585
+#: src/findtextrel.c:599
 #, c-format
 msgid ""
 "either the file containing the function '%s' or the file containing the "
@@ -2987,7 +2996,7 @@ msgstr ""
 "plik zawierajÄ…cy funkcjÄ™ \"%s\" lub plik zawierajÄ…cy funkcjÄ™ \"%s\" nie "
 "został skompilowany z -fpic/-fPIC\n"
 
-#: src/findtextrel.c:605
+#: src/findtextrel.c:619
 #, c-format
 msgid ""
 "a relocation modifies memory at offset %llu in a write-protected segment\n"
@@ -2996,29 +3005,29 @@ msgstr ""
 "przed zapisem\n"
 
 #: src/i386_ld.c:210
-#, fuzzy, c-format
+#, c-format
 msgid "cannot allocate PLT section: %s"
-msgstr "nie można przydzielić danych sekcji: %s"
+msgstr "nie można przydzielić sekcji PLT: %s"
 
 #: src/i386_ld.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "cannot allocate PLTREL section: %s"
-msgstr "nie można przydzielić danych sekcji: %s"
+msgstr "nie można przydzielić sekcji PLTREL: %s"
 
 #: src/i386_ld.c:253
-#, fuzzy, c-format
+#, c-format
 msgid "cannot allocate GOT section: %s"
-msgstr "nie można przydzielić danych sekcji: %s"
+msgstr "nie można przydzielić sekcji GOT: %s"
 
 #: src/i386_ld.c:274
-#, fuzzy, c-format
+#, c-format
 msgid "cannot allocate GOTPLT section: %s"
-msgstr "nie można przydzielić danych sekcji: %s"
+msgstr "nie można przydzielić sekcji GOTPLT: %s"
 
 #: src/i386_ld.c:661
 #, c-format
 msgid "initial-executable TLS relocation cannot be used "
-msgstr ""
+msgstr "początkowo wykonywalna relokacja TLS nie może zostać użyta "
 
 #: src/ld.c:87
 msgid "Input File Control:"
@@ -3026,12 +3035,11 @@ msgstr "Sterowanie plikiem wejściowym:"
 
 #: src/ld.c:89
 msgid "Include whole archives in the output from now on."
-msgstr "Dołączanie całych archiwów na wyjściu od teraz."
+msgstr "Dołącza całe archiwa w wyjściu od teraz."
 
 #: src/ld.c:91
-#, fuzzy
 msgid "Stop including the whole archives in the output."
-msgstr "Koniec dołączania całych archiwów na wyjściu."
+msgstr "Przestaje dołączać całe archiwa w wyjściu."
 
 #: src/ld.c:92 src/ld.c:106 src/ld.c:184
 msgid "FILE"
@@ -3039,11 +3047,11 @@ msgstr "PLIK"
 
 #: src/ld.c:93
 msgid "Start a group."
-msgstr "Rozpoczęcie grupy."
+msgstr "Rozpoczyna grupÄ™."
 
 #: src/ld.c:94
 msgid "End a group."
-msgstr "Zakończenie grupy."
+msgstr "Kończy grupę."
 
 #: src/ld.c:95
 msgid "PATH"
@@ -3051,21 +3059,21 @@ msgstr "ŚCIEŻKA"
 
 #: src/ld.c:96
 msgid "Add PATH to list of directories files are searched in."
-msgstr "Dodanie ŚCIEŻKI do listy katalogów, w których są szukane pliki."
+msgstr "Dodaje ŚCIEŻKĘ do listy katalogów, w których są szukane pliki."
 
 #: src/ld.c:98
 msgid "Only set DT_NEEDED for following dynamic libs if actually used"
 msgstr ""
-"Ustawianie DT_NEEDED dla następujących bibliotek dynamicznych tylko jeśli są "
+"Ustawia DT_NEEDED dla następujących bibliotek dynamicznych tylko, jeśli są "
 "używane"
 
 #: src/ld.c:100
 msgid "Always set DT_NEEDED for following dynamic libs"
-msgstr "Ustawianie zawsze DT_NEEDED dla następujących bibliotek dynamicznych"
+msgstr "Ustawia zawsze DT_NEEDED dla następujących bibliotek dynamicznych"
 
 #: src/ld.c:102
 msgid "Ignore LD_LIBRARY_PATH environment variable."
-msgstr "Zignorowanie zmiennej środowiskowej LD_LIBRARY_PATH."
+msgstr "Ignoruje zmienną środowiskową LD_LIBRARY_PATH."
 
 #: src/ld.c:105
 msgid "Output File Control:"
@@ -3073,37 +3081,37 @@ msgstr "Sterowanie plikiem wyjściowym:"
 
 #: src/ld.c:106
 msgid "Place output in FILE."
-msgstr "Umieszczenie wyjścia w PLIKU."
+msgstr "Umieszcza wyjście w PLIKU."
 
 #: src/ld.c:109
 msgid "Object is marked to not use default search path at runtime."
-msgstr "Oznaczenie obiektu, aby nie używał domyślnej ścieżki przeszukiwań."
+msgstr "Oznacza obiekt, aby nie używał domyślnej ścieżki przeszukiwań."
 
 #: src/ld.c:111
 msgid "Same as --whole-archive."
-msgstr "To samo co --whole-archive."
+msgstr "To samo, co --whole-archive."
 
 #: src/ld.c:112
 msgid ""
 "Default rules of extracting from archive; weak references are not enough."
 msgstr ""
-"Domyślne reguły wyciągania z archiwum; słabe odwołania nie wystarczają."
+"Domyślne reguły wydobywania z archiwum; słabe odwołania nie wystarczają."
 
 #: src/ld.c:116
 msgid "Weak references cause extraction from archive."
-msgstr "Słabe odwołania powodują wyciągnięcie z archiwum."
+msgstr "Słabe odwołania powodują wydobywanie z archiwum."
 
 #: src/ld.c:118
 msgid "Allow multiple definitions; first is used."
-msgstr "Zezwolenie na wielokrotne definicje; używana jest pierwsza."
+msgstr "Zezwala na wielokrotne definicje; używana jest pierwsza."
 
 #: src/ld.c:120
 msgid "Disallow/allow undefined symbols in DSOs."
-msgstr "Nie zezwalanie/zezwalanie na niezdefiniowane symbole w DSO."
+msgstr "Zabrania/zezwala na nieokreślone symbole w DSO."
 
 #: src/ld.c:123
 msgid "Object requires immediate handling of $ORIGIN."
-msgstr "Obiekt wymaga bezpośredniego obsłużenia $ORIGIN."
+msgstr "Obiekt wymaga natychmiastowej obsługi $ORIGIN."
 
 #: src/ld.c:125
 msgid "Relocation will not be processed lazily."
@@ -3111,28 +3119,27 @@ msgstr "Relokacje nie będą przeprowadzane leniwie."
 
 #: src/ld.c:127
 msgid "Object cannot be unloaded at runtime."
-msgstr "Obiekt nie może być odładowany w czasie działania."
+msgstr "Obiekt nie może być wyładowany w czasie działania."
 
 #: src/ld.c:129
 msgid "Mark object to be initialized first."
-msgstr "Oznaczenie obiektu, aby był inicjowany pierwszy."
+msgstr "Oznacza obiekt, aby był inicjowany jako pierwszy."
 
 #: src/ld.c:131
 msgid "Enable/disable lazy-loading flag for following dependencies."
-msgstr ""
-"Włączenie/wyłączenie flagi leniwego ładowania dla następnych zależności."
+msgstr "Włącza/wyłącza flagi leniwego wczytywania dla następnych zależności."
 
 #: src/ld.c:133
 msgid "Mark object as not loadable with 'dlopen'."
-msgstr "Oznaczenie obiektu jako nie Å‚adowalnego przez 'dlopen'."
+msgstr "Oznacza obiekt jako niewczytywalnego przez \"dlopen\"."
 
 #: src/ld.c:135
 msgid "Ignore/record dependencies on unused DSOs."
-msgstr "Zignorowanie/zapisanie zależności od nieużywanych DSO."
+msgstr "Ignoruje/zapisuje zależności od nieużywanych DSO."
 
 #: src/ld.c:137
 msgid "Generated DSO will be a system library."
-msgstr "Generowany DSO będzie biblioteką systemową."
+msgstr "Utworzony DSO będzie biblioteką systemową."
 
 #: src/ld.c:138
 msgid "ADDRESS"
@@ -3140,90 +3147,88 @@ msgstr "ADRES"
 
 #: src/ld.c:138
 msgid "Set entry point address."
-msgstr "Ustawienie adresu punktu wejściowego."
+msgstr "Ustawia adres punktu wejściowego."
 
 #: src/ld.c:141
 msgid "Do not link against shared libraries."
-msgstr "Nie linkowanie z bibliotekami dzielonymi."
+msgstr "Bez konsolidowania z bibliotekami współdzielonymi."
 
 #: src/ld.c:144
 msgid "Prefer linking against shared libraries."
-msgstr "Preferowanie linkowania z bibliotekami dzielonymi."
+msgstr "Preferuje konsolidowanie z bibliotekami dzielonymi."
 
 #: src/ld.c:145
 msgid "Export all dynamic symbols."
-msgstr "Eksportowanie wszystkich symboli dynamicznych."
+msgstr "Eksportuje wszystkie symbole dynamiczne."
 
 #: src/ld.c:146
 msgid "Strip all symbols."
-msgstr "Okrojenie wszystkich symboli."
+msgstr "Skraca wszystkie symbole."
 
 #: src/ld.c:147
 msgid "Strip debugging symbols."
-msgstr "Okrojenie symboli debugowych."
+msgstr "Skraca symbole debugowania."
 
 #: src/ld.c:149
 msgid "Assume pagesize for the target system to be SIZE."
-msgstr "Przyjęcie dla systemu docelowego rozmiaru strony ROZMIAR."
+msgstr "Przyjmuje dla systemu docelowego rozmiaru strony ROZMIAR."
 
 #: src/ld.c:151
 msgid "Set runtime DSO search path."
-msgstr "Ustawienie ścieżki poszukiwania DSO w czasie działania."
+msgstr "Ustawia ścieżkę poszukiwania DSO w czasie działania."
 
 #: src/ld.c:154
 msgid "Set link time DSO search path."
-msgstr "Ustawienie ścieżki poszukiwania DSO w czasie linkowania."
+msgstr "Ustawia ścieżki poszukiwania DSO w czasie konsolidowania."
 
 #: src/ld.c:155
 msgid "Generate dynamic shared object."
-msgstr "Generowanie dynamicznego obiektu dzielonego (DSO)."
+msgstr "Tworzy dynamiczny obiekt współdzielony."
 
 #: src/ld.c:156
 msgid "Generate relocatable object."
-msgstr "Generowanie obiektu relokowalnego."
+msgstr "Tworzy obiekt relokowalny."
 
 #: src/ld.c:159
 msgid "Causes symbol not assigned to a version be reduced to local."
-msgstr "Ograniczenie zasięgu symboli nie przypisanych do wersji do lokalnego."
+msgstr "Ogranicza zasięg symboli nieprzypisanych do wersji do lokalnego."
 
 #: src/ld.c:160
 msgid "Remove unused sections."
-msgstr "Usunięcie nieużywanych sekcji."
+msgstr "Usuwa nieużywane sekcje."
 
 #: src/ld.c:163
 msgid "Don't remove unused sections."
-msgstr "Nie usuwanie nieużywanych sekcji."
+msgstr "Bez usuwania nieużywanych sekcji."
 
 #: src/ld.c:164
 msgid "Set soname of shared object."
-msgstr "Ustawienie soname obiektu dzielonego."
+msgstr "Ustawia soname obiektu współdzielonego."
 
 #: src/ld.c:165
 msgid "Set the dynamic linker name."
-msgstr "Ustawienie nazwy dynamicznego linkera."
+msgstr "Ustawia nazwÄ™ dynamicznego konsolidatora."
 
 #: src/ld.c:168
-#, fuzzy
 msgid "Add/suppress addition indentifying link-editor to .comment section."
 msgstr ""
-"Dodanie/pominięcie dodawania identyfikacji edytora linkowania do sekcji ."
-"comment"
+"Dodaje/pomija dodanie identyfikacji edytora konsolidacji do sekcji .comment"
 
 #: src/ld.c:171
 msgid "Create .eh_frame_hdr section"
-msgstr "Tworzenie sekcji .eh_frame_hdr"
+msgstr "Tworzy sekcjÄ™ .eh_frame_hdr"
 
 #: src/ld.c:173
 msgid "Set hash style to sysv, gnu or both."
-msgstr ""
+msgstr "Ustawia styl sum kontrolnych na sysv, gnu lub oba."
 
 #: src/ld.c:175
 msgid "Generate build ID note (md5, sha1 (default), uuid)."
-msgstr ""
+msgstr "Tworzy wpis identyfikatora budowania (md5, sha1 (domyślnie), uuid)."
 
 #: src/ld.c:177
 msgid "Linker Operation Control:"
-msgstr "Sterowanie operacjami linkera:"
+msgstr "Sterowanie działaniami konsolidatora:"
 
 #: src/ld.c:178
 msgid "Verbose messages."
@@ -3231,11 +3236,11 @@ msgstr "Szczegółowe komunikaty."
 
 #: src/ld.c:179
 msgid "Trace file opens."
-msgstr "Śledzenie otwierania plików."
+msgstr "Śledzi otwarcia plików."
 
 #: src/ld.c:181
 msgid "Trade speed for less memory usage"
-msgstr "Poświęcenie szybkości dla mniejszego zużycia pamięci"
+msgstr "Poświęca prędkość na mniejsze zużycie pamięci"
 
 #: src/ld.c:182
 msgid "LEVEL"
@@ -3243,27 +3248,27 @@ msgstr "POZIOM"
 
 #: src/ld.c:183
 msgid "Set optimization level to LEVEL."
-msgstr "Ustawienie poziomu optymalizacji na POZIOM."
+msgstr "Ustawia poziom optymalizacji na POZIOM."
 
 #: src/ld.c:184
 msgid "Use linker script in FILE."
-msgstr "Użycie skryptu linkera z PLIKU."
+msgstr "Używa skryptu konsolidatora z PLIKU."
 
 #: src/ld.c:187
 msgid "Select to get parser debug information"
-msgstr "Wybranie pobrania informacji debugowych parsera"
+msgstr "Wybiera pobranie informacji debugowania parsera"
 
 #: src/ld.c:190
 msgid "Read version information from FILE."
-msgstr "Odczytanie informacji o wersji z PLIKU."
+msgstr "Odczytuje informacje o wersji z PLIKU."
 
 #: src/ld.c:191
 msgid "Set emulation to NAME."
-msgstr "Ustawienie emulacji na NAZWĘ"
+msgstr "Ustawia emulację na NAZWĘ."
 
 #: src/ld.c:197
 msgid "Combine object and archive files."
-msgstr "�ączenie plików obiektów i archiwów."
+msgstr "�ączy pliki obiektów i archiwów."
 
 #: src/ld.c:200
 msgid "[FILE]..."
@@ -3272,17 +3277,17 @@ msgstr "[PLIK]..."
 #: src/ld.c:333
 #, c-format
 msgid "At least one input file needed"
-msgstr "Potrzebny jest przynajmniej jeden plik wejściowy"
+msgstr "Wymagany jest co najmniej jeden plik wejściowy"
 
 #: src/ld.c:349
 #, c-format
 msgid "error while preparing linking"
-msgstr "błąd podczas przygotowywania linkowania"
+msgstr "błąd podczas przygotowywania konsolidowania"
 
 #: src/ld.c:356
 #, c-format
 msgid "cannot open linker script '%s'"
-msgstr "nie można otworzyć skryptu linkera \"%s\""
+msgstr "nie można otworzyć skryptu konsolidatora \"%s\""
 
 #: src/ld.c:397
 #, c-format
@@ -3292,32 +3297,32 @@ msgstr "-( bez pasujÄ…cego -)"
 #: src/ld.c:572 src/ld.c:610
 #, c-format
 msgid "only one option of -G and -r is allowed"
-msgstr "dopuszczalna jest tylko jedna z opcji -G i -r"
+msgstr "dozwolona jest tylko jedna z opcji -G i -r"
 
 #: src/ld.c:594
 #, c-format
 msgid "more than one '-m' parameter"
-msgstr "podano więcej niż jeden parametr '-m'"
+msgstr "podano więcej niż jeden parametr \"-m\""
 
 #: src/ld.c:604 src/ld.c:1013
 #, c-format
 msgid "unknown option `-%c %s'"
-msgstr "nieznana opcja `-%c %s'"
+msgstr "nieznana opcja \"-%c %s\""
 
 #: src/ld.c:646
 #, c-format
 msgid "invalid page size value '%s': ignored"
-msgstr "błędna wartość rozmiaru strony \"%s\": zignorowano"
+msgstr "nieprawidłowa wartość rozmiaru strony \"%s\": zignorowano"
 
 #: src/ld.c:687
-#, fuzzy, c-format
+#, c-format
 msgid "invalid hash style '%s'"
-msgstr "błędne flagi maszyny: \"%s\"\n"
+msgstr "nieprawidłowy styl sum kontrolnych \"%s\""
 
 #: src/ld.c:697
 #, c-format
 msgid "invalid build-ID style '%s'"
-msgstr ""
+msgstr "nieprawidłowy styl identyfikatora budowania \"%s\""
 
 #: src/ld.c:785
 #, c-format
@@ -3327,7 +3332,7 @@ msgstr "Podano więcej niż jeden plik wyjściowy."
 #: src/ld.c:802
 #, c-format
 msgid "Invalid optimization level `%s'"
-msgstr "Błędny poziom optymalizacji `%s'"
+msgstr "Nieprawidłowy poziom optymalizacji \"%s\""
 
 #: src/ld.c:850
 #, c-format
@@ -3342,18 +3347,18 @@ msgstr "-) bez pasujÄ…cego -("
 #: src/ld.c:1046
 #, c-format
 msgid "unknown option '-%c %s'"
-msgstr "nieznana opcja '-%c %s'"
+msgstr "nieznana opcja \"-%c %s\""
 
 #: src/ld.c:1150
 #, c-format
 msgid "could not find input file to determine output file format"
 msgstr ""
-"nie można znaleźć pliku wejściowego, aby określić format pliku wyjściowego"
+"nie można odnaleźć pliku wejściowego, aby określić format pliku wyjściowego"
 
 #: src/ld.c:1152
 #, c-format
 msgid "try again with an appropriate '-m' parameter"
-msgstr "proszę spróbować jeszcze raz z odpowiednim parametrem '-m'"
+msgstr "proszę spróbować jeszcze raz z odpowiednim parametrem \"-m\""
 
 #: src/ld.c:1446
 #, c-format
@@ -3363,27 +3368,27 @@ msgstr "nie można odczytać skryptu wersji \"%s\""
 #: src/ld.c:1512 src/ld.c:1551
 #, c-format
 msgid "duplicate definition of '%s' in linker script"
-msgstr "powtórzona definicja \"%s\" w skrypcie linkera"
+msgstr "powtórzona definicja \"%s\" w skrypcie konsolidatora"
 
 #: src/ldgeneric.c:209 src/ldgeneric.c:5151
 #, c-format
 msgid "cannot create string table"
-msgstr "nie można utworzyć tabeli łańcuchów"
+msgstr "nie można utworzyć tabeli ciągów"
 
 #: src/ldgeneric.c:255
 #, c-format
 msgid "cannot load ld backend library '%s': %s"
-msgstr "nie można odczytać biblioteki backendu ld \"%s\": %s"
+msgstr "nie można odczytać biblioteki zaplecza ld \"%s\": %s"
 
 #: src/ldgeneric.c:265
 #, c-format
 msgid "cannot find init function in ld backend library '%s': %s"
-msgstr "nie można znaleźć funkcji init w bibliotece backendu ld \"%s\": %s"
+msgstr "nie można odnaleźć funkcji init w bibliotece zaplecza ld \"%s\": %s"
 
 #: src/ldgeneric.c:310
 #, c-format
 msgid "%s listed more than once as input"
-msgstr "%s podano więcej niż raz na wejściu"
+msgstr "%s podano więcej niż raz w wejściu"
 
 #: src/ldgeneric.c:424
 #, c-format
@@ -3398,14 +3403,15 @@ msgstr "%s (dla DT_NEEDED %s)\n"
 #: src/ldgeneric.c:573
 #, c-format
 msgid "Warning: type of `%s' changed from %s in %s to %s in %s"
-msgstr "Uwaga: typ `%s' zmienił się z %s w %s na %s w %s"
+msgstr "Ostrzeżenie: typ \"%s\" zmienił się z %s w %s na %s w %s"
 
 #: src/ldgeneric.c:586
 #, c-format
 msgid "Warning: size of `%s' changed from %<PRIu64> in %s to %<PRIu64> in %s"
-msgstr "Uwaga: rozmiar `%s' zmienił się z %<PRIu64> w %s na %<PRIu64> w %s"
+msgstr ""
+"Ostrzeżenie: rozmiar \"%s\" zmienił się z %<PRIu64> w %s na %<PRIu64> w %s"
 
-#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:543
+#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:553
 #, c-format
 msgid "cannot determine number of sections: %s"
 msgstr "nie można określić liczby sekcji: %s"
@@ -3418,7 +3424,7 @@ msgstr "(%s+%#<PRIx64>): wielokrotna definicja %s `%s'\n"
 #: src/ldgeneric.c:700
 #, c-format
 msgid "(%s+%#<PRIx64>): first defined here\n"
-msgstr "(%s+%#<PRIx64>): pierwszy raz zdefiniowano tutaj\n"
+msgstr "(%s+%#<PRIx64>): pierwszy raz określono tutaj\n"
 
 #: src/ldgeneric.c:819
 #, c-format
@@ -3431,16 +3437,16 @@ msgid "%s: section '%s' with group flag set does not belong to any group"
 msgstr "%s: sekcja \"%s\" z ustawioną flagą grupy nie należy do żadnej grupy"
 
 #: src/ldgeneric.c:885
-#, fuzzy, c-format
+#, c-format
 msgid "%s: section [%2d] '%s' is not in the correct section group"
-msgstr "%s: sekcja [%2d] \"%s\" jest w więcej niż jednej grupie sekcji"
+msgstr "%s: sekcja [%2d] \"%s\" nie jest w poprawnej grupie sekcji"
 
 #: src/ldgeneric.c:1156 src/ldgeneric.c:1413 src/ldgeneric.c:1422
 #: src/ldgeneric.c:1481 src/ldgeneric.c:1490 src/ldgeneric.c:1753
 #: src/ldgeneric.c:2005
 #, c-format
 msgid "%s: invalid ELF file (%s:%d)\n"
-msgstr "%s: błędny plik ELF (%s:%d)\n"
+msgstr "%s: nieprawidłowy plik ELF (%s:%d)\n"
 
 #: src/ldgeneric.c:1250
 #, c-format
@@ -3450,19 +3456,21 @@ msgstr "%s: tylko pliki typu ET_REL mogą zawierać grupy sekcji"
 #: src/ldgeneric.c:1302
 #, c-format
 msgid "%s: cannot determine signature of section group [%2zd] '%s': %s"
-msgstr "%s: nie można określić sygnatury grupy sekcji [%2zd] \"%s\": %s"
+msgstr "%s: nie można określić podpisu grupy sekcji [%2zd] \"%s\": %s"
 
 #: src/ldgeneric.c:1314
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot get content of section group [%2zd] '%s': %s'"
-msgstr "%s: nie można określić sygnatury grupy sekcji [%2zd] \"%s\": %s"
+msgstr "%s: nie można uzyskać zawartości grupy sekcji [%2zd] \"%s\": %s"
 
 #: src/ldgeneric.c:1328
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: group member %zu of section group [%2zd] '%s' has too high index: "
 "%<PRIu32>"
-msgstr "%s: nie można określić sygnatury grupy sekcji [%2zd] \"%s\": %s"
+msgstr ""
+"%s: element grupy %zu grupy sekcji [%2zd] \"%s\" posiada za wysoki indeks: "
+"%<PRIu32>"
 
 #: src/ldgeneric.c:1350
 #, c-format
@@ -3477,38 +3485,38 @@ msgstr "nie można uzyskać deskryptora dla pliku ELF (%s:%d): %s\n"
 #: src/ldgeneric.c:1899
 #, c-format
 msgid "cannot read archive `%s': %s"
-msgstr "nie można odczytać archiwum `%s': %s"
+msgstr "nie można odczytać archiwum \"%s\": %s"
 
 #: src/ldgeneric.c:2020
 #, c-format
 msgid "file of type %s cannot be linked in\n"
-msgstr "plik typu %s nie może być wlinkowany\n"
+msgstr "plik typu %s nie może zostać wkonsolidowany\n"
 
 #: src/ldgeneric.c:2032
 #, c-format
 msgid "%s: input file incompatible with ELF machine type %s\n"
-msgstr "%s: plik wejściowy niekompatybilny z rodzajem maszyny ELF %s\n"
+msgstr "%s: plik wejściowy jest niezgodny z rodzajem komputera ELF %s\n"
 
 #: src/ldgeneric.c:2044
 #, c-format
 msgid "%s: cannot get section header string table index: %s\n"
-msgstr "%s: nie można uzyskać indeksu tabeli łańcuchów nagłówków sekcji: %s\n"
+msgstr "%s: nie można uzyskać indeksu tabeli ciągów nagłówków sekcji: %s\n"
 
 #: src/ldgeneric.c:2073
 #, c-format
 msgid "cannot use DSO '%s' when generating relocatable object file"
 msgstr ""
-"nie można użyć DSO \"%s\" podczas generowania pliku obiektu relokowalnego"
+"nie można użyć DSO \"%s\" podczas tworzenia relokowalnego pliku obiektu"
 
 #: src/ldgeneric.c:2158
 #, c-format
 msgid "input file '%s' ignored"
-msgstr "plik wejściowy \"%s\" zignorowany"
+msgstr "plik wejściowy \"%s\" został zignorowany"
 
 #: src/ldgeneric.c:2372
 #, c-format
 msgid "undefined symbol `%s' in %s"
-msgstr "niezdefiniowany symbol `%s' w %s"
+msgstr "nieokreślony symbol \"%s\" w %s"
 
 #: src/ldgeneric.c:2702
 #, c-format
@@ -3539,14 +3547,14 @@ msgid ""
 "argument '%<PRIuMAX>' of ALIGN in address computation expression is no power "
 "of two"
 msgstr ""
-"argument '%<PRIuMAX>' ALIGN w wyrażeniu obliczenia adresu nie jest potęgą "
+"parametr \"%<PRIuMAX>\" ALIGN w wyrażeniu obliczenia adresu nie jest potęgą "
 "dwójki"
 
 #: src/ldgeneric.c:3684
 #, c-format
 msgid "cannot find entry symbol '%s': defaulting to %#0*<PRIx64>"
 msgstr ""
-"nie można znaleźć symbolu wejściowego \"%s\": użycie domyślnego %#0*<PRIx64>"
+"nie można odnaleźć symbolu wejściowego \"%s\": użycie domyślnego %#0*<PRIx64>"
 
 #: src/ldgeneric.c:3690
 #, c-format
@@ -3554,36 +3562,35 @@ msgid "no entry symbol specified: defaulting to %#0*<PRIx64>"
 msgstr "nie określono symbolu wejściowego: użycie domyślnego %#0*<PRIx64>"
 
 #: src/ldgeneric.c:3920
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create GNU hash table section for output file: %s"
 msgstr ""
-"nie można utworzyć sekcji tablicy mieszającej dla pliku wyjściowego: %s"
+"nie można utworzyć sekcji tabeli mieszającej GNU dla pliku wyjściowego: %s"
 
 #: src/ldgeneric.c:4071
 #, c-format
 msgid "cannot create hash table section for output file: %s"
-msgstr ""
-"nie można utworzyć sekcji tablicy mieszającej dla pliku wyjściowego: %s"
+msgstr "nie można utworzyć sekcji tabeli mieszającej dla pliku wyjściowego: %s"
 
 #: src/ldgeneric.c:4114
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create build ID section: %s"
-msgstr "nie można utworzyć sekcji wersjonowania: %s"
+msgstr "nie można utworzyć sekcji identyfikatora budowania: %s"
 
 #: src/ldgeneric.c:4191
-#, fuzzy, c-format
+#, c-format
 msgid "cannot convert section data to file format: %s"
-msgstr "nie można utworzyć sekcji dla pliku wyjściowego: %s"
+msgstr "nie można przekonwertować danych sekcji na format pliku: %s"
 
 #: src/ldgeneric.c:4200
-#, fuzzy, c-format
+#, c-format
 msgid "cannot convert section data to memory format: %s"
-msgstr "nie można przydzielić danych sekcji: %s"
+msgstr "nie można przekonwertować danych sekcji na format pamięci: %s"
 
 #: src/ldgeneric.c:4261
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read enough data for UUID"
-msgstr "nie można utworzyć danych wersjonowania: %s"
+msgstr "nie można odczytać danych wystarczających dla UUID"
 
 #: src/ldgeneric.c:4358 src/ldgeneric.c:4379 src/ldgeneric.c:4408
 #: src/ldgeneric.c:6062
@@ -3594,7 +3601,7 @@ msgstr "nie można utworzyć tabeli symboli dla pliku wyjściowego: %s"
 #: src/ldgeneric.c:5300 src/ldgeneric.c:5852
 #, c-format
 msgid "section index too large in dynamic symbol table"
-msgstr "indeks sekcji zbyt duży w tabeli symboli dynamicznych"
+msgstr "indeks sekcji za duży w tabeli symboli dynamicznych"
 
 #: src/ldgeneric.c:5745
 #, c-format
@@ -3616,12 +3623,12 @@ msgstr "nie można utworzyć danych wersjonowania: %s"
 #: src/ldgeneric.c:6179
 #, c-format
 msgid "cannot create section header string section: %s"
-msgstr "nie można utworzyć sekcji łańcuchów nagłówków sekcji: %s"
+msgstr "nie można utworzyć sekcji ciągów nagłówków sekcji: %s"
 
 #: src/ldgeneric.c:6101
 #, c-format
 msgid "cannot create section header string section"
-msgstr "nie można utworzyć sekcji łańcuchów nagłówków sekcji"
+msgstr "nie można utworzyć sekcji ciągów nagłówków sekcji"
 
 #: src/ldgeneric.c:6259
 #, c-format
@@ -3631,12 +3638,12 @@ msgstr "nie można utworzyć nagłówka programu: %s"
 #: src/ldgeneric.c:6267
 #, c-format
 msgid "while determining file layout: %s"
-msgstr "podczas określania rozkładu pliku: %s"
+msgstr "podczas określania układu pliku: %s"
 
 #: src/ldgeneric.c:6388
-#, fuzzy, c-format
+#, c-format
 msgid "internal error: non-nobits section follows nobits section"
-msgstr "błąd wewnętrzny: sekcja nobits po sekcji nobits"
+msgstr "błąd wewnętrzny: sekcja nie będąca nobits po sekcji nobits"
 
 #: src/ldgeneric.c:6925
 #, c-format
@@ -3646,17 +3653,17 @@ msgstr "nie można uzyskać nagłówka zerowej sekcji: %s"
 #: src/ldgeneric.c:6941 src/unstrip.c:1820
 #, c-format
 msgid "cannot update ELF header: %s"
-msgstr "nie można uaktualnić nagłówka ELF: %s"
+msgstr "nie można zaktualizować nagłówka ELF: %s"
 
 #: src/ldgeneric.c:6972
 #, c-format
 msgid "linker backend didn't specify function to relocate section"
-msgstr "backend linkera nie określił funkcji dla sekcji relokacji"
+msgstr "zaplecze konsolidatora nie określiło funkcji dla sekcji relokacji"
 
 #: src/ldgeneric.c:6984
 #, c-format
 msgid "while writing output file: %s"
-msgstr "podczas zapisu pliku wyjściowego: %s"
+msgstr "podczas zapisywania pliku wyjściowego: %s"
 
 #: src/ldgeneric.c:6989
 #, c-format
@@ -3672,7 +3679,8 @@ msgstr "nie można wykonać stat na pliku wyjściowym"
 #, c-format
 msgid "WARNING: temporary output file overwritten before linking finished"
 msgstr ""
-"UWAGA: tymczasowy plik wyjściowy nadpisany przed zakończeniem linkowania"
+"OSTRZEŻENIE: tymczasowy plik wyjściowy został zastąpiony przed ukończeniem "
+"konsolidowania"
 
 #: src/ldgeneric.c:7064 src/ldgeneric.c:7075 src/ldgeneric.c:7086
 #: src/ldgeneric.c:7097 src/ldgeneric.c:7116 src/ldgeneric.c:7129
@@ -3683,63 +3691,64 @@ msgstr "brak implementacji \"%s\" specyficznej dla maszyny"
 
 #: src/ldscript.y:178
 msgid "mode for segment invalid\n"
-msgstr "błędne atrybuty dla segmentu\n"
+msgstr "nieprawidłowy tryb dla segmentu\n"
 
 #: src/ldscript.y:465
 #, c-format
 msgid "while reading version script '%s': %s at line %d"
-msgstr "podczas odczytu skryptu wersji \"%s\": %s w linii %d"
+msgstr "podczas odczytywania skryptu wersji \"%s\": %s w wierszu %d"
 
 #: src/ldscript.y:466
 #, c-format
 msgid "while reading linker script '%s': %s at line %d"
-msgstr "podczas odczytu skryptu linkera \"%s\": %s w linii %d"
+msgstr "podczas odczytywania skryptu konsolidatora \"%s\": %s w wierszu %d"
 
 #: src/ldscript.y:745
-#, fuzzy, c-format
+#, c-format
 msgid "symbol '%s' is declared both local and global for unnamed version"
 msgstr ""
-"symbol \"%s\" zadeklarowany jednocześnie lokalny i globalny dla nienazwanej "
-"wersji"
+"symbol \"%s\" jest zadeklarowany jednocześnie lokalny i globalny dla "
+"nienazwanej wersji"
 
 #: src/ldscript.y:747
-#, fuzzy, c-format
+#, c-format
 msgid "symbol '%s' is declared both local and global for version '%s'"
 msgstr ""
-"symbol \"%s\" zadeklarowany jednocześnie lokalny i globalny dla wersji \"%s\""
+"symbol \"%s\" jest zadeklarowany jednocześnie lokalny i globalny dla wersji "
+"\"%s\""
 
 #: src/ldscript.y:767 src/ldscript.y:774
 #, c-format
 msgid "default visibility set as local and global"
 msgstr "domyślna widoczność ustawiona jako lokalna i globalna"
 
-#: src/nm.c:74 src/strip.c:73
+#: src/nm.c:74 src/strip.c:74
 msgid "Output selection:"
 msgstr "Wybór wyjścia:"
 
 #: src/nm.c:75
 msgid "Display debugger-only symbols"
-msgstr "Wyświetlenie symboli wyłącznie debugowych"
+msgstr "Wyświetla symbole wyłącznie debugowowania"
 
 #: src/nm.c:76
 msgid "Display only defined symbols"
-msgstr "Wyświetlenie tylko symboli zdefiniowanych"
+msgstr "Wyświetla tylko określone symbole"
 
 #: src/nm.c:79
 msgid "Display dynamic symbols instead of normal symbols"
-msgstr "Wyświetlenie symboli dynamicznych zamiast normalnych"
+msgstr "Wyświetla symbole dynamiczne zamiast zwykłych"
 
 #: src/nm.c:80
 msgid "Display only external symbols"
-msgstr "Wyświetlenie tylko symboli zewnętrznych"
+msgstr "Wyświetla tylko symbole zewnętrzne"
 
 #: src/nm.c:81
 msgid "Display only undefined symbols"
-msgstr "Wyświetlenie tylko symboli niezdefiniowanych"
+msgstr "Wyświetla tylko nieokreślone symbole"
 
 #: src/nm.c:83
 msgid "Include index for symbols from archive members"
-msgstr "Dołączenie indeksu dla symboli z elementów archiwum"
+msgstr "Dołącza indeks dla symboli z elementów archiwum"
 
 #: src/nm.c:85 src/size.c:66
 msgid "Output format:"
@@ -3747,71 +3756,71 @@ msgstr "Format wyjścia:"
 
 #: src/nm.c:87
 msgid "Print name of the input file before every symbol"
-msgstr "Wypisanie nazwy pliku wejściowego przed każdym symbolem"
+msgstr "Wyświetla nazwę pliku wejściowego przed każdym symbolem"
 
 #: src/nm.c:90
 msgid ""
 "Use the output format FORMAT.  FORMAT can be `bsd', `sysv' or `posix'.  The "
 "default is `sysv'"
 msgstr ""
-"Użycie takiego FORMATU wyjściowego. Może to być `bsd', `sysv' lub `posix'. "
-"Domyślny jest `sysv'"
+"Używa FORMATU wyjściowego. Może to być \"bsd\", \"sysv\" lub \"posix\". "
+"Domyślny jest format \"sysv\""
 
 #: src/nm.c:92
 msgid "Same as --format=bsd"
-msgstr "To samo co --format=bsd"
+msgstr "To samo, co --format=bsd"
 
 #: src/nm.c:93
 msgid "Same as --format=posix"
-msgstr "To samo co --format=posix"
+msgstr "To samo co, --format=posix"
 
 #: src/nm.c:94 src/size.c:72
 msgid "Use RADIX for printing symbol values"
-msgstr "Użycie BAZY do wypisywania wartości symboli"
+msgstr "Używa BAZY do wypisywania wartości symboli"
 
 #: src/nm.c:95
 msgid "Mark weak symbols"
-msgstr "Oznaczanie symboli słabych"
+msgstr "Oznacza słabe symbole"
 
 #: src/nm.c:96
 msgid "Print size of defined symbols"
-msgstr "Wypisywanie rozmiaru zdefiniowanych symboli"
+msgstr "Wyświetla rozmiar określonych symboli"
 
-#: src/nm.c:98 src/size.c:80 src/strip.c:78 src/unstrip.c:81
+#: src/nm.c:98 src/size.c:80 src/strip.c:79 src/unstrip.c:81
 msgid "Output options:"
 msgstr "Opcje wyjścia:"
 
 #: src/nm.c:99
 msgid "Sort symbols numerically by address"
-msgstr "Sortowanie symboli numerycznie według adresu"
+msgstr "Porządkuje symbole numerycznie według adresu"
 
 #: src/nm.c:101
 msgid "Do not sort the symbols"
-msgstr "Nie sortowanie symboli"
+msgstr "Bez porzÄ…dkowania symboli"
 
 #: src/nm.c:102
 msgid "Reverse the sense of the sort"
-msgstr "Odwrócenie porządku sortowania"
+msgstr "Odwraca kierunek porzÄ…dkowania"
 
 #: src/nm.c:108
 msgid "List symbols from FILEs (a.out by default)."
-msgstr "Podanie listy symboli z PLIKU (domyślnie a.out)."
+msgstr "Wyświetla listę symboli z PLIKU (domyślnie a.out)."
 
-#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:121
+#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:124
 #, c-format
 msgid "%s: INTERNAL ERROR %d (%s-%s): %s"
 msgstr "%s: B�ĄD WEWNĘTRZNY %d (%s-%s): %s"
 
 #: src/nm.c:380 src/nm.c:392 src/size.c:317 src/size.c:326 src/size.c:337
-#: src/strip.c:1816
+#: src/strip.c:1878
 #, c-format
 msgid "while closing '%s'"
 msgstr "podczas zamykania \"%s\""
 
-#: src/nm.c:402 src/objdump.c:296 src/strip.c:359
+#: src/nm.c:402 src/objdump.c:296 src/strip.c:369
 #, c-format
 msgid "%s: File format not recognized"
-msgstr "%s: Format pliku nie rozpoznany"
+msgstr "%s: nie rozpoznano formatu pliku"
 
 #: src/nm.c:442
 msgid ""
@@ -3824,7 +3833,7 @@ msgstr ""
 #: src/nm.c:451
 #, c-format
 msgid "invalid offset %zu for symbol %s"
-msgstr "błędny offset %zu dla symbolu %s"
+msgstr "nieprawidłowy offset %zu dla symbolu %s"
 
 #: src/nm.c:456
 #, c-format
@@ -3834,12 +3843,12 @@ msgstr "%s w %s\n"
 #: src/nm.c:464
 #, c-format
 msgid "cannot reset archive offset to beginning"
-msgstr "nie można przestawić offsetu w archiwum na początek"
+msgstr "nie można przywrócić offsetu w archiwum na początek"
 
 #: src/nm.c:488 src/objdump.c:344
 #, c-format
 msgid "%s%s%s: file format not recognized"
-msgstr "%s%s%s: format pliku nie rozpoznany"
+msgstr "%s%s%s: nie rozpoznano formatu pliku"
 
 #: src/nm.c:700
 #, c-format
@@ -3851,10 +3860,10 @@ msgstr "nie można utworzyć drzewa wyszukiwania"
 #: src/readelf.c:1742 src/readelf.c:1952 src/readelf.c:2206 src/readelf.c:2272
 #: src/readelf.c:2350 src/readelf.c:2848 src/readelf.c:2884 src/readelf.c:2946
 #: src/readelf.c:6934 src/readelf.c:7832 src/readelf.c:7979 src/readelf.c:8047
-#: src/size.c:425 src/size.c:499 src/strip.c:483
+#: src/size.c:425 src/size.c:499 src/strip.c:493
 #, c-format
 msgid "cannot get section header string table index"
-msgstr "nie można uzyskać indeksu tabeli łańcuchów nagłówków sekcji"
+msgstr "nie można uzyskać indeksu tabeli ciągów nagłówków sekcji"
 
 #: src/nm.c:766
 #, c-format
@@ -3894,17 +3903,17 @@ msgstr ""
 #: src/nm.c:1012
 #, c-format
 msgid "%s: entry size in section `%s' is not what we expect"
-msgstr "%s: rozmiar wpisu w sekcji `%s' nie jest tym czego oczekiwano"
+msgstr "%s: rozmiar wpisu w sekcji \"%s\" nie jest tym, czego oczekiwano"
 
 #: src/nm.c:1016
 #, c-format
 msgid "%s: size of section `%s' is not multiple of entry size"
-msgstr "%s: rozmiar sekcji `%s' nie jest wielokrotnością rozmiaru wpisu"
+msgstr "%s: rozmiar sekcji \"%s\" nie jest wielokrotnością rozmiaru wpisu"
 
 #: src/nm.c:1255
 #, c-format
 msgid "%s%s%s%s: Invalid operation"
-msgstr "%s%s%s%s: Błędna operacja"
+msgstr "%s%s%s%s: nieprawidłowe działanie"
 
 #: src/nm.c:1312
 #, c-format
@@ -3916,31 +3925,28 @@ msgid "Mode selection:"
 msgstr "Wybór trybu:"
 
 #: src/objdump.c:62
-#, fuzzy
 msgid "Display relocation information."
-msgstr "Wyświetlenie informacji o wersjonowaniu"
+msgstr "Wyświetla informacje o relokacji."
 
 #: src/objdump.c:64
 msgid "Display the full contents of all sections requested"
-msgstr ""
+msgstr "Wyświetla pełną zawartość żądanych sekcji"
 
 #: src/objdump.c:66
 msgid "Display assembler code of executable sections"
-msgstr ""
+msgstr "Wyświetla kod asemblera sekcji wykonywalnych"
 
 #: src/objdump.c:68
-#, fuzzy
 msgid "Output option selection:"
-msgstr "Wybór wyjścia:"
+msgstr "Wybór opcji wyjścia:"
 
 #: src/objdump.c:70
 msgid "Only display information for section NAME."
-msgstr ""
+msgstr "Wyświetla tylko informacje o sekcji NAZWA."
 
 #: src/objdump.c:76
-#, fuzzy
 msgid "Show information from FILEs (a.out by default)."
-msgstr "Podanie listy symboli z PLIKU (domyślnie a.out)."
+msgstr "Wyświetla informacje z PLIKÓW (domyślnie a.out)."
 
 #: src/objdump.c:236 src/readelf.c:437
 msgid "No operation specified.\n"
@@ -3966,24 +3972,27 @@ msgid ""
 "RELOCATION RECORDS FOR [%s]:\n"
 "%-*s TYPE                 VALUE\n"
 msgstr ""
+"\n"
+"PISY RELOKACJI DLA [%s]:\n"
+"%-*s TYP                  WARTOŚĆ\n"
 
 #: src/objdump.c:513
 msgid "OFFSET"
 msgstr "OFFSET"
 
 #: src/objdump.c:576
-#, fuzzy, c-format
+#, c-format
 msgid "Contents of section %s:\n"
-msgstr "nie można uzyskać zawartości sekcji %zu: %s"
+msgstr "Zawartość sekcji %s:\n"
 
 #: src/objdump.c:676
 #, c-format
 msgid "cannot disassemble"
-msgstr ""
+msgstr "nie można deasemblować"
 
 #: src/ranlib.c:74
 msgid "Generate an index to speed access to archives."
-msgstr "Generowanie indeksu w celu przyspieszenia dostępu do archiwów."
+msgstr "Tworzenie indeksu w celu przyspieszenia dostępu do archiwów."
 
 #: src/ranlib.c:77
 msgid "ARCHIVE"
@@ -3992,7 +4001,7 @@ msgstr "ARCHIWUM"
 #: src/ranlib.c:116
 #, c-format
 msgid "Archive name required"
-msgstr "Wymagana nazwa archiwum"
+msgstr "Wymagana jest nazwa archiwum"
 
 #: src/ranlib.c:194
 #, c-format
@@ -4002,7 +4011,7 @@ msgstr "\"%s\" nie jest archiwum"
 #: src/ranlib.c:229
 #, c-format
 msgid "error while freeing sub-ELF descriptor: %s"
-msgstr " błąd podczas zwalniania deskryptora pod-ELF: %s"
+msgstr "błąd podczas zwalniania deskryptora pod-ELF: %s"
 
 #: src/readelf.c:73
 msgid "ELF output selection:"
@@ -4010,81 +4019,75 @@ msgstr "Wybór wyjścia ELF:"
 
 #: src/readelf.c:75
 msgid "All these plus -p .strtab -p .dynstr -p .comment"
-msgstr ""
+msgstr "Wszystkie te plus -p .strtab -p .dynstr -p .comment"
 
 #: src/readelf.c:76
 msgid "Display the dynamic segment"
-msgstr "Wyświetlenie segmentu dynamicznego"
+msgstr "Wyświetla segment dynamiczny"
 
 #: src/readelf.c:77
 msgid "Display the ELF file header"
-msgstr "Wyświetlenie nagłówka pliku ELF"
+msgstr "Wyświetla nagłówek pliku ELF"
 
 #: src/readelf.c:79
 msgid "Display histogram of bucket list lengths"
-msgstr "Wyświetlenie histogramu długości list kubełków"
+msgstr "Wyświetla histogram długości list kubełków"
 
 #: src/readelf.c:80
 msgid "Display the program headers"
-msgstr "Wyświetlenie nagłówków programu"
+msgstr "Wyświetla nagłówki programu"
 
 #: src/readelf.c:82
 msgid "Display relocations"
-msgstr "Wyświetlenie relokacji"
+msgstr "Wyświetla relokacje"
 
 #: src/readelf.c:83
-#, fuzzy
 msgid "Display the sections' headers"
-msgstr "Wyświetlenie nagłówków sekcji"
+msgstr "Wyświetla nagłówków sekcji"
 
 #: src/readelf.c:85
 msgid "Display the symbol table"
-msgstr "Wyświetlenie tabeli symboli"
+msgstr "Wyświetla tabelę symboli"
 
 #: src/readelf.c:86
 msgid "Display versioning information"
-msgstr "Wyświetlenie informacji o wersjonowaniu"
+msgstr "Wyświetla informacje o wersjonowaniu"
 
 #: src/readelf.c:87
-#, fuzzy
 msgid "Display the ELF notes"
-msgstr "Wyświetlenie głównych notatek"
+msgstr "Wyświetla notatki ELF"
 
 #: src/readelf.c:89
-#, fuzzy
 msgid "Display architecture specific information, if any"
-msgstr "Wyświetlenie informacji specyficznych dla architektury (o ile są)"
+msgstr "Wyświetla informacje specyficzne dla architektury, jeśli są"
 
 #: src/readelf.c:91
 msgid "Display sections for exception handling"
-msgstr ""
+msgstr "Wyświetla sekcje do obsługi wyjątków"
 
 #: src/readelf.c:93
 msgid "Additional output selection:"
 msgstr "Dodatkowy wybór wyjścia:"
 
 #: src/readelf.c:95
-#, fuzzy
 msgid ""
 "Display DWARF section content.  SECTION can be one of abbrev, aranges, "
 "frame, info, loc, line, ranges, pubnames, str, macinfo, or exception"
 msgstr ""
-"Wyświetlenie zawartości sekcji DWARF. SEKCJA może być jednym z abbrev, "
-"aranges, frame, info, loc, line, ranges, pubnames, str lub macinfo."
+"Wyświetla zawartość sekcji DWARF. SEKCJA może być jednym z abbrev, aranges, "
+"frame, info, loc, line, ranges, pubnames, str, macinfo lub exception."
 
 #: src/readelf.c:99
 msgid "Dump the uninterpreted contents of SECTION, by number or name"
-msgstr ""
+msgstr "Zrzuca niezinterpretowaną zawartość SEKCJI, według liczny lub nazwy"
 
 #: src/readelf.c:101
-#, fuzzy
 msgid "Print string contents of sections"
-msgstr "nie można uzyskać zawartości sekcji %zu: %s"
+msgstr "Wyświetla zawartość ciągów sekcji"
 
 #: src/readelf.c:104
-#, fuzzy
 msgid "Display the symbol index of an archive"
-msgstr "Wyświetlenie tabeli symboli"
+msgstr "Wyświetla indeks symboli archiwum"
 
 #: src/readelf.c:106
 msgid "Output control:"
@@ -4092,31 +4095,31 @@ msgstr "Kontrola wyjścia:"
 
 #: src/readelf.c:108
 msgid "Do not find symbol names for addresses in DWARF data"
-msgstr ""
+msgstr "Bez odnajdywania nazw symboli dla adresów w danych DWARF"
 
 #: src/readelf.c:114
 msgid "Print information from ELF file in human-readable form."
-msgstr "Wypisanie informacji z pliku ELF w postaci czytelnej dla człowieka"
+msgstr "Wyświetla informacje z pliku ELF w postaci czytelnej dla człowieka."
 
 #: src/readelf.c:408
 #, c-format
 msgid "Unknown DWARF debug section `%s'.\n"
-msgstr "Nieznana sekcja debugowa DWARF `%s'.\n"
+msgstr "Nieznana sekcja debugowania DWARF \"%s\".\n"
 
 #: src/readelf.c:472
 #, c-format
 msgid "cannot generate Elf descriptor: %s"
-msgstr "nie można utworzyć deskryptora Elf: %s"
+msgstr "nie można utworzyć deskryptora ELF: %s"
 
 #: src/readelf.c:484
 #, c-format
 msgid "'%s' is not an archive, cannot print archive index"
-msgstr ""
+msgstr "\"%s\" nie jest archiwum, nie można wyświetlić indeksu archiwum"
 
 #: src/readelf.c:489
 #, c-format
 msgid "error while closing Elf descriptor: %s"
-msgstr "błąd podczas zamykania deskryptora Elf: %s"
+msgstr "błąd podczas zamykania deskryptora ELF: %s"
 
 #: src/readelf.c:581
 #, c-format
@@ -4150,23 +4153,23 @@ msgstr "nie można określić liczby nagłówków programu: %s"
 
 #: src/readelf.c:728
 msgid "NONE (None)"
-msgstr "NONE (Żaden)"
+msgstr "NONE (żaden)"
 
 #: src/readelf.c:729
 msgid "REL (Relocatable file)"
-msgstr "REL (Plik relokowalny)"
+msgstr "REL (plik relokowalny)"
 
 #: src/readelf.c:730
 msgid "EXEC (Executable file)"
-msgstr "EXEC (Plik wykonywalny)"
+msgstr "EXEC (plik wykonywalny)"
 
 #: src/readelf.c:731
 msgid "DYN (Shared object file)"
-msgstr "DYN (Plik obiektu dzielonego)"
+msgstr "DYN (plik obiektu współdzielonego)"
 
 #: src/readelf.c:732
 msgid "CORE (Core file)"
-msgstr "CORE (Plik core)"
+msgstr "CORE (plik core)"
 
 #: src/readelf.c:737
 #, c-format
@@ -4212,7 +4215,7 @@ msgstr "(bieżąca)"
 #: src/readelf.c:770
 #, c-format
 msgid "  OS/ABI:                            %s\n"
-msgstr "  OS/ABI:                            %s\n"
+msgstr "  System operacyjny/ABI:             %s\n"
 
 #: src/readelf.c:773
 #, c-format
@@ -4272,9 +4275,9 @@ msgid "  Size of program header entries:    %<PRId16> %s\n"
 msgstr "  Rozmiar wpisów nagłówka programu:  %<PRId16> %s\n"
 
 #: src/readelf.c:803
-#, fuzzy, c-format
+#, c-format
 msgid "  Number of program headers entries: %<PRId16>"
-msgstr "  Liczba wpisów nagłówków programu:  %<PRId16>\n"
+msgstr "  Liczba wpisów nagłówków programu: %<PRId16>"
 
 #: src/readelf.c:810
 #, c-format
@@ -4311,7 +4314,7 @@ msgid ""
 "  Section header string table index: XINDEX%s\n"
 "\n"
 msgstr ""
-"  Indeks tabeli łańcuchów nagłówków sekcji: XINDEX%s\n"
+"  Indeks tabeli ciągów nagłówków sekcji: XINDEX%s\n"
 "\n"
 
 #: src/readelf.c:852
@@ -4320,7 +4323,7 @@ msgid ""
 "  Section header string table index: %<PRId16>\n"
 "\n"
 msgstr ""
-"  Indeks tabeli łańcuchów nagłówków sekcji: %<PRId16>\n"
+"  Indeks tabeli ciągów nagłówków sekcji: %<PRId16>\n"
 "\n"
 
 #: src/readelf.c:884
@@ -4329,7 +4332,7 @@ msgid ""
 "There are %d section headers, starting at offset %#<PRIx64>:\n"
 "\n"
 msgstr ""
-"Jest %d nagłówków sekcji, zaczynających się od offsetu %#<PRIx64>:\n"
+"Jest %d nagłówków sekcji, rozpoczynających się od offsetu %#<PRIx64>:\n"
 "\n"
 
 #: src/readelf.c:894
@@ -4397,8 +4400,8 @@ msgid ""
 "  Segment Sections..."
 msgstr ""
 "\n"
-" Odwzorowanie sekcji na segmenty:\n"
-"  Segment Sekcje..."
+" mapowanie sekcji do segmentów:\n"
+"  Segment sekcji..."
 
 #: src/readelf.c:1048 src/unstrip.c:1837 src/unstrip.c:1876 src/unstrip.c:1883
 #, c-format
@@ -4415,13 +4418,13 @@ msgid_plural ""
 "COMDAT section group [%2zu] '%s' with signature '%s' contains %zu entries:\n"
 msgstr[0] ""
 "\n"
-"Grupa sekcji COMDAT [%2zu] \"%s\" z sygnaturÄ… \"%s\" zawiera %zu wpis:\n"
+"Grupa sekcji COMDAT [%2zu] \"%s\" z podspiem \"%s\" zawiera %zu wpis:\n"
 msgstr[1] ""
 "\n"
-"Grupa sekcji COMDAT [%2zu] \"%s\" z sygnaturÄ… \"%s\" zawiera %zu wpisy:\n"
+"Grupa sekcji COMDAT [%2zu] \"%s\" z podpisem \"%s\" zawiera %zu wpisy:\n"
 msgstr[2] ""
 "\n"
-"Grupa sekcji COMDAT [%2zu] \"%s\" z sygnaturą \"%s\" zawiera %zu wpisów:\n"
+"Grupa sekcji COMDAT [%2zu] \"%s\" z podpisem \"%s\" zawiera %zu wpisów:\n"
 
 #: src/readelf.c:1187
 #, c-format
@@ -4433,21 +4436,21 @@ msgid_plural ""
 "Section group [%2zu] '%s' with signature '%s' contains %zu entries:\n"
 msgstr[0] ""
 "\n"
-"Grupa sekcji [%2zu] \"%s\" z sygnaturÄ… \"%s\" zawiera %zu wpis:\n"
+"Grupa sekcji [%2zu] \"%s\" z podpisem \"%s\" zawiera %zu wpis:\n"
 msgstr[1] ""
 "\n"
-"Grupa sekcji [%2zu] \"%s\" z sygnaturÄ… \"%s\" zawiera %zu wpisy:\n"
+"Grupa sekcji [%2zu] \"%s\" z podpisem \"%s\" zawiera %zu wpisy:\n"
 msgstr[2] ""
 "\n"
-"Grupa sekcji [%2zu] \"%s\" z sygnaturą \"%s\" zawiera %zu wpisów:\n"
+"Grupa sekcji [%2zu] \"%s\" z podpisem \"%s\" zawiera %zu wpisów:\n"
 
 #: src/readelf.c:1195
 msgid "<INVALID SYMBOL>"
-msgstr "<B�ĘDNY SYMBOL>"
+msgstr "<NIEPRAWID�OWY SYMBOL>"
 
 #: src/readelf.c:1209
 msgid "<INVALID SECTION>"
-msgstr "<B�ĘDNA SEKCJA>"
+msgstr "<NIEPRAWID�OWY SEKCJA>"
 
 #: src/readelf.c:1360
 #, c-format
@@ -4482,7 +4485,7 @@ msgstr "  Typ               Wartość\n"
 #: src/readelf.c:1396
 #, c-format
 msgid "Shared library: [%s]\n"
-msgstr "Biblioteka dzielona: [%s]\n"
+msgstr "Biblioteka współdzielona: [%s]\n"
 
 #: src/readelf.c:1401
 #, c-format
@@ -4511,7 +4514,7 @@ msgid ""
 "Invalid symbol table at offset %#0<PRIx64>\n"
 msgstr ""
 "\n"
-"Błędna tabela symboli pod offsetem %#0<PRIx64>\n"
+"Nieprawidłowa tabela symboli pod offsetem %#0<PRIx64>\n"
 
 #: src/readelf.c:1559 src/readelf.c:1744
 #, c-format
@@ -4566,7 +4569,7 @@ msgstr "  Offset              Typ                  Wartość             Nazwa\n
 #: src/readelf.c:1693 src/readelf.c:1812 src/readelf.c:1824 src/readelf.c:1838
 #: src/readelf.c:1857 src/readelf.c:1870
 msgid "<INVALID RELOC>"
-msgstr "<B�ĘDNA RELOKACJA>"
+msgstr "<NIEPRAWID�OWA RELOKACJA>"
 
 #: src/readelf.c:1756
 msgid "  Offset      Type            Value       Addend Name\n"
@@ -4599,9 +4602,9 @@ msgstr[2] ""
 #, c-format
 msgid " %lu local symbol  String table: [%2u] '%s'\n"
 msgid_plural " %lu local symbols  String table: [%2u] '%s'\n"
-msgstr[0] " %lu symbol lokalny     Tabela łańcuchów: [%2u] \"%s\"\n"
-msgstr[1] " %lu symbole lokalne    Tabela łańcuchów: [%2u] \"%s\"\n"
-msgstr[2] " %lu symboli lokalnych  Tabela łańcuchów: [%2u] \"%s\"\n"
+msgstr[0] " %lu symbol lokalny     Tabela ciągów: [%2u] \"%s\"\n"
+msgstr[1] " %lu symbole lokalne    Tabela ciągów: [%2u] \"%s\"\n"
+msgstr[2] " %lu symboli lokalnych  Tabela ciągów: [%2u] \"%s\"\n"
 
 #: src/readelf.c:1975
 msgid "  Num:    Value   Size Type    Bind   Vis          Ndx Name\n"
@@ -4630,7 +4633,7 @@ msgid "| <unknown>"
 msgstr "| <nieznany>"
 
 #: src/readelf.c:2209
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Version needs section [%2u] '%s' contains %d entry:\n"
@@ -4641,19 +4644,19 @@ msgid_plural ""
 " Addr: %#0*<PRIx64>  Offset: %#08<PRIx64>  Link to section: [%2u] '%s'\n"
 msgstr[0] ""
 "\n"
-"Sekcja wymaganych wersji [%2u] '%s' zawiera %d wpis:\n"
-" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] "
-"'%s'\n"
+"Sekcja wymaganych wersji [%2u] \"%s\" zawiera %d wpis:\n"
+" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] \"%s"
+"\"\n"
 msgstr[1] ""
 "\n"
-"Sekcja wymaganych wersji [%2u] '%s' zawiera %d wpisy:\n"
-" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] "
-"'%s'\n"
+"Sekcja wymaganych wersji [%2u] \"%s\" zawiera %d wpisy:\n"
+" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] \"%s"
+"\"\n"
 msgstr[2] ""
 "\n"
-"Sekcja wymaganych wersji [%2u] '%s' zawiera %d wpisów:\n"
-" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] "
-"'%s'\n"
+"Sekcja wymaganych wersji [%2u] \"%s\" zawiera %d wpisów:\n"
+" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] \"%s"
+"\"\n"
 
 #: src/readelf.c:2232
 #, c-format
@@ -4678,18 +4681,18 @@ msgid_plural ""
 msgstr[0] ""
 "\n"
 "Sekcja definicji wersji [%2u] \"%s\" zawiera %d wpis:\n"
-" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] "
-"'%s'\n"
+" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] \"%s"
+"\"\n"
 msgstr[1] ""
 "\n"
 "Sekcja definicji wersji [%2u] \"%s\" zawiera %d wpisy:\n"
-" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] "
-"'%s'\n"
+" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] \"%s"
+"\"\n"
 msgstr[2] ""
 "\n"
 "Sekcja definicji wersji [%2u] \"%s\" zawiera %d wpisów:\n"
-" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] "
-"'%s'\n"
+" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] \"%s"
+"\"\n"
 
 #: src/readelf.c:2306
 #, c-format
@@ -4752,20 +4755,20 @@ msgstr[0] ""
 "\n"
 "Histogram dla długości listy kubełków w sekcji [%2u] \"%s\" (w sumie %d "
 "kubełek):\n"
-" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] "
-"'%s'\n"
+" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] \"%s"
+"\"\n"
 msgstr[1] ""
 "\n"
 "Histogram dla długości listy kubełków w sekcji [%2u] \"%s\" (w sumie %d "
 "kubełki):\n"
-" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] "
-"'%s'\n"
+" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] \"%s"
+"\"\n"
 msgstr[2] ""
 "\n"
 "Histogram dla długości listy kubełków w sekcji [%2u] \"%s\" (w sumie %d "
 "kubełków):\n"
-" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] "
-"'%s'\n"
+" Adres: %#0*<PRIx64>  Offset: %#08<PRIx64>  DowiÄ…zanie do sekcji: [%2u] \"%s"
+"\"\n"
 
 #: src/readelf.c:2643
 #, no-c-format
@@ -4783,13 +4786,13 @@ msgid "%7d  %6<PRIu32>      %5.1f%%    %5.1f%%\n"
 msgstr "%7d  %6<PRIu32>      %5.1f%%    %5.1f%%\n"
 
 #: src/readelf.c:2665
-#, fuzzy, c-format
+#, c-format
 msgid ""
 " Average number of tests:   successful lookup: %f\n"
 "\t\t\t  unsuccessful lookup: %f\n"
 msgstr ""
 " Średnia liczba testów:   udane wyszukania: %f\n"
-"                       nieudane wyszukania: %f\n"
+"\t\t\t  nieudane wyszukania: %f\n"
 
 #: src/readelf.c:2683 src/readelf.c:2725 src/readelf.c:2766
 #, c-format
@@ -4836,14 +4839,15 @@ msgstr ""
 "Flagi"
 
 #: src/readelf.c:2958
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Object attributes section [%2zu] '%s' of %<PRIu64> bytes at offset "
 "%#0<PRIx64>:\n"
 msgstr ""
 "\n"
-"Segment notatki o długości %<PRId64> bajtów pod offsetem %#0<PRIx64>:\n"
+"Sekcja atrybutów obiektu [%2zu] \"%s\" %<PRIu64> bajtów pod offsetem "
+"%#0<PRIx64>:\n"
 
 #: src/readelf.c:2974
 msgid "  Owner          Size\n"
@@ -4971,42 +4975,42 @@ msgstr "pusty blok"
 #: src/readelf.c:3806
 #, c-format
 msgid "%zu byte block:"
-msgstr ""
+msgstr "%zu bajtowy blok:"
 
 #: src/readelf.c:4259
 #, c-format
 msgid "%*s[%4<PRIuMAX>] %s  <TRUNCATED>\n"
-msgstr ""
+msgstr "%*s[%4<PRIuMAX>] %s  <SKRÓCONE>\n"
 
 #: src/readelf.c:4295
 #, c-format
 msgid "%s %#<PRIx64> used with different address sizes"
-msgstr ""
+msgstr "%s %#<PRIx64> zostało użyte z różnymi rozmiarami adresu"
 
 #: src/readelf.c:4302
 #, c-format
 msgid "%s %#<PRIx64> used with different offset sizes"
-msgstr ""
+msgstr "%s %#<PRIx64> zostało użyte z różnymi rozmiarami offsetu"
 
 #: src/readelf.c:4381
 #, c-format
 msgid " [%6tx]  <UNUSED GARBAGE IN REST OF SECTION>\n"
-msgstr ""
+msgstr " [%6tx]  <NIEUŻYWANE ŚMIECIE W RESZCIE SEKCJI>\n"
 
 #: src/readelf.c:4389
 #, c-format
 msgid " [%6tx]  <UNUSED GARBAGE> ... %<PRIu64> bytes ...\n"
-msgstr ""
+msgstr " [%6tx]  <NIEUŻYWANE ŚMIECIE>... %<PRIu64> bajtów...\n"
 
 #: src/readelf.c:4409
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "DWARF section [%2zu] '%s' at offset %#<PRIx64>:\n"
 " [ Code]\n"
 msgstr ""
 "\n"
-"Sekcja DWARF \"%s\" pod offsetem %#<PRIx64>:\n"
+"Sekcja DWARF [%2zu] \"%s\" pod offsetem %#<PRIx64>:\n"
 " [ Kod]\n"
 
 #: src/readelf.c:4416
@@ -5021,7 +5025,7 @@ msgstr ""
 #: src/readelf.c:4429
 #, c-format
 msgid " *** error while reading abbreviation: %s\n"
-msgstr " *** błąd podczas odczytu skrótu: %s\n"
+msgstr " *** błąd podczas odczytywania skrótu: %s\n"
 
 #: src/readelf.c:4445
 #, c-format
@@ -5042,7 +5046,7 @@ msgid "cannot get .debug_aranges content: %s"
 msgstr "nie można uzyskać zawartości .debug_aranges: %s"
 
 #: src/readelf.c:4489
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "DWARF section [%2zu] '%s' at offset %#<PRIx64> contains %zu entry:\n"
@@ -5051,13 +5055,13 @@ msgid_plural ""
 "DWARF section [%2zu] '%s' at offset %#<PRIx64> contains %zu entries:\n"
 msgstr[0] ""
 "\n"
-"Sekcja DWARF \"%s\" pod offsetem %#<PRIx64> zawiera %zu wpis:\n"
+"Sekcja DWARF [%2zu] \"%s\" pod offsetem %#<PRIx64> zawiera %zu wpis:\n"
 msgstr[1] ""
 "\n"
-"Sekcja DWARF \"%s\" pod offsetem %#<PRIx64> zawiera %zu wpisy:\n"
+"Sekcja DWARF [%2zu] \"%s\" pod offsetem %#<PRIx64> zawiera %zu wpisy:\n"
 msgstr[2] ""
 "\n"
-"Sekcja DWARF \"%s\" pod offsetem %#<PRIx64> zawiera %zu wpisów:\n"
+"Sekcja DWARF [%2zu] \"%s\" pod offsetem %#<PRIx64> zawiera %zu wpisów:\n"
 
 #: src/readelf.c:4519
 #, c-format
@@ -5069,7 +5073,8 @@ msgstr " [%*zu] ???\n"
 msgid ""
 " [%*zu] start: %0#*<PRIx64>, length: %5<PRIu64>, CU DIE offset: %6<PRId64>\n"
 msgstr ""
-" [%*zu] start: %0#*<PRIx64>, długość: %5<PRIu64>, offset CU DIE: %6<PRId64>\n"
+" [%*zu] początek: %0#*<PRIx64>, długość: %5<PRIu64>, offset CU DIE: "
+"%6<PRId64>\n"
 
 #: src/readelf.c:4540
 #, c-format
@@ -5078,13 +5083,13 @@ msgstr "nie można uzyskać zawartości .debug_ranges: %s"
 
 #: src/readelf.c:4545 src/readelf.c:5045 src/readelf.c:5817 src/readelf.c:6315
 #: src/readelf.c:6430 src/readelf.c:6602
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "DWARF section [%2zu] '%s' at offset %#<PRIx64>:\n"
 msgstr ""
 "\n"
-"Sekcja DWARF \"%s\" pod offsetem %#<PRIx64>:\n"
+"Sekcja DWARF [%2zu] \"%s\" pod offsetem %#<PRIx64>:\n"
 
 #: src/readelf.c:4568 src/readelf.c:6339
 #, c-format
@@ -5094,41 +5099,41 @@ msgstr " [%6tx]  <NIEPRAWID�OWE DANE>\n"
 #: src/readelf.c:4590 src/readelf.c:6361
 #, c-format
 msgid " [%6tx]  base address %s\n"
-msgstr ""
+msgstr " [%6tx]  adres podstawowy %s\n"
 
 #: src/readelf.c:4596 src/readelf.c:6367
-#, fuzzy, c-format
+#, c-format
 msgid " [%6tx]  empty list\n"
-msgstr " [%6tx]  %s..%s\n"
+msgstr " [%6tx]  pusta lista\n"
 
 #: src/readelf.c:4605
 #, c-format
 msgid " [%6tx]  %s..%s\n"
-msgstr " [%6tx]  %s..%s\n"
+msgstr " [%6tx]  %s...%s\n"
 
 #: src/readelf.c:4607
 #, c-format
 msgid "           %s..%s\n"
-msgstr "           %s..%s\n"
+msgstr "           %s...%s\n"
 
 #: src/readelf.c:5034 src/readelf.c:6668 src/readelf.c:6770
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get %s content: %s"
-msgstr "nie można uzyskać sekcji: %s"
+msgstr "nie można uzyskać zwartości %s: %s"
 
 #: src/readelf.c:5041
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Call frame information section [%2zu] '%s' at offset %#<PRIx64>:\n"
 msgstr ""
 "\n"
-"Sekcja relokacji [%2u] \"%s\" pod offsetem %#0<PRIx64> zawiera %d wpis:\n"
+"Sekcja informacji o ramce wywołania [%2zu] \"%s\" pod offsetem %#0<PRIx64>:\n"
 
 #: src/readelf.c:5069 src/readelf.c:5851
 #, c-format
 msgid "invalid data in section [%zu] '%s'"
-msgstr "błędne dane w sekcji [%zu] \"%s\""
+msgstr "nieprawidłowe dane w sekcji [%zu] \"%s\""
 
 #: src/readelf.c:5091
 #, c-format
@@ -5136,36 +5141,36 @@ msgid ""
 "\n"
 " [%6tx] Zero terminator\n"
 msgstr ""
+"\n"
+" [%6tx] Zerowy koniec\n"
 
 #: src/readelf.c:5176
 #, c-format
 msgid "invalid augmentation length"
-msgstr ""
+msgstr "nieprawidłowa długość powiększenia"
 
 #: src/readelf.c:5188
 msgid "FDE address encoding: "
-msgstr ""
+msgstr "Kodowanie adresu FDE: "
 
 #: src/readelf.c:5194
 msgid "LSDA pointer encoding: "
-msgstr ""
+msgstr "Kodowanie wskaźnika LSDA: "
 
 #: src/readelf.c:5292
 #, c-format
 msgid " (offset: %#<PRIx64>)"
-msgstr ""
+msgstr " (offset: %#<PRIx64>)"
 
 #: src/readelf.c:5299
-#, fuzzy, c-format
+#, c-format
 msgid " (end offset: %#<PRIx64>)"
-msgstr ""
-"\n"
-"Sekcja DWARF \"%s\" pod offsetem %#<PRIx64>:\n"
+msgstr " (kończący offset: %#<PRIx64>)"
 
 #: src/readelf.c:5326
 #, c-format
 msgid "   %-26sLSDA pointer: %#<PRIx64>\n"
-msgstr ""
+msgstr "   %-26sWskaźnik LSDA: %#<PRIx64>\n"
 
 #: src/readelf.c:5377
 #, c-format
@@ -5183,27 +5188,28 @@ msgid "cannot get attribute value: %s"
 msgstr "nie można uzyskać wartości atrybutu: %s"
 
 #: src/readelf.c:5653
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "DWARF section [%2zu] '%s' at offset %#<PRIx64>:\n"
 " [Offset]\n"
 msgstr ""
 "\n"
-"Sekcja DWARF \"%s\" pod offsetem %#<PRIx64>:\n"
+"Sekcja DWARF [%2zu] \"%s\" pod offsetem %#<PRIx64>:\n"
 " [Offset]\n"
 
 #: src/readelf.c:5685
-#, fuzzy, c-format
+#, c-format
 msgid ""
 " Type unit at offset %<PRIu64>:\n"
 " Version: %<PRIu16>, Abbreviation section offset: %<PRIu64>, Address size: "
 "%<PRIu8>, Offset size: %<PRIu8>\n"
 " Type signature: %#<PRIx64>, Type offset: %#<PRIx64>\n"
 msgstr ""
-" Jednostka kompilacji pod offsetem %<PRIu64>:\n"
+" Jednostka typu pod offsetem %<PRIu64>:\n"
 " Wersja: %<PRIu16>, offset sekcji skrótów: %<PRIu64>, rozmiar adresu: "
 "%<PRIu8>, rozmiar offsetu: %<PRIu8>\n"
+" Podpis typu: %#<PRIx64>, offset typu: %#<PRIx64>\n"
 
 #: src/readelf.c:5694
 #, c-format
@@ -5245,7 +5251,7 @@ msgstr "nie można uzyskać następnego DIE: %s"
 #: src/readelf.c:5829
 #, c-format
 msgid "cannot get line data section data: %s"
-msgstr "nie można uzyskać danych sekcji danych linii: %s"
+msgstr "nie można uzyskać danych sekcji danych wiersza: %s"
 
 #: src/readelf.c:5842
 #, c-format
@@ -5257,7 +5263,7 @@ msgstr ""
 "Tabela pod offsetem %Zu:\n"
 
 #: src/readelf.c:5897
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 " Length:                     %<PRIu64>\n"
@@ -5277,25 +5283,26 @@ msgstr ""
 " Wersja DWARF:                 %<PRIuFAST16>\n"
 " Długość prologu:              %<PRIu64>\n"
 " Minimalna długość instrukcji: %<PRIuFAST8>\n"
-" Początkowa wartość \"%s\": %<PRIuFAST8>\n"
-" PoczÄ…tek linii:               %<PRIdFAST8>\n"
-" Przedział linii:              %<PRIuFAST8>\n"
+" Maksymalna liczba działań na instrukcję: %<PRIuFAST8>\n"
+" Początkowa wartość \"%s\":    %<PRIuFAST8>\n"
+" PoczÄ…tek wiersza:             %<PRIdFAST8>\n"
+" Przedział wiersza:            %<PRIuFAST8>\n"
 " PoczÄ…tek instrukcji:          %<PRIuFAST8>\n"
 "\n"
 "Instrukcje:\n"
 
 #: src/readelf.c:5918
-#, fuzzy, c-format
+#, c-format
 msgid "invalid data at offset %tu in section [%zu] '%s'"
-msgstr "błędne dane w sekcji [%zu] \"%s\""
+msgstr "nieprawidłowe dane pod offsetem %tu w sekcji [%zu] \"%s\""
 
 #: src/readelf.c:5933
 #, c-format
 msgid "  [%*<PRIuFAST8>]  %hhu argument\n"
 msgid_plural "  [%*<PRIuFAST8>]  %hhu arguments\n"
-msgstr[0] "  [%*<PRIuFAST8>]  %hhu argument\n"
-msgstr[1] "  [%*<PRIuFAST8>]  %hhu argumenty\n"
-msgstr[2] "  [%*<PRIuFAST8>]  %hhu argumentów\n"
+msgstr[0] "  [%*<PRIuFAST8>]  %hhu parametr\n"
+msgstr[1] "  [%*<PRIuFAST8>]  %hhu parametry\n"
+msgstr[2] "  [%*<PRIuFAST8>]  %hhu parametrów\n"
 
 #: src/readelf.c:5941
 msgid ""
@@ -5321,17 +5328,18 @@ msgid ""
 "Line number statements:"
 msgstr ""
 "\n"
-"Instrukcje numerów linii:"
+"Instrukcje numerów wierszy:"
 
 #: src/readelf.c:6060
-#, fuzzy, c-format
+#, c-format
 msgid " special opcode %u: address+%u = %s, op_index = %u, line%+d = %zu\n"
-msgstr " instrukcja specjalna %u: adres+%u = %#<PRIx64>, linia%+d = %zu\n"
+msgstr ""
+" instrukcja specjalna %u: adres+%u = %s, op_index = %u, wiersz%+d = %zu\n"
 
 #: src/readelf.c:6065
-#, fuzzy, c-format
+#, c-format
 msgid " special opcode %u: address+%u = %s, line%+d = %zu\n"
-msgstr " instrukcja specjalna %u: adres+%u = %#<PRIx64>, linia%+d = %zu\n"
+msgstr " instrukcja specjalna %u: adres+%u = %s, wiersz%+d = %zu\n"
 
 #: src/readelf.c:6085
 #, c-format
@@ -5343,9 +5351,9 @@ msgid "end of sequence"
 msgstr "koniec sekwencji"
 
 #: src/readelf.c:6107
-#, fuzzy, c-format
+#, c-format
 msgid "set address to %s\n"
-msgstr "ustawienie adresu na %#<PRIx64>\n"
+msgstr "ustawienie adresu na %s\n"
 
 #: src/readelf.c:6128
 #, c-format
@@ -5355,32 +5363,34 @@ msgstr ""
 "%s\n"
 
 #: src/readelf.c:6141
-#, fuzzy, c-format
+#, c-format
 msgid " set discriminator to %u\n"
-msgstr " ustawienie kolumny na %<PRIu64>\n"
+msgstr " ustawienie dyskryminatora na %u\n"
 
 #: src/readelf.c:6146
 msgid "unknown opcode"
-msgstr "nieznany kod instrukcji"
+msgstr "nieznana instrukcja"
 
 #: src/readelf.c:6158
 msgid " copy"
 msgstr " kopiowanie"
 
 #: src/readelf.c:6169
-#, fuzzy, c-format
+#, c-format
 msgid "advance address by %u to %s, op_index to %u\n"
-msgstr " zwiększenie adresu o %u do %#<PRIx64>\n"
+msgstr ""
+"zwiększenie adresu o %u do %s, op_index do %u\n"
+"\n"
 
 #: src/readelf.c:6173
-#, fuzzy, c-format
+#, c-format
 msgid "advance address by %u to %s\n"
-msgstr " zwiększenie adresu o %u do %#<PRIx64>\n"
+msgstr "zwiększenie adresu o %u do %s\n"
 
 #: src/readelf.c:6184
 #, c-format
 msgid " advance line by constant %d to %<PRId64>\n"
-msgstr " zwiększenie linii o stałą %d do %<PRId64>\n"
+msgstr " zwiększenie wiersza o stałą %d do %<PRId64>\n"
 
 #: src/readelf.c:6192
 #, c-format
@@ -5402,19 +5412,19 @@ msgid " set basic block flag"
 msgstr " ustawienie podstawowej flagi bloku"
 
 #: src/readelf.c:6224
-#, fuzzy, c-format
+#, c-format
 msgid "advance address by constant %u to %s, op_index to %u\n"
-msgstr " zwiększenie adresu o stałą %u do %#<PRIx64>\n"
+msgstr "zwiększenie adresu o stałą %u do %s, op_index do %u\n"
 
 #: src/readelf.c:6228
-#, fuzzy, c-format
+#, c-format
 msgid "advance address by constant %u to %s\n"
-msgstr " zwiększenie adresu o stałą %u do %#<PRIx64>\n"
+msgstr "zwiększenie adresu o stałą %u do %s\n"
 
 #: src/readelf.c:6246
-#, fuzzy, c-format
+#, c-format
 msgid "advance address by fixed value %u to %s\n"
-msgstr " zwiększenie adresu o stałą wartość %u do %#<PRIx64>\n"
+msgstr "zwiększenie adresu o stałą wartość %u do %s\n"
 
 #: src/readelf.c:6255
 msgid " set prologue end flag"
@@ -5425,9 +5435,9 @@ msgid " set epilogue begin flag"
 msgstr " ustawienie flagi poczÄ…tku epilogu"
 
 #: src/readelf.c:6269
-#, fuzzy, c-format
+#, c-format
 msgid " set isa to %u\n"
-msgstr " ustawienie pliku na %<PRIu64>\n"
+msgstr " ustawienie isa na %u\n"
 
 #: src/readelf.c:6278
 #, c-format
@@ -5445,17 +5455,16 @@ msgstr "nie można uzyskać zawartości .debug_log: %s"
 #: src/readelf.c:6379
 #, c-format
 msgid " [%6tx]  %s..%s"
-msgstr " [%6tx]  %s..%s"
+msgstr " [%6tx]  %s...%s"
 
 #: src/readelf.c:6381
 #, c-format
 msgid "           %s..%s"
-msgstr "           %s..%s"
+msgstr "           %s...%s"
 
 #: src/readelf.c:6388
-#, fuzzy
 msgid "   <INVALID DATA>\n"
-msgstr " [%6tx]  <NIEPRAWID�OWE DANE>\n"
+msgstr "   <NIEPRAWID�OWE DANE>\n"
 
 #: src/readelf.c:6440
 #, c-format
@@ -5465,7 +5474,7 @@ msgstr "nie można uzyskać danych sekcji informacji o makrach: %s"
 #: src/readelf.c:6519
 #, c-format
 msgid "%*s*** non-terminated string at end of section"
-msgstr "%*s*** niezakończony łańcuch na końcu sekcji"
+msgstr "%*s*** niezakończony ciąg na końcu sekcji"
 
 #: src/readelf.c:6587
 #, c-format
@@ -5473,15 +5482,15 @@ msgid " [%5d] DIE offset: %6<PRId64>, CU DIE offset: %6<PRId64>, name: %s\n"
 msgstr " [%5d] offset DIE: %6<PRId64>, offset CU DIE: %6<PRId64>, nazwa: %s\n"
 
 #: src/readelf.c:6626
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "DWARF section [%2zu] '%s' at offset %#<PRIx64>:\n"
 " %*s  String\n"
 msgstr ""
 "\n"
-"Sekcja DWARF \"%s\" pod offsetem %#<PRIx64>:\n"
-" %*s  �ańcuch\n"
+"Sekcja DWARF [%2zu] \"%s\" pod offsetem %#<PRIx64>:\n"
+" %*s  CiÄ…g\n"
 
 #: src/readelf.c:6640
 #, c-format
@@ -5494,6 +5503,8 @@ msgid ""
 "\n"
 "Call frame search table section [%2zu] '.eh_frame_hdr':\n"
 msgstr ""
+"\n"
+"Sekcja tabeli wyszukiwania ramki wywołania [%2zu] \".eh_frame_hdr\":\n"
 
 #: src/readelf.c:6762
 #, c-format
@@ -5501,27 +5512,31 @@ msgid ""
 "\n"
 "Exception handling table section [%2zu] '.gcc_except_table':\n"
 msgstr ""
+"\n"
+"Sekcja tabeli obsługiwania wyjątków [%2zu] \".gcc_except_table\":\n"
 
 #: src/readelf.c:6785
 #, c-format
 msgid " LPStart encoding:    %#x "
-msgstr ""
+msgstr " Kodowanie LPStart:    %#x "
 
 #: src/readelf.c:6797
 #, c-format
 msgid " TType encoding:      %#x "
-msgstr ""
+msgstr " Kodowanie TType:      %#x "
 
 #: src/readelf.c:6811
 #, c-format
 msgid " Call site encoding:  %#x "
-msgstr ""
+msgstr " Kodowanie strony wywołania:  %#x "
 
 #: src/readelf.c:6824
 msgid ""
 "\n"
 " Call site table:"
 msgstr ""
+"\n"
+" Tabela strony wywołania:"
 
 #: src/readelf.c:6838
 #, c-format
@@ -5531,21 +5546,25 @@ msgid ""
 "        Landing pad:       %#<PRIx64>\n"
 "        Action:            %u\n"
 msgstr ""
+" [%4u] Początek strony wywołania: %#<PRIx64>\n"
+"        Długość strony wywołania:  %<PRIu64>\n"
+"        LÄ…dowisko:                 %#<PRIx64>\n"
+"        Działanie:                 %u\n"
 
 #: src/readelf.c:6898
-#, fuzzy, c-format
+#, c-format
 msgid "invalid TType encoding"
-msgstr "błędny indeks linii"
+msgstr "nieprawidłowe kodowanie TType"
 
 #: src/readelf.c:6923
 #, c-format
 msgid "cannot get debug context descriptor: %s"
-msgstr "nie można uzyskać deskryptora kontekstu debugowego: %s"
+msgstr "nie można uzyskać deskryptora kontekstu debugowania: %s"
 
 #: src/readelf.c:7065 src/readelf.c:7666
-#, fuzzy, c-format
+#, c-format
 msgid "cannot convert core note data: %s"
-msgstr "nie można uzyskać zawartości sekcji notatki: %s"
+msgstr "nie można przekonwertować danych notatki core: %s"
 
 #: src/readelf.c:7406
 #, c-format
@@ -5554,7 +5573,7 @@ msgid ""
 "%*s... <repeats %u more times> ..."
 msgstr ""
 "\n"
-"%*s... <powtarza siÄ™ jeszcze %u razy> ..."
+"%*s... <powtarza siÄ™ jeszcze %u razy>..."
 
 #: src/readelf.c:7765
 msgid "  Owner          Data size  Type\n"
@@ -5571,29 +5590,32 @@ msgid "cannot get content of note section: %s"
 msgstr "nie można uzyskać zawartości sekcji notatki: %s"
 
 #: src/readelf.c:7844
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Note section [%2zu] '%s' of %<PRIu64> bytes at offset %#0<PRIx64>:\n"
 msgstr ""
 "\n"
-"Segment notatki o długości %<PRId64> bajtów pod offsetem %#0<PRIx64>:\n"
+"Segment notatki [%2zu] \"%s\" o długości %<PRIu64> bajtów pod offsetem "
+"%#0<PRIx64>:\n"
 
 #: src/readelf.c:7867
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Note segment of %<PRIu64> bytes at offset %#0<PRIx64>:\n"
 msgstr ""
 "\n"
-"Segment notatki o długości %<PRId64> bajtów pod offsetem %#0<PRIx64>:\n"
+"Segment notatki o długości %<PRIu64> bajtów pod offsetem %#0<PRIx64>:\n"
 
 #: src/readelf.c:7913
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Section [%Zu] '%s' has no data to dump.\n"
-msgstr "sekcja [%2zu] \"%s\" posiada nieobsługiwany typ %d\n"
+msgstr ""
+"\n"
+"Sekcja [%Zu] \"%s\" nie posiada danych do zrzucenia.\n"
 
 #: src/readelf.c:7919 src/readelf.c:7942
 #, c-format
@@ -5601,29 +5623,33 @@ msgid "cannot get data for section [%Zu] '%s': %s"
 msgstr "nie można uzyskać danych dla sekcji [%Zu] \"%s\": %s"
 
 #: src/readelf.c:7923
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Hex dump of section [%Zu] '%s', %<PRIu64> bytes at offset %#0<PRIx64>:\n"
 msgstr ""
 "\n"
-"Segment notatki o długości %<PRId64> bajtów pod offsetem %#0<PRIx64>:\n"
+"Segment zrzutu szesnastkowego [%Zu] \"%s\", %<PRIu64> bajtów pod offsetem "
+"%#0<PRIx64>:\n"
 
 #: src/readelf.c:7936
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Section [%Zu] '%s' has no strings to dump.\n"
-msgstr "sekcja [%2zu] \"%s\" posiada nieobsługiwany typ %d\n"
+msgstr ""
+"\n"
+"Sekcja [%Zu] \"%s\" nie posiada ciągów do zrzucenia.\n"
 
 #: src/readelf.c:7946
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "String section [%Zu] '%s' contains %<PRIu64> bytes at offset %#0<PRIx64>:\n"
 msgstr ""
 "\n"
-"Segment notatki o długości %<PRId64> bajtów pod offsetem %#0<PRIx64>:\n"
+"Sekcja ciągów [%Zu] \"%s\" zawiera %<PRIu64> bajtów pod offsetem "
+"%#0<PRIx64>:\n"
 
 #: src/readelf.c:7994
 #, c-format
@@ -5644,9 +5670,9 @@ msgstr ""
 "sekcja \"%s\" nie istnieje"
 
 #: src/readelf.c:8080
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get symbol index of archive '%s': %s"
-msgstr "nie można uzyskać symbolu w \"%s\": %s"
+msgstr "nie można uzyskać indeksu symboli archiwum \"%s\": %s"
 
 #: src/readelf.c:8083
 #, c-format
@@ -5654,6 +5680,8 @@ msgid ""
 "\n"
 "Archive '%s' has no symbol index\n"
 msgstr ""
+"\n"
+"Archiwum \"%s\" nie posiada indeksu symboli\n"
 
 #: src/readelf.c:8087
 #, c-format
@@ -5661,11 +5689,13 @@ msgid ""
 "\n"
 "Index of archive '%s' has %Zu entries:\n"
 msgstr ""
+"\n"
+"Indeks archiwum \"%s\" posiada %Zu wpisów:\n"
 
 #: src/readelf.c:8105
-#, fuzzy, c-format
+#, c-format
 msgid "cannot extract member at offset %Zu in '%s': %s"
-msgstr "nie można uzyskać zawartości sekcji %zu w \"%s\": %s"
+msgstr "nie można wydobyć elementów pod offsetem %Zu w \"%s\": %s"
 
 #: src/readelf.c:8110
 #, c-format
@@ -5677,59 +5707,59 @@ msgid ""
 "Use the output format FORMAT.  FORMAT can be `bsd' or `sysv'.  The default "
 "is `bsd'"
 msgstr ""
-"Użycie tego FORMATU wyjścia. Może to być `bsd' lub `sysv'. Domyślny jest "
-"`bsd'"
+"Używa FORMATU wyjścia. Może to być \"bsd\" lub \"sysv\". Domyślny jest \"bsd"
+"\""
 
 #: src/size.c:70
 msgid "Same as `--format=sysv'"
-msgstr "To samo, co `--format=sysv'"
+msgstr "To samo, co \"--format=sysv\""
 
 #: src/size.c:71
 msgid "Same as `--format=bsd'"
-msgstr "To samo, co `--format=bsd'"
+msgstr "To samo, co \"--format=bsd\""
 
 #: src/size.c:74
 msgid "Same as `--radix=10'"
-msgstr "To samo, co `--radix=10'"
+msgstr "To samo, co \"--radix=10\""
 
 #: src/size.c:75
 msgid "Same as `--radix=8'"
-msgstr "To samo, co `--radix=8'"
+msgstr "To samo, co \"--radix=8\""
 
 #: src/size.c:76
 msgid "Same as `--radix=16'"
-msgstr "To samo, co `--radix=16'"
+msgstr "To samo, co \"--radix=16\""
 
 #: src/size.c:78
 msgid "Similar to `--format=sysv' output but in one line"
-msgstr "Podobnie do wyjścia `--format=sysv', ale w jednej linii"
+msgstr "Podobne do wyjścia \"--format=sysv\", ale w jednym wierszu"
 
 #: src/size.c:82
 msgid "Print size and permission flags for loadable segments"
-msgstr "Wypisanie rozmiaru i flag uprawnień dla segmentów ładowalnych"
+msgstr "Wyświetla rozmiar i flagi uprawnień dla segmentów wczytywalnych"
 
 #: src/size.c:83
 msgid "Display the total sizes (bsd only)"
-msgstr "Wyświetlenie całkowitych rozmiarów (tylko bsd)"
+msgstr "Wyświetla całkowite rozmiary (tylko bsd)"
 
 #: src/size.c:88
 msgid "List section sizes of FILEs (a.out by default)."
-msgstr "Podanie rozmiarów sekcji PLIKU (domyślnie a.out)."
+msgstr "Wyświetla listę rozmiarów sekcji PLIKU (domyślnie a.out)."
 
 #: src/size.c:269
 #, c-format
 msgid "Invalid format: %s"
-msgstr "Błędny format: %s"
+msgstr "Nieprawidłowy format: %s"
 
 #: src/size.c:280
 #, c-format
 msgid "Invalid radix: %s"
-msgstr "Błędna baza: %s"
+msgstr "Nieprawidłowa baza: %s"
 
 #: src/size.c:339
 #, c-format
 msgid "%s: file format not recognized"
-msgstr "%s: format pliku nie rozpoznany"
+msgstr "%s: nie rozpoznano formatu pliku"
 
 #: src/size.c:446 src/size.c:589
 #, c-format
@@ -5746,28 +5776,28 @@ msgstr "Wybór wyjścia:"
 
 #: src/strings.c:71
 msgid "Scan entire file, not only loaded sections"
-msgstr "Przeszukanie całego pliku, nie tylko sekcji ładowalnych"
+msgstr "Przeszukuje cały plik, nie tylko wczytane sekcje"
 
 #: src/strings.c:73
 msgid "Only NUL-terminated sequences of MIN-LEN characters or more are printed"
 msgstr ""
-"Wypisywane są tylko zakończone NUL sekwencje o MIN-LEN lub więcej znaków"
+"Wyświetlane są tylko zakończone NUL sekwencje o MIN-LEN lub więcej znaków"
 
 #: src/strings.c:74
 msgid ""
 "Select character size and endianess: s = 7-bit, S = 8-bit, {b,l} = 16-bit, "
 "{B,L} = 32-bit"
 msgstr ""
-"Wybór rozmiaru i kolejności znaków: s = 7-bit, S = 8-bit, {b,l} = 16-bit, {B,"
-"L} = 32-bit"
+"Wybór rozmiaru i kolejności znaków: s = 7 bitów, S = 8 bitów, {b,l} = 16 "
+"bitów, {B,L} = 32 bity"
 
 #: src/strings.c:78
 msgid "Print name of the file before each string."
-msgstr "Wypisanie nazwy pliku przed każdym łańcuchem."
+msgstr "Wyświetla nazwę pliku przed każdym ciągiem."
 
 #: src/strings.c:80
 msgid "Print location of the string in base 8, 10, or 16 respectively."
-msgstr "Wypisanie położenia łańcucha z podstawą odpowiednio 8, 10 lub 16."
+msgstr "Wyświetla położenie ciągu z podstawą odpowiednio 8, 10 lub 16."
 
 #: src/strings.c:81
 msgid "Alias for --radix=o"
@@ -5775,17 +5805,17 @@ msgstr "Alias dla --radix=o"
 
 #: src/strings.c:88
 msgid "Print the strings of printable characters in files."
-msgstr "Wypisanie łańcuchów znaków drukowalnych w plikach."
+msgstr "Wyświetla ciągi znaków drukowalnych w plikach."
 
 #: src/strings.c:268 src/strings.c:303
 #, c-format
 msgid "invalid value '%s' for %s parameter"
-msgstr "błędna wartość \"%s\" dla parametru %s"
+msgstr "nieprawidłowa wartość \"%s\" dla parametru %s"
 
 #: src/strings.c:314
 #, c-format
 msgid "invalid minimum length of matched string size"
-msgstr "błędna minimalna długość dopasowanego rozmiaru łańcucha"
+msgstr "nieprawidłowa minimalna długość dopasowanego rozmiaru ciągu"
 
 #: src/strings.c:599
 #, c-format
@@ -5802,201 +5832,210 @@ msgstr "ponowne mmap nie powiodło się"
 msgid "mprotect failed"
 msgstr "mprotect nie powiodło się"
 
-#: src/strip.c:74
+#: src/strip.c:75
 msgid "Place stripped output into FILE"
-msgstr "Umieszczenie okrojonego wyjścia w PLIKU"
+msgstr "Umieszcza okrojone wyjście w PLIKU"
 
-#: src/strip.c:75
+#: src/strip.c:76
 msgid "Extract the removed sections into FILE"
-msgstr "Wyciągnięcie usuwanych sekcji do PLIKU"
+msgstr "Wydobywa usunięte sekcje do PLIKU"
 
-#: src/strip.c:76
+#: src/strip.c:77
 msgid "Embed name FILE instead of -f argument"
-msgstr "Osadzenie nazwy PLIK zamiast argumentu -f"
+msgstr "Osadza nazwÄ™ PLIKU zamiast parametru -f"
 
-#: src/strip.c:80
+#: src/strip.c:81
 msgid "Remove all debugging symbols"
-msgstr "Usunięcie wszystkich symboli debugowych"
+msgstr "Usuwa wszystkie symbole debugowania"
+
+#: src/strip.c:85
+msgid "Remove section headers (not recommended)"
+msgstr "Usuwa nagłówki sekcji (niezalecane)"
 
-#: src/strip.c:84
+#: src/strip.c:87
 msgid "Copy modified/access timestamps to the output"
-msgstr "Skopiowanie czasów modyfikacji/dostępu do wyjścia"
+msgstr "Kopiuje czasy modyfikacji/dostępu do wyjścia"
 
-#: src/strip.c:86
+#: src/strip.c:89
 msgid "Remove .comment section"
-msgstr "Usunięcie sekcji .comment"
+msgstr "Usuwa sekcjÄ™ .comment"
 
-#: src/strip.c:89
+#: src/strip.c:92
 msgid "Relax a few rules to handle slightly broken ELF files"
-msgstr "Złagodzenie kilku reguł aby obsłużyć lekko uszkodzone pliki ELF"
+msgstr "�agodzi kilka reguł, aby obsłużyć lekko uszkodzone pliki ELF"
 
-#: src/strip.c:94
+#: src/strip.c:97
 msgid "Discard symbols from object files."
-msgstr "Odrzucenie symboli z plików obiektów."
+msgstr "Odrzuca symbole z plików obiektów."
 
-#: src/strip.c:186
+#: src/strip.c:192
 #, c-format
 msgid "Only one input file allowed together with '-o' and '-f'"
-msgstr "Tylko jeden plik wejściowy jest dozwolony z '-o' i '-f'"
+msgstr "Tylko jeden plik wejściowy jest dozwolony z \"-o\" i \"-f\""
 
-#: src/strip.c:222
+#: src/strip.c:228
 #, c-format
 msgid "-f option specified twice"
-msgstr "opcjÄ™ -f podano dwukrotnie"
+msgstr "OpcjÄ™ -f podano dwukrotnie"
 
-#: src/strip.c:231
+#: src/strip.c:237
 #, c-format
 msgid "-F option specified twice"
-msgstr "opcjÄ™ -F podano dwukrotnie"
+msgstr "OpcjÄ™ -F podano dwukrotnie"
 
-#: src/strip.c:240 src/unstrip.c:125
+#: src/strip.c:246 src/unstrip.c:125
 #, c-format
 msgid "-o option specified twice"
-msgstr "opcjÄ™ -o podano dwukrotnie"
+msgstr "OpcjÄ™ -o podano dwukrotnie"
 
-#: src/strip.c:260
+#: src/strip.c:266
 #, c-format
 msgid "-R option supports only .comment section"
 msgstr "Opcja -R obsługuje tylko sekcję .comment"
 
-#: src/strip.c:298 src/strip.c:322
+#: src/strip.c:308 src/strip.c:332
 #, c-format
 msgid "cannot stat input file '%s'"
 msgstr "nie można wykonać stat na pliku wejściowym \"%s\""
 
-#: src/strip.c:312
+#: src/strip.c:322
 #, c-format
 msgid "while opening '%s'"
 msgstr "podczas otwierania \"%s\""
 
-#: src/strip.c:350
+#: src/strip.c:360
 #, c-format
 msgid "%s: cannot use -o or -f when stripping archive"
-msgstr "%s: nie można używać -o ani -f przy okrajaniu archiwum"
+msgstr "%s: nie można używać -o lub -f podczas okrajania archiwum"
 
-#: src/strip.c:448
+#: src/strip.c:458
 #, c-format
 msgid "cannot open EBL backend"
 msgstr "nie można otworzyć zaplecza EBL"
 
-#: src/strip.c:498 src/strip.c:522
+#: src/strip.c:508 src/strip.c:532
 #, c-format
 msgid "cannot create new file '%s': %s"
 msgstr "nie można utworzyć nowego pliku \"%s\": %s"
 
-#: src/strip.c:582
+#: src/strip.c:592
 #, c-format
 msgid "illformed file '%s'"
 msgstr "plik \"%s\" posiada błędny format"
 
-#: src/strip.c:869 src/strip.c:956
+#: src/strip.c:880 src/strip.c:967
 #, c-format
 msgid "while generating output file: %s"
-msgstr "podczas generowania pliku wyjściowego: %s"
+msgstr "podczas tworzenia pliku wyjściowego: %s"
 
-#: src/strip.c:929 src/strip.c:1668
+#: src/strip.c:940 src/strip.c:1683
 #, c-format
 msgid "%s: error while creating ELF header: %s"
 msgstr "%s: błąd podczas tworzenia nagłówka ELF: %s"
 
-#: src/strip.c:943
+#: src/strip.c:954
 #, c-format
 msgid "while preparing output for '%s'"
 msgstr "podczas przygotowywania wyjścia dla \"%s\""
 
-#: src/strip.c:994 src/strip.c:1050
+#: src/strip.c:1005 src/strip.c:1061
 #, c-format
 msgid "while create section header section: %s"
 msgstr "podczas tworzenia sekcji nagłówka sekcji: %s"
 
-#: src/strip.c:1000
+#: src/strip.c:1011
 #, c-format
 msgid "cannot allocate section data: %s"
 msgstr "nie można przydzielić danych sekcji: %s"
 
-#: src/strip.c:1059
+#: src/strip.c:1070
 #, c-format
 msgid "while create section header string table: %s"
-msgstr "podczas tworzenia tabeli łańcuchów nagłówka sekcji: %s"
+msgstr "podczas tworzenia tabeli ciągów nagłówka sekcji: %s"
 
-#: src/strip.c:1593 src/strip.c:1690
+#: src/strip.c:1595 src/strip.c:1705
 #, c-format
 msgid "while writing '%s': %s"
 msgstr "podczas zapisywania \"%s\": %s"
 
-#: src/strip.c:1604
+#: src/strip.c:1606
 #, c-format
 msgid "while creating '%s'"
 msgstr "podczas tworzenia \"%s\""
 
-#: src/strip.c:1616
+#: src/strip.c:1628
 #, c-format
 msgid "while computing checksum for debug information"
-msgstr "podczas obliczania sumy kontrolnej dla informacji debugowych"
+msgstr "podczas obliczania sumy kontrolnej dla informacji debugowania"
 
-#: src/strip.c:1676
+#: src/strip.c:1691
 #, c-format
 msgid "%s: error while reading the file: %s"
-msgstr "%s: błąd podczas odczytu pliku: %s"
+msgstr "%s: błąd podczas odczytywania pliku: %s"
 
-#: src/strip.c:1722 src/strip.c:1729
+#: src/strip.c:1730 src/strip.c:1750
+#, c-format
+msgid "while writing '%s'"
+msgstr "podczas zapisywania \"%s\""
+
+#: src/strip.c:1784 src/strip.c:1791
 #, c-format
 msgid "error while finishing '%s': %s"
 msgstr "błąd podczas kończenia \"%s\": %s"
 
-#: src/strip.c:1752 src/strip.c:1809
+#: src/strip.c:1814 src/strip.c:1871
 #, c-format
 msgid "cannot set access and modification date of '%s'"
 msgstr "nie można ustawić czasu dostępu i modyfikacji \"%s\""
 
 #: src/unstrip.c:78
 msgid "Match MODULE against file names, not module names"
-msgstr ""
+msgstr "Dopasowuje MODU�Y do nazw plików, a nie nazwy modułów"
 
 #: src/unstrip.c:79
 msgid "Silently skip unfindable files"
-msgstr ""
+msgstr "Pomija nieodnalezione pliki bez zgłaszania tego"
 
 #: src/unstrip.c:82
-#, fuzzy
 msgid "Place output into FILE"
-msgstr "Umieszczenie wyjścia w PLIKU."
+msgstr "Umieszcza wyjście w PLIKU"
 
 #: src/unstrip.c:84
 msgid "Create multiple output files under DIRECTORY"
-msgstr ""
+msgstr "Tworzy wiele plików wyjściowych w KATALOGU"
 
 #: src/unstrip.c:85
 msgid "Use module rather than file names"
-msgstr ""
+msgstr "Używa nazw modułów zamiast nazw plików"
 
 #: src/unstrip.c:87
-#, fuzzy
 msgid "Create output for modules that have no separate debug information"
-msgstr "Wybranie pobrania informacji debugowych parsera"
+msgstr ""
+"Tworzy wyjście dla modułów nieposiadających oddzielnych informacji "
+"debugowania"
 
 #: src/unstrip.c:90
 msgid "Apply relocations to section contents in ET_REL files"
-msgstr ""
+msgstr "Zastosowuje relokacje do zawartości sekcji w plikach ET_REL"
 
 #: src/unstrip.c:92
 msgid "Only list module and file names, build IDs"
-msgstr ""
+msgstr "Wyświetla tylko nazwy modułów i plików, identyfikatory budowania"
 
 #: src/unstrip.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "-d option specified twice"
-msgstr "opcjÄ™ -f podano dwukrotnie"
+msgstr "opcjÄ™ -d podano dwukrotnie"
 
 #: src/unstrip.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "only one of -o or -d allowed"
-msgstr "dopuszczalna jest tylko jedna z opcji -G i -r"
+msgstr "dozwolona jest tylko jedna z opcji -o lub -d"
 
 #: src/unstrip.c:175
 #, c-format
 msgid "-n cannot be used with explicit files or -o or -d"
-msgstr ""
+msgstr "opcja -n nie może być używana z jawnymi plikami albo z opcją -o lub -d"
 
 #: src/unstrip.c:190
 #, c-format
@@ -6011,138 +6050,140 @@ msgstr "wymagane są dokładnie dwa parametry plików"
 #: src/unstrip.c:205
 #, c-format
 msgid "-m, -a, -R, and -i options not allowed with explicit files"
-msgstr ""
+msgstr "opcje -m, -a, -R oraz -i nie sÄ… dozwolone z jawnymi plikami"
 
 #: src/unstrip.c:218
 #, c-format
 msgid "-o or -d is required when using implicit files"
-msgstr ""
+msgstr "opcja -o lub -d jest wymagana podczas używania ukrytych plików"
 
 #: src/unstrip.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create ELF header: %s"
-msgstr "nie można odczytać nagłówka ELF: %s"
+msgstr "nie można utworzyć nagłówka ELF: %s"
 
 #: src/unstrip.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "cannot copy ELF header: %s"
-msgstr "nie można uaktualnić nagłówka ELF: %s"
+msgstr "nie można skopiować nagłówka ELF: %s"
 
 #: src/unstrip.c:264 src/unstrip.c:1830
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create program headers: %s"
-msgstr "nie można utworzyć nagłówka programu: %s"
+msgstr "nie można utworzyć nagłówków programu: %s"
 
 #: src/unstrip.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "cannot copy program header: %s"
-msgstr "nie można uzyskać nagłówka programu: %s"
+msgstr "nie można skopiować nagłówka programu: %s"
 
 #: src/unstrip.c:280
-#, fuzzy, c-format
+#, c-format
 msgid "cannot copy section header: %s"
-msgstr "nie można uzyskać nagłówka sekcji: %s"
+msgstr "nie można skopiować nagłówka sekcji: %s"
 
 #: src/unstrip.c:283 src/unstrip.c:1511
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get section data: %s"
-msgstr "nie można uzyskać sekcji: %s"
+msgstr "nie można uzyskać danych sekcji: %s"
 
 #: src/unstrip.c:285 src/unstrip.c:1513
-#, fuzzy, c-format
+#, c-format
 msgid "cannot copy section data: %s"
-msgstr "nie można przydzielić danych sekcji: %s"
+msgstr "nie można skopiować danych sekcji: %s"
 
 #: src/unstrip.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create directory '%s'"
-msgstr "nie można utworzyć deskryptora EBL dla \"%s\""
+msgstr "nie można utworzyć katalogu \"%s\""
 
 #: src/unstrip.c:349 src/unstrip.c:766 src/unstrip.c:1545
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get symbol table entry: %s"
-msgstr "nie można uzyskać sekcji tabeli symboli %zu w \"%s\": %s"
+msgstr "nie można uzyskać wpisu tabeli symboli: %s"
 
 #: src/unstrip.c:365 src/unstrip.c:583 src/unstrip.c:604 src/unstrip.c:616
 #: src/unstrip.c:1566 src/unstrip.c:1696 src/unstrip.c:1720
-#, fuzzy, c-format
+#, c-format
 msgid "cannot update symbol table: %s"
-msgstr "nie można uaktualnić nagłówka ELF: %s"
+msgstr "nie można zaktualizować tabeli symboli: %s"
 
 #: src/unstrip.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "cannot update section header: %s"
-msgstr "nie można uzyskać nagłówka sekcji: %s"
+msgstr "nie można zaktualizować nagłówka sekcji: %s"
 
 #: src/unstrip.c:414 src/unstrip.c:425
-#, fuzzy, c-format
+#, c-format
 msgid "cannot update relocation: %s"
-msgstr "nie można uzyskać relokacji: %s"
+msgstr "nie można zaktualizować relokacji: %s"
 
 #: src/unstrip.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get symbol version: %s"
-msgstr "nie można uzyskać symbolu w \"%s\": %s"
+msgstr "nie można uzyskać wersji symbolu: %s"
 
 #: src/unstrip.c:524
 #, c-format
 msgid "unexpected section type in [%Zu] with sh_link to symtab"
-msgstr ""
+msgstr "nieoczekiwany typ sekcji w [%Zu] z sh_link do tabeli symboli"
 
 #: src/unstrip.c:772
-#, fuzzy, c-format
+#, c-format
 msgid "invalid string offset in symbol [%Zu]"
-msgstr "błędny offset %zu dla symbolu %s"
+msgstr "nieprawidłowy offset ciągu w symbolu [%Zu]"
 
 #: src/unstrip.c:914 src/unstrip.c:1254
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read section [%Zu] name: %s"
-msgstr "nie można uzyskać nagłówka sekcji: %s"
+msgstr "nie można odczytać nazwy sekcji [%Zu]: %s"
 
 #: src/unstrip.c:955 src/unstrip.c:974 src/unstrip.c:1007
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read '.gnu.prelink_undo' section: %s"
-msgstr "nie można odczytać sekcji dynamicznej: %s"
+msgstr "nie można odczytać sekcji \".gnu.prelink_undo\": %s"
 
 #: src/unstrip.c:995
-#, fuzzy, c-format
+#, c-format
 msgid "invalid contents in '%s' section"
-msgstr "błędna sekcja .debug_line"
+msgstr "nieprawidłowa zawartość w sekcji \"%s\""
 
 #: src/unstrip.c:1050 src/unstrip.c:1376
-#, fuzzy, c-format
+#, c-format
 msgid "cannot find matching section for [%Zu] '%s'"
-msgstr "błędne dane w sekcji [%zu] \"%s\""
+msgstr "nie można odnaleźć pasującej sekcji dla [%Zu] \"%s\""
 
 #: src/unstrip.c:1174 src/unstrip.c:1189 src/unstrip.c:1457
-#, fuzzy, c-format
+#, c-format
 msgid "cannot add section name to string table: %s"
-msgstr "nie można uzyskać indeksu tabeli łańcuchów nagłówków sekcji"
+msgstr "nie można nazwy sekcji do tabeli ciągów: %s"
 
 #: src/unstrip.c:1198
-#, fuzzy, c-format
+#, c-format
 msgid "cannot update section header string table data: %s"
-msgstr "%s: nie można uzyskać indeksu tabeli łańcuchów nagłówków sekcji: %s\n"
+msgstr "nie można zaktualizować danych tabeli ciągów nagłówków sekcji: %s"
 
 #: src/unstrip.c:1225 src/unstrip.c:1229
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get section header string table section index: %s"
-msgstr "%s: nie można uzyskać indeksu tabeli łańcuchów nagłówków sekcji: %s\n"
+msgstr "nie można uzyskać indeksu sekcji tabeli ciągów nagłówków sekcji: %s"
 
 #: src/unstrip.c:1233 src/unstrip.c:1237 src/unstrip.c:1472
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get section count: %s"
-msgstr "nie można uzyskać sekcji: %s"
+msgstr "nie można uzyskać licznika sekcji: %s"
 
 #: src/unstrip.c:1240
 #, c-format
 msgid "more sections in stripped file than debug file -- arguments reversed?"
 msgstr ""
+"więcej sekcji w okrojonym pliku niż w pliku debugowania - odwrócono "
+"parametry?"
 
 #: src/unstrip.c:1299 src/unstrip.c:1391
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read section header string table: %s"
-msgstr "nie można uzyskać indeksu tabeli łańcuchów nagłówków sekcji"
+msgstr "nie można odczytać tabeli ciągów nagłówków sekcji: %s"
 
 #: src/unstrip.c:1451
 #, c-format
@@ -6150,9 +6191,9 @@ msgid "cannot add new section: %s"
 msgstr "nie można dodać nowej sekcji: %s"
 
 #: src/unstrip.c:1553
-#, fuzzy, c-format
+#, c-format
 msgid "symbol [%Zu] has invalid section index"
-msgstr "sekcja [%2d] \"%s\": symbol %zu: błędny indeks sekcji\n"
+msgstr "symbol [%Zu] posiada nieprawidłowy indeks sekcji"
 
 #: src/unstrip.c:1791
 #, c-format
@@ -6178,12 +6219,16 @@ msgstr "nie można zapisać pliku wyjściowego: %s"
 #, c-format
 msgid "DWARF data not adjusted for prelinking bias; consider prelink -u"
 msgstr ""
+"Dane DWARF nie zostały dostosowane do przesunięcia wczesnego konsolidowania; "
+"proszę rozważyć polecenie prelink -u"
 
 #: src/unstrip.c:1896
 #, c-format
 msgid ""
 "DWARF data in '%s' not adjusted for prelinking bias; consider prelink -u"
 msgstr ""
+"Dane DWARF w \"%s\" nie zostały dostosowane do przesunięcia wczesnego "
+"konsolidowania; proszę rozważyć polecenie prelink -u"
 
 #: src/unstrip.c:1915 src/unstrip.c:1955 src/unstrip.c:1967 src/unstrip.c:2047
 #, c-format
@@ -6196,34 +6241,35 @@ msgid "'%s' and '%s' do not seem to match"
 msgstr "\"%s\" i \"%s\" nie zgadzajÄ… siÄ™"
 
 #: src/unstrip.c:2004
-#, fuzzy, c-format
+#, c-format
 msgid "cannot find stripped file for module '%s': %s"
-msgstr "nie można utworzyć nowego pliku \"%s\": %s"
+msgstr "nie można odnaleźć okrojonego pliku dla modułu \"%s\": %s"
 
 #: src/unstrip.c:2008
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open stripped file '%s' for module '%s': %s"
-msgstr "nie można utworzyć nowego pliku \"%s\": %s"
+msgstr "nie można otworzyć okrojonego pliku \"%s\" dla modułu \"%s\": %s"
 
 #: src/unstrip.c:2023
-#, fuzzy, c-format
+#, c-format
 msgid "cannot find debug file for module '%s': %s"
-msgstr "nie można utworzyć nowego pliku \"%s\": %s"
+msgstr "nie można odnaleźć pliku debugowania dla modułu \"%s\": %s"
 
 #: src/unstrip.c:2027
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open debug file '%s' for module '%s': %s"
-msgstr "nie można utworzyć nowego pliku \"%s\": %s"
+msgstr "nie można otworzyć pliku debugowania \"%s\" dla modułu \"%s\": %s"
 
 #: src/unstrip.c:2040
-#, fuzzy, c-format
+#, c-format
 msgid "module '%s' file '%s' is not stripped"
-msgstr "plik wejściowy \"%s\" zignorowany"
+msgstr "moduł \"%s\" pliku \"%s\" nie został okrojony"
 
 #: src/unstrip.c:2071
-#, fuzzy, c-format
+#, c-format
 msgid "cannot cache section addresses for module '%s': %s"
-msgstr "nie można uzyskać nagłówka sekcji dla sekcji [%2zu] \"%s\": %s\n"
+msgstr ""
+"nie można utworzyć pamięci podręcznej adresów sekcji dla modułu \"%s\": %s"
 
 #: src/unstrip.c:2204
 #, c-format
@@ -6240,6 +6286,8 @@ msgid ""
 "STRIPPED-FILE DEBUG-FILE\n"
 "[MODULE...]"
 msgstr ""
+"OKROJONY-PLIK PLIK-DEBUGOWANIA\n"
+"[MODU�...]"
 
 #: src/unstrip.c:2261
 msgid ""
@@ -6267,3 +6315,30 @@ msgid ""
 "file.  DEBUGFILE is the separate debuginfo file name, or - if no debuginfo "
 "was found, or . if FILE contains the debug information."
 msgstr ""
+"�ączy okrojone pliki z oddzielnymi symbolami i informacjami debugowania."
+"\vPierwsza forma umieszcza wynik w PLIKU-DEBUGOWANIA, jeśli nie podano opcji "
+"-o.\n"
+"\n"
+"Parametr MODU� podaje wzorce nazw plików dopasowujące moduły do procesów.\n"
+"Za pomocą opcji -f dopasowuje nazwę głównego (okrojonego) pliku (ukośniki "
+"nigdy nie są specjalne), w innym przypadku dopasowują proste nazwy modułów. "
+"Jeśli nie podano parametrów, przetwarza wszystkie odnalezione moduły.\n"
+"\n"
+"Wiele modułów zostaje zapisanych do plików w KATALOGU-WYJŚCIOWYM, tworząc "
+"podkatalogi, jeśli są wymagane. Używając opcji -m te pliki posiadają proste "
+"nazwy modułów, w innym przypadku posiadają nazwy głównego pliku uzupełnione "
+"katalogiem w KATALOGU-WYJÅšCIOWYM.\n"
+"\n"
+"Używając opcji -n żadne pliki nie zostają zapisane, a jeden wiersz do "
+"standardowego wyjścia dla każdego modułu:\n"
+"\tPOCZÄ„TEK+ROZMIAR IDENTYFIKATOR-BUDOWANIA PLIK PLIK-DEBUGOWANIA NAZWA-"
+"MODU�U\n"
+"POCZĄTEK i ROZMIAR są liczbami szesnastkowymi podającymi zakres adresów "
+"modułu. IDENTYFIKATOR-BUDOWANIA jest liczbą szesnastkową dla bitów "
+"identyfikatora budowania lub \"-\", jeśli identyfikator jest nieznany; "
+"liczba szesnastkowa może być uzupełniona @0xADRES podającym adres, gdzie "
+"znajduje się identyfikator, jeśli jest to wiadome. PLIK jest nazwą pliku "
+"odnalezionego dla modułu lub \"-\", jeśli go nie odnaleziono lub \".\", "
+"jeśli obraz ELF jest dostępny, ale nie z żadnego nazwanego pliku. PLIK-"
+"DEBUGOWANIA jest nazwą oddzielnego pliku debuginfo lub \"-\", jeśli nie "
+"odnaleziono debuginfo lub \".\", jeśli PLIK zawiera informacje debugowania."
diff --git a/elfutils/po/uk.gmo b/elfutils/po/uk.gmo
index e424136e..8276ec3d 100644
--- a/elfutils/po/uk.gmo
+++ b/elfutils/po/uk.gmo
diff --git a/elfutils/po/uk.po b/elfutils/po/uk.po
index f286f3da..8b5cd615 100644
--- a/elfutils/po/uk.po
+++ b/elfutils/po/uk.po
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Yuri Chornoivan <yurchor@ukr.net>, 2010.
+# Yuri Chornoivan <yurchor@ukr.net>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n"
-"POT-Creation-Date: 2010-09-13 09:45-0700\n"
-"PO-Revision-Date: 2010-09-01 10:00+0300\n"
+"POT-Creation-Date: 2011-01-12 17:51-0500\n"
+"PO-Revision-Date: 2011-01-08 09:47+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
 "Language: uk\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.2\n"
 
 #: lib/xmalloc.c:51 lib/xmalloc.c:65 lib/xmalloc.c:79 src/readelf.c:2829
 #: src/readelf.c:3168 src/unstrip.c:2100 src/unstrip.c:2308
@@ -358,6 +358,11 @@ msgstr "не вдало�� обробити опи� типу DWARF"
 msgid "ELF file does not match build ID"
 msgstr "Файл ELF не відповідає ідентифікатору збиранн�"
 
+#: libdwfl/libdwflP.h:98
+#, fuzzy
+msgid "corrupt .gnu.prelink_undo section data"
+msgstr "не вдало�� прочитати розділ «.gnu.prelink_undo»: %s"
+
 #: libebl/eblbackendname.c:63
 msgid "No backend"
 msgstr "�емає �ервера"
@@ -588,7 +593,7 @@ msgstr "[�ДРЕС�...]"
 #: src/addr2line.c:189 src/ar.c:289 src/elfcmp.c:555 src/elflint.c:239
 #: src/findtextrel.c:170 src/ld.c:957 src/nm.c:253 src/objdump.c:181
 #: src/ranlib.c:136 src/readelf.c:456 src/size.c:219 src/strings.c:227
-#: src/strip.c:204 src/unstrip.c:234
+#: src/strip.c:210 src/unstrip.c:234
 #, c-format
 msgid ""
 "Copyright (C) %s Red Hat, Inc.\n"
@@ -603,7 +608,7 @@ msgstr ""
 #: src/addr2line.c:194 src/ar.c:294 src/elfcmp.c:560 src/elflint.c:244
 #: src/findtextrel.c:175 src/ld.c:962 src/nm.c:258 src/objdump.c:186
 #: src/ranlib.c:141 src/readelf.c:461 src/size.c:224 src/strings.c:232
-#: src/strip.c:209 src/unstrip.c:239
+#: src/strip.c:215 src/unstrip.c:239
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�втор — %s.\n"
@@ -1013,7 +1018,7 @@ msgstr "�екоректне значенн� «%s» параметра --gaps."
 
 #: src/elfcmp.c:607 src/findtextrel.c:229 src/ldgeneric.c:1767
 #: src/ldgeneric.c:4257 src/nm.c:363 src/ranlib.c:169 src/size.c:301
-#: src/strings.c:183 src/strip.c:433 src/strip.c:468 src/unstrip.c:1913
+#: src/strings.c:183 src/strip.c:443 src/strip.c:478 src/unstrip.c:1913
 #: src/unstrip.c:1942
 #, c-format
 msgid "cannot open '%s'"
@@ -2925,7 +2930,7 @@ msgid "Locate source of text relocations in FILEs (a.out by default)."
 msgstr "Шукає джерело переміщеного тек�ту у Ф�ЙЛ�Х (типово, a.out)."
 
 #: src/findtextrel.c:84 src/nm.c:111 src/objdump.c:80 src/size.c:92
-#: src/strings.c:92 src/strip.c:97
+#: src/strings.c:92 src/strip.c:100
 msgid "[FILE...]"
 msgstr "[Ф�ЙЛ...]"
 
@@ -2939,60 +2944,60 @@ msgstr "не вдало�� отримати заголовок ELF «%s»: %s"
 msgid "'%s' is not a DSO or PIE"
 msgstr "«%s» не є DSO або PIE"
 
-#: src/findtextrel.c:274
+#: src/findtextrel.c:277
 #, c-format
 msgid "getting get section header of section %zu: %s"
 msgstr "отриманн� заголовка розділу get розділу %zu: %s"
 
-#: src/findtextrel.c:292
+#: src/findtextrel.c:300
 #, c-format
 msgid "cannot read dynamic section: %s"
 msgstr "не вдало�� прочитати динамічний розділ: %s"
 
-#: src/findtextrel.c:307
+#: src/findtextrel.c:321
 #, c-format
 msgid "no text relocations reported in '%s'"
 msgstr "у «%s» не ви�влено переміщень тек�ту"
 
-#: src/findtextrel.c:319
+#: src/findtextrel.c:333
 #, c-format
 msgid "while reading ELF file"
 msgstr "під ча� �проби читанн� файла ELF"
 
-#: src/findtextrel.c:328 src/findtextrel.c:345
+#: src/findtextrel.c:342 src/findtextrel.c:359
 #, c-format
 msgid "cannot get program header index at offset %d: %s"
 msgstr "не вдало�� отримати індек� заголовка програми за зміщенн�м %d: %s"
 
-#: src/findtextrel.c:397
+#: src/findtextrel.c:411
 #, c-format
 msgid "cannot get section header of section %Zu: %s"
 msgstr "не вдало�� отримати заголовок розділу %Zu: %s"
 
-#: src/findtextrel.c:409
+#: src/findtextrel.c:423
 #, c-format
 msgid "cannot get symbol table section %zu in '%s': %s"
 msgstr "не вдало�� отримати таблицю �имволів розділу %zu у «%s»: %s"
 
-#: src/findtextrel.c:429 src/findtextrel.c:452
+#: src/findtextrel.c:443 src/findtextrel.c:466
 #, c-format
 msgid "cannot get relocation at index %d in section %zu in '%s': %s"
 msgstr ""
 "не вдало�� отримати переміщенн� за індек�ом %d у розділі %zu у «%s»: %s"
 
-#: src/findtextrel.c:517
+#: src/findtextrel.c:531
 #, c-format
 msgid "%s not compiled with -fpic/-fPIC\n"
 msgstr "%s не зібрано з -fpic/-fPIC\n"
 
-#: src/findtextrel.c:570
+#: src/findtextrel.c:584
 #, c-format
 msgid ""
 "the file containing the function '%s' is not compiled with -fpic/-fPIC\n"
 msgstr ""
 "файл, що мі�тить функцію «%s», не було зібрано з параметрами -fpic/-fPIC\n"
 
-#: src/findtextrel.c:577 src/findtextrel.c:597
+#: src/findtextrel.c:591 src/findtextrel.c:611
 #, c-format
 msgid ""
 "the file containing the function '%s' might not be compiled with -fpic/-"
@@ -3001,7 +3006,7 @@ msgstr ""
 "файл, що мі�тить функцію «%s», ймовірно, не було зібрано з параметрами -"
 "fpic/-fPIC\n"
 
-#: src/findtextrel.c:585
+#: src/findtextrel.c:599
 #, c-format
 msgid ""
 "either the file containing the function '%s' or the file containing the "
@@ -3010,7 +3015,7 @@ msgstr ""
 "файл, що мі�тить функцію «%s», або файл, що мі�тить функцію «%s», зібрано "
 "без параметрів -fpic/-fPIC\n"
 
-#: src/findtextrel.c:605
+#: src/findtextrel.c:619
 #, c-format
 msgid ""
 "a relocation modifies memory at offset %llu in a write-protected segment\n"
@@ -3433,7 +3438,7 @@ msgstr "ПопередженнÑ�: тип «%s» змінивÑ�Ñ� з %s у %s нÐ
 msgid "Warning: size of `%s' changed from %<PRIu64> in %s to %<PRIu64> in %s"
 msgstr "Попередженн�: розмір «%s» змінено з %<PRIu64> у %s на %<PRIu64> у %s"
 
-#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:543
+#: src/ldgeneric.c:661 src/ldgeneric.c:1122 src/readelf.c:636 src/strip.c:553
 #, c-format
 msgid "cannot determine number of sections: %s"
 msgstr "не вдало�� визначити кількі�ть розділів: %s"
@@ -3744,7 +3749,7 @@ msgstr "�имвол «%s» оголошено локально і на зага
 msgid "default visibility set as local and global"
 msgstr "типову видимі�ть визначено �к локальну і загальну"
 
-#: src/nm.c:74 src/strip.c:73
+#: src/nm.c:74 src/strip.c:74
 msgid "Output selection:"
 msgstr "Вибір виводу:"
 
@@ -3808,7 +3813,7 @@ msgstr "Позначати �лабкі �имволи"
 msgid "Print size of defined symbols"
 msgstr "Виве�ти розмір визначених �имволів"
 
-#: src/nm.c:98 src/size.c:80 src/strip.c:78 src/unstrip.c:81
+#: src/nm.c:98 src/size.c:80 src/strip.c:79 src/unstrip.c:81
 msgid "Output options:"
 msgstr "Параметри виводу:"
 
@@ -3828,18 +3833,18 @@ msgstr "Змінити пор�док на протилежний"
 msgid "List symbols from FILEs (a.out by default)."
 msgstr "Показати �пи�ок �имволів з Ф�ЙЛів (типово з a.out)."
 
-#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:121
+#: src/nm.c:136 src/objdump.c:105 src/size.c:117 src/strip.c:124
 #, c-format
 msgid "%s: INTERNAL ERROR %d (%s-%s): %s"
 msgstr "%s: В�УТРІШ�Я ПОМИЛК� %d (%s-%s): %s"
 
 #: src/nm.c:380 src/nm.c:392 src/size.c:317 src/size.c:326 src/size.c:337
-#: src/strip.c:1816
+#: src/strip.c:1878
 #, c-format
 msgid "while closing '%s'"
 msgstr "під ча� закритт� «%s»"
 
-#: src/nm.c:402 src/objdump.c:296 src/strip.c:359
+#: src/nm.c:402 src/objdump.c:296 src/strip.c:369
 #, c-format
 msgid "%s: File format not recognized"
 msgstr "%s: не вдало�� розпізнати формат файла"
@@ -3882,7 +3887,7 @@ msgstr "не вдало�� �творити дерево пошуку"
 #: src/readelf.c:1742 src/readelf.c:1952 src/readelf.c:2206 src/readelf.c:2272
 #: src/readelf.c:2350 src/readelf.c:2848 src/readelf.c:2884 src/readelf.c:2946
 #: src/readelf.c:6934 src/readelf.c:7832 src/readelf.c:7979 src/readelf.c:8047
-#: src/size.c:425 src/size.c:499 src/strip.c:483
+#: src/size.c:425 src/size.c:499 src/strip.c:493
 #, c-format
 msgid "cannot get section header string table index"
 msgstr "не вдало�� визначити індек� заголовка розділу у таблиці р�дків"
@@ -5840,153 +5845,162 @@ msgstr "помилка повторного викори�танн� mmap"
 msgid "mprotect failed"
 msgstr "помилка mprotect"
 
-#: src/strip.c:74
+#: src/strip.c:75
 msgid "Place stripped output into FILE"
 msgstr "Виве�ти дані пі�л� вилученн� до Ф�ЙЛа"
 
-#: src/strip.c:75
+#: src/strip.c:76
 msgid "Extract the removed sections into FILE"
 msgstr "Видобути вилучені розділи до Ф�ЙЛа"
 
-#: src/strip.c:76
+#: src/strip.c:77
 msgid "Embed name FILE instead of -f argument"
 msgstr "Вбудувати назву Ф�ЙЛа замі�ть аргументу -f"
 
-#: src/strip.c:80
+#: src/strip.c:81
 msgid "Remove all debugging symbols"
 msgstr "Вилучити в�і �имволи зневаджуванн�"
 
-#: src/strip.c:84
+#: src/strip.c:85
+msgid "Remove section headers (not recommended)"
+msgstr "Вилучити заголовки розділів (не рекомендовано)"
+
+#: src/strip.c:87
 msgid "Copy modified/access timestamps to the output"
 msgstr "Скопіювати ча�ові позначки зміни/до�тупу до виведених даних"
 
-#: src/strip.c:86
+#: src/strip.c:89
 msgid "Remove .comment section"
 msgstr "Вилучити розділ .comment"
 
-#: src/strip.c:89
+#: src/strip.c:92
 msgid "Relax a few rules to handle slightly broken ELF files"
 msgstr ""
 "Знехтувати декількома правилами дл� обробки трохи пошкоджених файлів ELF"
 
-#: src/strip.c:94
+#: src/strip.c:97
 msgid "Discard symbols from object files."
 msgstr "Відкинути �имволи з об’єктних файлів"
 
-#: src/strip.c:186
+#: src/strip.c:192
 #, c-format
 msgid "Only one input file allowed together with '-o' and '-f'"
 msgstr ""
 "Разом з «-o» або «-f» можна викори�товувати лише один файл вхідних даних"
 
-#: src/strip.c:222
+#: src/strip.c:228
 #, c-format
 msgid "-f option specified twice"
 msgstr "параметр -f вказано двічі"
 
-#: src/strip.c:231
+#: src/strip.c:237
 #, c-format
 msgid "-F option specified twice"
 msgstr "параметр -F вказано двічі"
 
-#: src/strip.c:240 src/unstrip.c:125
+#: src/strip.c:246 src/unstrip.c:125
 #, c-format
 msgid "-o option specified twice"
 msgstr "параметр -o вказано двічі"
 
-#: src/strip.c:260
+#: src/strip.c:266
 #, c-format
 msgid "-R option supports only .comment section"
 msgstr "Дл� параметра -R передбачено підтримку лише розділу .comment"
 
-#: src/strip.c:298 src/strip.c:322
+#: src/strip.c:308 src/strip.c:332
 #, c-format
 msgid "cannot stat input file '%s'"
 msgstr "не вдало�� отримати дані з вхідного файла «%s» за допомогою stat"
 
-#: src/strip.c:312
+#: src/strip.c:322
 #, c-format
 msgid "while opening '%s'"
 msgstr "під ча� �проби відкритт� «%s»"
 
-#: src/strip.c:350
+#: src/strip.c:360
 #, c-format
 msgid "%s: cannot use -o or -f when stripping archive"
 msgstr ""
 "%s: не можна викори�товувати -o або -f під ча� вилученн� додаткового вмі�ту "
 "архіву"
 
-#: src/strip.c:448
+#: src/strip.c:458
 #, c-format
 msgid "cannot open EBL backend"
 msgstr "не вдало�� відкрити канал �ервера EBL"
 
-#: src/strip.c:498 src/strip.c:522
+#: src/strip.c:508 src/strip.c:532
 #, c-format
 msgid "cannot create new file '%s': %s"
 msgstr "не вдало�� �творити файл «%s»: %s"
 
-#: src/strip.c:582
+#: src/strip.c:592
 #, c-format
 msgid "illformed file '%s'"
 msgstr "помилкове форматуванн� файла «%s»"
 
-#: src/strip.c:869 src/strip.c:956
+#: src/strip.c:880 src/strip.c:967
 #, c-format
 msgid "while generating output file: %s"
 msgstr "під ча� �проби �творенн� файла з виведеними даними: %s"
 
-#: src/strip.c:929 src/strip.c:1668
+#: src/strip.c:940 src/strip.c:1683
 #, c-format
 msgid "%s: error while creating ELF header: %s"
 msgstr "%s: помилка під ча� �творенн� заголовка ELF: %s"
 
-#: src/strip.c:943
+#: src/strip.c:954
 #, c-format
 msgid "while preparing output for '%s'"
 msgstr "під ча� приготуванн� виведених даних дл� «%s»"
 
-#: src/strip.c:994 src/strip.c:1050
+#: src/strip.c:1005 src/strip.c:1061
 #, c-format
 msgid "while create section header section: %s"
 msgstr "під ча� �творенн� розділу заголовка розділу: %s"
 
-#: src/strip.c:1000
+#: src/strip.c:1011
 #, c-format
 msgid "cannot allocate section data: %s"
 msgstr "не вдало�� розмі�тити дані розділу: %s"
 
-#: src/strip.c:1059
+#: src/strip.c:1070
 #, c-format
 msgid "while create section header string table: %s"
 msgstr "під ча� �творенн� таблиці р�дків заголовка розділу: %s"
 
-#: src/strip.c:1593 src/strip.c:1690
+#: src/strip.c:1595 src/strip.c:1705
 #, c-format
 msgid "while writing '%s': %s"
 msgstr "під ча� запи�у «%s»: %s"
 
-#: src/strip.c:1604
+#: src/strip.c:1606
 #, c-format
 msgid "while creating '%s'"
 msgstr "під ча� �проби �творенн� «%s»"
 
-#: src/strip.c:1616
+#: src/strip.c:1628
 #, c-format
 msgid "while computing checksum for debug information"
 msgstr "під ча� обчи�ленн� контрольної �уми дл� діагно�тичних даних"
 
-#: src/strip.c:1676
+#: src/strip.c:1691
 #, c-format
 msgid "%s: error while reading the file: %s"
 msgstr "%s: помилка під ча� читанн� файла: %s"
 
-#: src/strip.c:1722 src/strip.c:1729
+#: src/strip.c:1730 src/strip.c:1750
+#, c-format
+msgid "while writing '%s'"
+msgstr "під ча� �проби запи�у «%s»"
+
+#: src/strip.c:1784 src/strip.c:1791
 #, c-format
 msgid "error while finishing '%s': %s"
 msgstr "помилка під ча� завершенн� «%s»: %s"
 
-#: src/strip.c:1752 src/strip.c:1809
+#: src/strip.c:1814 src/strip.c:1871
 #, c-format
 msgid "cannot set access and modification date of '%s'"
 msgstr "не вдало�� в�тановити права до�тупу та дату зміни «%s»"
diff --git a/elfutils/src/ChangeLog b/elfutils/src/ChangeLog
index 716e7313..8b74ca6d 100644
--- a/elfutils/src/ChangeLog
+++ b/elfutils/src/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-06  Roland McGrath  <roland@redhat.com>
+
+	* strip.c (handle_elf): Under --strip-sections, remove all
+	non-allocated sections and never generate .gnu_debuglink.
+
+2011-01-04  Roland McGrath  <roland@redhat.com>
+
+	* strip.c (remove_shdrs): New variable.
+	(options, parse_opt): Grok --strip-sections to set it.
+	(handle_elf): When that's set, truncate off .shstrtab and shdrs.
+
+2010-11-10  Roland McGrath  <roland@redhat.com>
+
+	* findtextrel.c (process_file): Don't assume order of sections.
+	Reported by Mike Hommey <mh@glandium.org>.
+
 2010-07-26  Roland McGrath  <roland@redhat.com>
 
 	* readelf.c (print_ops): Handle DW_OP_GNU_implicit_pointer.
diff --git a/elfutils/src/findtextrel.c b/elfutils/src/findtextrel.c
index 9d10982f..986c406e 100644
--- a/elfutils/src/findtextrel.c
+++ b/elfutils/src/findtextrel.c
@@ -1,5 +1,5 @@
 /* Locate source files or functions which caused text relocations.
-   Copyright (C) 2005, 2006, 2007, 2009 Red Hat, Inc.
+   Copyright (C) 2005-2010 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2005.
 
@@ -262,7 +262,10 @@ process_file (const char *fname, bool more_than_one)
      the symbol table.  */
   Elf_Scn *symscn = NULL;
   Elf_Scn *scn = NULL;
-  while ((scn = elf_nextscn (elf, scn)) != NULL)
+  bool seen_dynamic = false;
+  bool have_textrel = false;
+  while ((scn = elf_nextscn (elf, scn)) != NULL
+	 && (!seen_dynamic || symscn == NULL))
     {
       /* Handle the section if it is a symbol table.  */
       GElf_Shdr shdr_mem;
@@ -276,38 +279,49 @@ process_file (const char *fname, bool more_than_one)
 	  goto err_elf_close;
 	}
 
-      if (shdr->sh_type == SHT_DYNAMIC)
+      switch (shdr->sh_type)
 	{
-	  Elf_Data *data = elf_getdata (scn, NULL);
-
-	  for (size_t cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize;
-	       ++cnt)
+	case SHT_DYNAMIC:
+	  if (!seen_dynamic)
 	    {
-	      GElf_Dyn dynmem;
-	      GElf_Dyn *dyn;
+	      seen_dynamic = true;
+
+	      Elf_Data *data = elf_getdata (scn, NULL);
 
-	      dyn = gelf_getdyn (data, cnt, &dynmem);
-	      if (dyn == NULL)
+	      for (size_t cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize;
+		   ++cnt)
 		{
-		  error (0, 0, gettext ("cannot read dynamic section: %s"),
-			 elf_errmsg (-1));
-		  goto err_elf_close;
-		}
+		  GElf_Dyn dynmem;
+		  GElf_Dyn *dyn;
 
-	      if (dyn->d_tag == DT_TEXTREL
-		  || (dyn->d_tag == DT_FLAGS
-		      && (dyn->d_un.d_val & DF_TEXTREL) != 0))
-		goto have_textrel;
+		  dyn = gelf_getdyn (data, cnt, &dynmem);
+		  if (dyn == NULL)
+		    {
+		      error (0, 0, gettext ("cannot read dynamic section: %s"),
+			     elf_errmsg (-1));
+		      goto err_elf_close;
+		    }
+
+		  if (dyn->d_tag == DT_TEXTREL
+		      || (dyn->d_tag == DT_FLAGS
+			  && (dyn->d_un.d_val & DF_TEXTREL) != 0))
+		    have_textrel = true;
+		}
 	    }
+	  break;
+
+	case SHT_SYMTAB:
+	  symscn = scn;
+	  break;
 	}
-      else if (shdr->sh_type == SHT_SYMTAB)
-	symscn = scn;
     }
 
-  error (0, 0, gettext ("no text relocations reported in '%s'"), fname);
-  return 1;
+  if (!have_textrel)
+    {
+      error (0, 0, gettext ("no text relocations reported in '%s'"), fname);
+      return 1;
+    }
 
- have_textrel:;
   int fd2 = -1;
   Elf *elf2 = NULL;
   /* Get the address ranges for the loaded segments.  */
diff --git a/elfutils/src/ldscript.c b/elfutils/src/ldscript.c
index 5852eb1d..81e509d2 100644
--- a/elfutils/src/ldscript.c
+++ b/elfutils/src/ldscript.c
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 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
@@ -46,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.4.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -148,7 +147,7 @@ extern int yylex (void);
 
 
 /* Line 189 of yacc.c  */
-#line 152 "ldscript.c"
+#line 151 "ldscript.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -259,7 +258,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 263 "ldscript.c"
+#line 262 "ldscript.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -271,7 +270,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 275 "ldscript.c"
+#line 274 "ldscript.c"
 
 #ifdef short
 # undef short
@@ -321,7 +320,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -806,9 +805,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL		goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -865,7 +873,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -1604,14 +1612,14 @@ yyreduce:
     {
         case 3:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 145 "ldscript.y"
     { add_versions ((yyvsp[(2) - (2)].version)); }
     break;
 
   case 6:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 153 "ldscript.y"
     {
 		      if (likely (ld_state.entry == NULL))
@@ -1621,7 +1629,7 @@ yyreduce:
 
   case 7:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 158 "ldscript.y"
     {
 		      ld_new_searchdir ((yyvsp[(3) - (5)].str));
@@ -1630,7 +1638,7 @@ yyreduce:
 
   case 8:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 162 "ldscript.y"
     {
 		      if (likely (ld_state.pagesize == 0))
@@ -1640,7 +1648,7 @@ yyreduce:
 
   case 9:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 167 "ldscript.y"
     {
 		      if (likely (ld_state.interp == NULL)
@@ -1651,7 +1659,7 @@ yyreduce:
 
   case 10:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 173 "ldscript.y"
     {
 		      new_segment ((yyvsp[(2) - (5)].num), (yyvsp[(4) - (5)].output_rule));
@@ -1660,7 +1668,7 @@ yyreduce:
 
   case 11:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 177 "ldscript.y"
     {
 		      fputs_unlocked (gettext ("mode for segment invalid\n"),
@@ -1671,7 +1679,7 @@ yyreduce:
 
   case 12:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 183 "ldscript.y"
     {
 		      /* First little optimization.  If there is only one
@@ -1687,35 +1695,35 @@ yyreduce:
 
   case 13:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 194 "ldscript.y"
     { add_inputfiles ((yyvsp[(3) - (4)].filename_list)); }
     break;
 
   case 14:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 196 "ldscript.y"
     { add_inputfiles (mark_as_needed ((yyvsp[(3) - (4)].filename_list))); }
     break;
 
   case 15:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 198 "ldscript.y"
     { add_versions ((yyvsp[(3) - (4)].version)); }
     break;
 
   case 16:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 200 "ldscript.y"
     { /* XXX TODO */ }
     break;
 
   case 17:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 204 "ldscript.y"
     {
 		      (yyvsp[(2) - (2)].output_rule)->next = (yyvsp[(1) - (2)].output_rule)->next;
@@ -1725,14 +1733,14 @@ yyreduce:
 
   case 18:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 209 "ldscript.y"
     { (yyval.output_rule) = (yyvsp[(1) - (1)].output_rule); }
     break;
 
   case 19:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 213 "ldscript.y"
     {
 		      (yyval.output_rule) = new_output_rule (output_assignment);
@@ -1742,7 +1750,7 @@ yyreduce:
 
   case 20:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 218 "ldscript.y"
     {
 		      (yyval.output_rule) = new_output_rule (output_section);
@@ -1759,7 +1767,7 @@ yyreduce:
 
   case 21:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 230 "ldscript.y"
     {
 		      /* This is a short cut for "ID { *(ID) }".  */
@@ -1786,21 +1794,21 @@ yyreduce:
 
   case 22:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 254 "ldscript.y"
     { (yyval.assignment) = new_assignment ((yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].expr), false); }
     break;
 
   case 23:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 256 "ldscript.y"
     { (yyval.assignment) = new_assignment ((yyvsp[(3) - (6)].str), (yyvsp[(5) - (6)].expr), true); }
     break;
 
   case 24:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 260 "ldscript.y"
     {
 		      (yyvsp[(2) - (2)].input_rule)->next = (yyvsp[(1) - (2)].input_rule)->next;
@@ -1810,14 +1818,14 @@ yyreduce:
 
   case 25:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 265 "ldscript.y"
     { (yyval.input_rule) = (yyvsp[(1) - (1)].input_rule); }
     break;
 
   case 26:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 269 "ldscript.y"
     {
 		      (yyval.input_rule) = new_input_rule (input_section);
@@ -1827,7 +1835,7 @@ yyreduce:
 
   case 27:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 274 "ldscript.y"
     {
 		      (yyvsp[(3) - (4)].filemask_section_name)->keep_flag = true;
@@ -1839,7 +1847,7 @@ yyreduce:
 
   case 28:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 281 "ldscript.y"
     {
 		      (yyval.input_rule) = new_input_rule (input_assignment);
@@ -1849,7 +1857,7 @@ yyreduce:
 
   case 29:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 288 "ldscript.y"
     {
 		      (yyval.filemask_section_name) = (struct filemask_section_name *)
@@ -1863,35 +1871,35 @@ yyreduce:
 
   case 30:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 299 "ldscript.y"
     { (yyval.sectionname) = new_input_section_name ((yyvsp[(1) - (1)].str), false); }
     break;
 
   case 31:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 301 "ldscript.y"
     { (yyval.sectionname) = new_input_section_name ((yyvsp[(3) - (4)].str), true); }
     break;
 
   case 32:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 305 "ldscript.y"
     { (yyval.str) = (yyvsp[(3) - (4)].str); }
     break;
 
   case 33:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 307 "ldscript.y"
     { (yyval.str) = NULL; }
     break;
 
   case 34:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 311 "ldscript.y"
     {
 		      (yyval.expr) = new_expr (exp_align);
@@ -1901,14 +1909,14 @@ yyreduce:
 
   case 35:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 316 "ldscript.y"
     { (yyval.expr) = (yyvsp[(2) - (3)].expr); }
     break;
 
   case 36:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 318 "ldscript.y"
     {
 		      (yyval.expr) = new_expr (exp_mult);
@@ -1919,7 +1927,7 @@ yyreduce:
 
   case 37:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 324 "ldscript.y"
     {
 		      (yyval.expr) = new_expr ((yyvsp[(2) - (3)].op));
@@ -1930,7 +1938,7 @@ yyreduce:
 
   case 38:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 330 "ldscript.y"
     {
 		      (yyval.expr) = new_expr ((yyvsp[(2) - (3)].op));
@@ -1941,7 +1949,7 @@ yyreduce:
 
   case 39:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 336 "ldscript.y"
     {
 		      (yyval.expr) = new_expr (exp_and);
@@ -1952,7 +1960,7 @@ yyreduce:
 
   case 40:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 342 "ldscript.y"
     {
 		      (yyval.expr) = new_expr (exp_or);
@@ -1963,7 +1971,7 @@ yyreduce:
 
   case 41:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 348 "ldscript.y"
     {
 		      (yyval.expr) = new_expr (exp_num);
@@ -1973,7 +1981,7 @@ yyreduce:
 
   case 42:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 353 "ldscript.y"
     {
 		      (yyval.expr) = new_expr (exp_id);
@@ -1983,21 +1991,21 @@ yyreduce:
 
   case 43:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 358 "ldscript.y"
     { (yyval.expr) = new_expr (exp_sizeof_headers); }
     break;
 
   case 44:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 360 "ldscript.y"
     { (yyval.expr) = new_expr (exp_pagesize); }
     break;
 
   case 45:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 364 "ldscript.y"
     {
 		      (yyvsp[(3) - (3)].filename_list)->next = (yyvsp[(1) - (3)].filename_list)->next;
@@ -2007,14 +2015,14 @@ yyreduce:
 
   case 46:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 369 "ldscript.y"
     { (yyval.filename_list) = (yyvsp[(1) - (1)].filename_list); }
     break;
 
   case 49:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 377 "ldscript.y"
     {
 		      /* First little optimization.  If there is only one
@@ -2030,21 +2038,21 @@ yyreduce:
 
   case 50:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 388 "ldscript.y"
     { (yyval.filename_list) = mark_as_needed ((yyvsp[(3) - (4)].filename_list)); }
     break;
 
   case 51:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 390 "ldscript.y"
     { (yyval.filename_list) = new_filename_listelem ((yyvsp[(1) - (1)].str)); }
     break;
 
   case 52:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 395 "ldscript.y"
     {
 		      (yyvsp[(2) - (2)].version)->next = (yyvsp[(1) - (2)].version)->next;
@@ -2054,14 +2062,14 @@ yyreduce:
 
   case 53:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 400 "ldscript.y"
     { (yyval.version) = (yyvsp[(1) - (1)].version); }
     break;
 
   case 54:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 404 "ldscript.y"
     {
 		      (yyvsp[(2) - (4)].version)->versionname = "";
@@ -2072,7 +2080,7 @@ yyreduce:
 
   case 55:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 410 "ldscript.y"
     {
 		      (yyvsp[(3) - (5)].version)->versionname = (yyvsp[(1) - (5)].str);
@@ -2083,7 +2091,7 @@ yyreduce:
 
   case 56:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 416 "ldscript.y"
     {
 		      (yyvsp[(3) - (6)].version)->versionname = (yyvsp[(1) - (6)].str);
@@ -2094,35 +2102,35 @@ yyreduce:
 
   case 57:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 425 "ldscript.y"
     { (yyval.version) = merge_versions ((yyvsp[(1) - (2)].version), (yyvsp[(2) - (2)].version)); }
     break;
 
   case 58:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 427 "ldscript.y"
     { (yyval.version) = (yyvsp[(1) - (1)].version); }
     break;
 
   case 59:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 431 "ldscript.y"
     { (yyval.version) = new_version (NULL, (yyvsp[(2) - (2)].id_list)); }
     break;
 
   case 60:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 433 "ldscript.y"
     { (yyval.version) = new_version ((yyvsp[(2) - (2)].id_list), NULL); }
     break;
 
   case 61:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 438 "ldscript.y"
     {
 		      struct id_list *newp = new_id_listelem ((yyvsp[(2) - (3)].str));
@@ -2133,43 +2141,43 @@ yyreduce:
 
   case 62:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 444 "ldscript.y"
     { (yyval.id_list) = new_id_listelem ((yyvsp[(1) - (2)].str)); }
     break;
 
   case 63:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 448 "ldscript.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); }
     break;
 
   case 64:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 450 "ldscript.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); }
     break;
 
   case 65:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 454 "ldscript.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); }
     break;
 
   case 66:
 
-/* Line 1455 of yacc.c  */
+/* Line 1464 of yacc.c  */
 #line 456 "ldscript.y"
     { (yyval.str) = NULL; }
     break;
 
 
 
-/* Line 1455 of yacc.c  */
-#line 2173 "ldscript.c"
+/* Line 1464 of yacc.c  */
+#line 2181 "ldscript.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2380,7 +2388,7 @@ yyreturn:
 
 
 
-/* Line 1675 of yacc.c  */
+/* Line 1684 of yacc.c  */
 #line 459 "ldscript.y"
 
 
diff --git a/elfutils/src/ldscript.h b/elfutils/src/ldscript.h
index c61530d8..5f7230a4 100644
--- a/elfutils/src/ldscript.h
+++ b/elfutils/src/ldscript.h
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 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
@@ -104,7 +103,7 @@
 typedef union YYSTYPE
 {
 
-/* Line 1676 of yacc.c  */
+/* Line 1685 of yacc.c  */
 #line 71 "ldscript.y"
 
   uintmax_t num;
@@ -122,8 +121,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 1676 of yacc.c  */
-#line 127 "ldscript.h"
+/* Line 1685 of yacc.c  */
+#line 126 "ldscript.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/elfutils/src/strip.c b/elfutils/src/strip.c
index 7b2b889a..99374eb3 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-2010 Red Hat, Inc.
+   Copyright (C) 2000-2011 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2000.
 
@@ -65,6 +65,7 @@ ARGP_PROGRAM_BUG_ADDRESS_DEF = PACKAGE_BUGREPORT;
 /* Values for the parameters which have no short form.  */
 #define OPT_REMOVE_COMMENT	0x100
 #define OPT_PERMISSIVE		0x101
+#define OPT_STRIP_SECTIONS	0x102
 
 
 /* Definitions of arguments for argp functions.  */
@@ -80,6 +81,8 @@ static const struct argp_option options[] =
   { "strip-debug", 'g', NULL, 0, N_("Remove all debugging symbols"), 0 },
   { NULL, 'd', NULL, OPTION_ALIAS, NULL, 0 },
   { NULL, 'S', NULL, OPTION_ALIAS, NULL, 0 },
+  { "strip-sections", OPT_STRIP_SECTIONS, NULL, 0,
+    N_("Remove section headers (not recommended)"), 0 },
   { "preserve-dates", 'p', NULL, 0,
     N_("Copy modified/access timestamps to the output"), 0 },
   { "remove-comment", OPT_REMOVE_COMMENT, NULL, 0,
@@ -140,6 +143,9 @@ static bool remove_comment;
 /* If true remove all debug sections.  */
 static bool remove_debug;
 
+/* If true remove all section headers.  */
+static bool remove_shdrs;
+
 /* If true relax some ELF rules for input files.  */
 static bool permissive;
 
@@ -268,6 +274,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
       remove_debug = true;
       break;
 
+    case OPT_STRIP_SECTIONS:
+      remove_shdrs = true;
+      break;
+
     case OPT_PERMISSIVE:
       permissive = true;
       break;
@@ -662,9 +672,10 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname,
   */
   for (cnt = 1; cnt < shnum; ++cnt)
     /* Check whether the section can be removed.  */
-    if (ebl_section_strip_p (ebl, ehdr, &shdr_info[cnt].shdr,
-			     shdr_info[cnt].name, remove_comment,
-			     remove_debug))
+    if (remove_shdrs ? !(shdr_info[cnt].shdr.sh_flags & SHF_ALLOC)
+	: ebl_section_strip_p (ebl, ehdr, &shdr_info[cnt].shdr,
+			       shdr_info[cnt].name, remove_comment,
+			       remove_debug))
       {
 	/* For now assume this section will be removed.  */
 	shdr_info[cnt].idx = 0;
@@ -968,7 +979,7 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname,
     goto fail_close;
 
   /* Create the reference to the file with the debug info.  */
-  if (debug_fname != NULL)
+  if (debug_fname != NULL && !remove_shdrs)
     {
       /* Add the section header string table section name.  */
       shdr_info[cnt].se = ebl_strtabadd (shst, ".gnu_debuglink", 15);
@@ -1578,15 +1589,6 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname,
      we can actually write out the debug file.  */
   if (debug_fname != NULL)
     {
-      uint32_t debug_crc;
-      Elf_Data debug_crc_data =
-	{
-	  .d_type = ELF_T_WORD,
-	  .d_buf = &debug_crc,
-	  .d_size = sizeof (debug_crc),
-	  .d_version = EV_CURRENT
-	};
-
       /* Finally write the file.  */
       if (unlikely (elf_update (debugelf, ELF_C_WRITE) == -1))
 	{
@@ -1609,21 +1611,33 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname,
       /* The temporary file does not exist anymore.  */
       tmp_debug_fname = NULL;
 
-      /* Compute the checksum which we will add to the executable.  */
-      if (crc32_file (debug_fd, &debug_crc) != 0)
+      if (!remove_shdrs)
 	{
-	  error (0, errno,
-		 gettext ("while computing checksum for debug information"));
-	  unlink (debug_fname);
-	  result = 1;
-	  goto fail_close;
-	}
+	  uint32_t debug_crc;
+	  Elf_Data debug_crc_data =
+	    {
+	      .d_type = ELF_T_WORD,
+	      .d_buf = &debug_crc,
+	      .d_size = sizeof (debug_crc),
+	      .d_version = EV_CURRENT
+	    };
+
+	  /* Compute the checksum which we will add to the executable.  */
+	  if (crc32_file (debug_fd, &debug_crc) != 0)
+	    {
+	      error (0, errno, gettext ("\
+while computing checksum for debug information"));
+	      unlink (debug_fname);
+	      result = 1;
+	      goto fail_close;
+	    }
 
-      /* Store it in the debuglink section data.  */
-      if (unlikely (gelf_xlatetof (newelf, &debuglink_crc_data,
-				   &debug_crc_data, ehdr->e_ident[EI_DATA])
-		    != &debuglink_crc_data))
-	INTERNAL_ERROR (fname);
+	  /* Store it in the debuglink section data.  */
+	  if (unlikely (gelf_xlatetof (newelf, &debuglink_crc_data,
+				       &debug_crc_data, ehdr->e_ident[EI_DATA])
+			!= &debuglink_crc_data))
+	    INTERNAL_ERROR (fname);
+	}
     }
 
   /* Finally finish the ELF header.  Fill in the fields not handled by
@@ -1639,6 +1653,7 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname,
   newehdr->e_entry = ehdr->e_entry;
   newehdr->e_flags = ehdr->e_flags;
   newehdr->e_phoff = ehdr->e_phoff;
+
   /* We need to position the section header table.  */
   const size_t offsize = gelf_fsize (elf, ELF_T_OFF, 1, EV_CURRENT);
   newehdr->e_shoff = ((shdr_info[shdridx].shdr.sh_offset
@@ -1692,6 +1707,53 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname,
       result = 1;
     }
 
+  if (remove_shdrs)
+    {
+      /* libelf can't cope without the section headers being properly intact.
+	 So we just let it write them normally, and then we nuke them later.  */
+
+      if (newehdr->e_ident[EI_CLASS] == ELFCLASS32)
+	{
+	  assert (offsetof (Elf32_Ehdr, e_shentsize) + sizeof (Elf32_Half)
+		  == offsetof (Elf32_Ehdr, e_shnum));
+	  assert (offsetof (Elf32_Ehdr, e_shnum) + sizeof (Elf32_Half)
+		  == offsetof (Elf32_Ehdr, e_shstrndx));
+	  const Elf32_Off zero_off = 0;
+	  const Elf32_Half zero[3] = { 0, 0, SHN_UNDEF };
+	  if (pwrite_retry (fd, &zero_off, sizeof zero_off,
+			    offsetof (Elf32_Ehdr, e_shoff)) != sizeof zero_off
+	      || (pwrite_retry (fd, zero, sizeof zero,
+				offsetof (Elf32_Ehdr, e_shentsize))
+		  != sizeof zero)
+	      || ftruncate64 (fd, shdr_info[shdridx].shdr.sh_offset) < 0)
+	    {
+	      error (0, errno, gettext ("while writing '%s'"),
+		     fname);
+	      result = 1;
+	    }
+	}
+      else
+	{
+	  assert (offsetof (Elf64_Ehdr, e_shentsize) + sizeof (Elf64_Half)
+		  == offsetof (Elf64_Ehdr, e_shnum));
+	  assert (offsetof (Elf64_Ehdr, e_shnum) + sizeof (Elf64_Half)
+		  == offsetof (Elf64_Ehdr, e_shstrndx));
+	  const Elf64_Off zero_off = 0;
+	  const Elf64_Half zero[3] = { 0, 0, SHN_UNDEF };
+	  if (pwrite_retry (fd, &zero_off, sizeof zero_off,
+			    offsetof (Elf64_Ehdr, e_shoff)) != sizeof zero_off
+	      || (pwrite_retry (fd, zero, sizeof zero,
+				offsetof (Elf64_Ehdr, e_shentsize))
+		  != sizeof zero)
+	      || ftruncate64 (fd, shdr_info[shdridx].shdr.sh_offset) < 0)
+	    {
+	      error (0, errno, gettext ("while writing '%s'"),
+		     fname);
+	      result = 1;
+	    }
+	}
+    }
+
  fail_close:
   if (shdr_info != NULL)
     {
diff --git a/elfutils/tests/ChangeLog b/elfutils/tests/ChangeLog
index 0176fb49..9ba08acb 100644
--- a/elfutils/tests/ChangeLog
+++ b/elfutils/tests/ChangeLog
@@ -1,3 +1,46 @@
+2011-01-12  Roland McGrath  <roland@redhat.com>
+
+	* run-prelink-addr-test.sh: Make symlinks to find .debug files
+	corresponding to .noshdrs files.
+
+2011-01-11  Josh Stone  <jistone@redhat.com>
+
+	* run-prelink-addr-test.sh: Add testfile54, 32 and 64-bit.
+	* testfile54-32.so.bz2, testfile54-32.so.debug.bz2,
+	testfile54-32.prelink.so.bz2, testfile54-32.noshdrs.so.bz2,
+	testfile54-64.so.bz2, testfile54-64.so.debug.bz2,
+	testfile54-64.prelink.so.bz2, testfile54-64.noshdrs.so.bz2: New.
+	* Makefile.am (EXTRA_DIST): Add and update all.
+
+	* run-prelink-addr-test.sh: Run 32 and 64-bit testfile53 tests.
+	* testfile53.bz2, testfile53.debug.bz2,
+	testfile53.prelink.bz2: Deleted, so...
+	* testfile53-64.bz2, testfile53-64.debug.bz2,
+	testfile53-64.prelink.bz2: Recreated with 64-bit names.
+	* testfile53-32.bz2, testfile53-32.debug.bz2,
+	testfile53-32.prelink.bz2: New in 32-bit.
+	* Makefile.am (EXTRA_DIST): Add and update all.
+
+	* run-prelink-addr-test.sh: Run 32 and 64-bit testfile52 tests.
+	* testfile52.so.bz2, testfile52.so.debug.bz2,
+	testfile52.prelink.so.bz2: Deleted, so...
+	* testfile52-32.so.bz2, testfile52-32.so.debug.bz2,
+	testfile52-32.prelink.so.bz2: Recreated with 32-bit names.
+	* testfile52-32.noshdrs.so.bz2: New data file, stripped of headers.
+	* testfile52-64.so.bz2, testfile52-64.so.debug.bz2,
+	testfile52-64.prelink.so.bz2, testfile52-64.noshdrs.so.bz2: New files.
+	* Makefile.am (EXTRA_DIST): Add and update all.
+
+2011-01-10  Josh Stone  <jistone@redhat.com>
+
+	* run-prelink-addr-test.sh: New test for prelinked addrs.
+	* Makefile.am (TESTS, EXTRA_DIST): Add it.
+	* testfile52.so.bz2, testfile52.so.debug.bz2: New data files.
+	* testfile52.prelink.so.bz2: New data file, shows REL->RELA.
+	* testfile53.bz2, testfile53.debug.bz2: New data files.
+	* testfile53.prelink.bz2: New data file, shows ET_EXEC remap.
+	* Makefile.am (EXTRA_DIST): Add them.
+
 2010-06-04  Roland McGrath  <roland@redhat.com>
 
 	* run-unstrip-test.sh: Also test modifying the file in place.
diff --git a/elfutils/tests/Makefile.am b/elfutils/tests/Makefile.am
index 008008ac..04805f05 100644
--- a/elfutils/tests/Makefile.am
+++ b/elfutils/tests/Makefile.am
@@ -83,7 +83,7 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile test-nlist \
 	run-dwfl-bug-offline-rel.sh run-dwfl-addr-sect.sh \
 	run-disasm-x86.sh run-disasm-x86-64.sh \
 	run-early-offscn.sh run-dwarf-getmacros.sh \
-	run-test-flag-nobits.sh
+	run-test-flag-nobits.sh run-prelink-addr-test.sh
 # run-show-ciefde.sh
 
 if !STANDALONE
@@ -139,7 +139,19 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \
 	     testfile44.S.bz2 testfile44.expect.bz2 run-disasm-x86.sh \
 	     testfile45.S.bz2 testfile45.expect.bz2 run-disasm-x86-64.sh \
 	     testfile46.bz2 testfile47.bz2 testfile48.bz2 testfile48.debug.bz2 \
-	     testfile49.bz2 testfile50.bz2 testfile51.bz2
+	     testfile49.bz2 testfile50.bz2 testfile51.bz2 \
+	     run-prelink-addr-test.sh \
+	     testfile52-32.so.bz2 testfile52-32.so.debug.bz2 \
+	     testfile52-32.prelink.so.bz2 testfile52-32.noshdrs.so.bz2 \
+	     testfile52-64.so.bz2 testfile52-64.so.debug.bz2 \
+	     testfile52-64.prelink.so.bz2 testfile52-64.noshdrs.so.bz2 \
+	     testfile53-32.bz2 testfile53-32.debug.bz2 \
+	     testfile53-32.prelink.bz2 testfile53-64.bz2 \
+	     testfile53-64.debug.bz2 testfile53-64.prelink.bz2 \
+	     testfile54-32.so.bz2 testfile54-32.so.debug.bz2 \
+	     testfile54-32.prelink.so.bz2 testfile54-32.noshdrs.so.bz2 \
+	     testfile54-64.so.bz2 testfile54-64.so.debug.bz2 \
+	     testfile54-64.prelink.so.bz2 testfile54-64.noshdrs.so.bz2
 
 installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir) \
 			      bindir=$(DESTDIR)$(bindir) \
diff --git a/elfutils/tests/Makefile.in b/elfutils/tests/Makefile.in
index 930b3157..f4969825 100644
--- a/elfutils/tests/Makefile.in
+++ b/elfutils/tests/Makefile.in
@@ -80,8 +80,8 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \
 	dwfl-bug-fd-leak$(EXEEXT) dwfl-bug-report$(EXEEXT) \
 	run-dwfl-bug-offline-rel.sh run-dwfl-addr-sect.sh \
 	run-disasm-x86.sh run-disasm-x86-64.sh run-early-offscn.sh \
-	run-dwarf-getmacros.sh run-test-flag-nobits.sh $(am__EXEEXT_1) \
-	$(am__EXEEXT_3)
+	run-dwarf-getmacros.sh run-test-flag-nobits.sh \
+	run-prelink-addr-test.sh $(am__EXEEXT_1) $(am__EXEEXT_3)
 # run-show-ciefde.sh
 @STANDALONE_FALSE@am__append_5 = msg_tst sha1-tst
 @STANDALONE_FALSE@am__append_6 = msg_tst sha1-tst
@@ -522,7 +522,19 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \
 	     testfile44.S.bz2 testfile44.expect.bz2 run-disasm-x86.sh \
 	     testfile45.S.bz2 testfile45.expect.bz2 run-disasm-x86-64.sh \
 	     testfile46.bz2 testfile47.bz2 testfile48.bz2 testfile48.debug.bz2 \
-	     testfile49.bz2 testfile50.bz2 testfile51.bz2
+	     testfile49.bz2 testfile50.bz2 testfile51.bz2 \
+	     run-prelink-addr-test.sh \
+	     testfile52-32.so.bz2 testfile52-32.so.debug.bz2 \
+	     testfile52-32.prelink.so.bz2 testfile52-32.noshdrs.so.bz2 \
+	     testfile52-64.so.bz2 testfile52-64.so.debug.bz2 \
+	     testfile52-64.prelink.so.bz2 testfile52-64.noshdrs.so.bz2 \
+	     testfile53-32.bz2 testfile53-32.debug.bz2 \
+	     testfile53-32.prelink.bz2 testfile53-64.bz2 \
+	     testfile53-64.debug.bz2 testfile53-64.prelink.bz2 \
+	     testfile54-32.so.bz2 testfile54-32.so.debug.bz2 \
+	     testfile54-32.prelink.so.bz2 testfile54-32.noshdrs.so.bz2 \
+	     testfile54-64.so.bz2 testfile54-64.so.debug.bz2 \
+	     testfile54-64.prelink.so.bz2 testfile54-64.noshdrs.so.bz2
 
 installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir) \
 			      bindir=$(DESTDIR)$(bindir) \
diff --git a/elfutils/tests/run-prelink-addr-test.sh b/elfutils/tests/run-prelink-addr-test.sh
new file mode 100755
index 00000000..b7e32889
--- /dev/null
+++ b/elfutils/tests/run-prelink-addr-test.sh
@@ -0,0 +1,216 @@
+#! /bin/sh
+# Copyright (C) 2011 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 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>.
+
+. $srcdir/test-subr.sh
+
+
+# testfile52.c:
+#   #include <stdlib.h>
+#   int foo() { exit(0); }
+#
+# gcc -m32 -g -shared testfile52-32.c -o testfile52-32.so
+# eu-strip -f testfile52-32.so.debug testfile52-32.so
+# cp testfile52-32.so testfile52-32.prelink.so
+# prelink -N testfile52-32.prelink.so
+# cp testfile52-32.so testfile52-32.noshdrs.so
+# prelink -r 0x42000000 testfile52-32.noshdrs.so
+# eu-strip --remove-comment --strip-sections testfile52-32.noshdrs.so
+
+testfiles testfile52-32.so testfile52-32.so.debug
+testfiles testfile52-32.prelink.so testfile52-32.noshdrs.so
+tempfiles testmaps52-32 testfile52-32.noshdrs.so.debug
+ln -s testfile52-32.so.debug testfile52-32.noshdrs.so.debug
+
+cat > testmaps52-32 <<EOF
+00111000-00112000 r-xp 00000000 fd:01 1 `pwd`/testfile52-32.so
+00112000-00113000 rw-p 00000000 fd:01 1 `pwd`/testfile52-32.so
+41000000-41001000 r-xp 00000000 fd:01 2 `pwd`/testfile52-32.prelink.so
+41001000-41002000 rw-p 00000000 fd:01 2 `pwd`/testfile52-32.prelink.so
+42000000-42001000 r-xp 00000000 fd:01 3 `pwd`/testfile52-32.noshdrs.so
+42001000-42002000 rw-p 00000000 fd:01 3 `pwd`/testfile52-32.noshdrs.so
+EOF
+
+# Prior to commit 1743d7f, libdwfl would fail on the second address,
+# because it didn't notice that prelink added a 0x20-byte offset from
+# what the .debug file reports.
+testrun_compare ../src/addr2line -S -M testmaps52-32 \
+    0x11140c 0x4100042d 0x4200040e <<\EOF
+foo
+/home/jistone/src/elfutils/tests/testfile52-32.c:2
+foo+0x1
+/home/jistone/src/elfutils/tests/testfile52-32.c:2
+foo+0x2
+/home/jistone/src/elfutils/tests/testfile52-32.c:2
+EOF
+
+# Repeat testfile52 for -m64.  The particular REL>RELA issue doesn't exist, but
+# we'll make sure the rest works anyway.
+testfiles testfile52-64.so testfile52-64.so.debug
+testfiles testfile52-64.prelink.so testfile52-64.noshdrs.so
+tempfiles testmaps52-64 testfile52-64.noshdrs.so.debug
+ln -s testfile52-64.so.debug testfile52-64.noshdrs.so.debug
+
+cat > testmaps52-64 <<EOF
+1000000000-1000001000 r-xp 00000000 fd:11 1 `pwd`/testfile52-64.so
+1000001000-1000200000 ---p 00001000 fd:11 1 `pwd`/testfile52-64.so
+1000200000-1000201000 rw-p 00000000 fd:11 1 `pwd`/testfile52-64.so
+3000000000-3000001000 r-xp 00000000 fd:11 2 `pwd`/testfile52-64.prelink.so
+3000001000-3000200000 ---p 00001000 fd:11 2 `pwd`/testfile52-64.prelink.so
+3000200000-3000201000 rw-p 00000000 fd:11 2 `pwd`/testfile52-64.prelink.so
+3800000000-3800001000 r-xp 00000000 fd:11 3 `pwd`/testfile52-64.noshdrs.so
+3800001000-3800200000 ---p 00001000 fd:11 3 `pwd`/testfile52-64.noshdrs.so
+3800200000-3800201000 rw-p 00000000 fd:11 3 `pwd`/testfile52-64.noshdrs.so
+EOF
+
+testrun_compare ../src/addr2line -S -M testmaps52-64 \
+    0x100000056c 0x300000056d 0x380000056e <<\EOF
+foo
+/home/jistone/src/elfutils/tests/testfile52-64.c:2
+foo+0x1
+/home/jistone/src/elfutils/tests/testfile52-64.c:2
+foo+0x2
+/home/jistone/src/elfutils/tests/testfile52-64.c:2
+EOF
+
+
+# testfile53.c:
+#   char foo[0x1000];
+#   int main() { return 0; }
+#
+# gcc -m32 -g testfile53-32.c -o testfile53-32
+# eu-strip -f testfile53-32.debug testfile53-32
+# cp testfile53-32 testfile53-32.prelink
+# prelink -N testfile53-32.prelink
+testfiles testfile53-32 testfile53-32.debug testfile53-32.prelink
+
+testrun_compare ../src/addr2line -S -e testfile53-32 0x8048394 0x8048395 <<\EOF
+main
+/home/jistone/src/elfutils/tests/testfile53-32.c:2
+main+0x1
+/home/jistone/src/elfutils/tests/testfile53-32.c:2
+EOF
+
+# prelink shuffled some of the sections, but .text is in the same place.
+testrun_compare ../src/addr2line -S -e testfile53-32.prelink 0x8048396 0x8048397 <<\EOF
+main+0x2
+/home/jistone/src/elfutils/tests/testfile53-32.c:2
+main+0x3
+/home/jistone/src/elfutils/tests/testfile53-32.c:2
+EOF
+
+# Repeat testfile53 in 64-bit, except use foo[0x800] to achieve the same
+# prelink section shuffling.
+testfiles testfile53-64 testfile53-64.debug testfile53-64.prelink
+
+testrun_compare ../src/addr2line -S -e testfile53-64 0x400474 0x400475 <<\EOF
+main
+/home/jistone/src/elfutils/tests/testfile53-64.c:2
+main+0x1
+/home/jistone/src/elfutils/tests/testfile53-64.c:2
+EOF
+
+testrun_compare ../src/addr2line -S -e testfile53-64.prelink 0x400476 0x400477 <<\EOF
+main+0x2
+/home/jistone/src/elfutils/tests/testfile53-64.c:2
+main+0x3
+/home/jistone/src/elfutils/tests/testfile53-64.c:2
+EOF
+
+
+# testfile54.c:
+#   extern void * stdin;
+#   static void * pstdin = &stdin;
+#   void * const foo = &pstdin;
+#
+# gcc -m32 -g -shared -nostartfiles testfile54-32.c -o testfile54-32.so
+# eu-strip -f testfile54-32.so.debug testfile54-32.so
+# cp testfile54-32.so testfile54-32.prelink.so
+# prelink -N testfile54-32.prelink.so
+# cp testfile54-32.so testfile54-32.noshdrs.so
+# prelink -r 0x42000000 testfile54-32.noshdrs.so
+# eu-strip --remove-comment --strip-sections testfile54-32.noshdrs.so
+testfiles testfile54-32.so testfile54-32.so.debug
+testfiles testfile54-32.prelink.so testfile54-32.noshdrs.so
+tempfiles testmaps54-32
+
+# Note we have no testfile54-32.noshdrs.so.debug link here, so
+# this is testing finding the symbols in .dynsym via PT_DYNAMIC.
+
+cat > testmaps54-32 <<EOF
+00111000-00112000 r--p 00000000 fd:01 1 `pwd`/testfile54-32.so
+00112000-00113000 rw-p 00000000 fd:01 1 `pwd`/testfile54-32.so
+41000000-41001000 r--p 00000000 fd:01 2 `pwd`/testfile54-32.prelink.so
+41001000-41002000 rw-p 00000000 fd:01 2 `pwd`/testfile54-32.prelink.so
+42000000-42001000 r--p 00000000 fd:01 3 `pwd`/testfile54-32.noshdrs.so
+42001000-42002000 rw-p 00000000 fd:01 3 `pwd`/testfile54-32.noshdrs.so
+EOF
+
+testrun_compare ../src/addr2line -S -M testmaps54-32 \
+    0x1111fc 0x1122a4 0x410001fd 0x410012a5 0x420001fe <<\EOF
+foo
+??:0
+pstdin
+??:0
+foo+0x1
+??:0
+pstdin+0x1
+??:0
+foo+0x2
+??:0
+EOF
+
+# Repeat testfile64 in 64-bit
+testfiles testfile54-64.so testfile54-64.so.debug
+testfiles testfile54-64.prelink.so testfile54-64.noshdrs.so
+tempfiles testmaps54-64
+
+# Note we have no testfile54-64.noshdrs.so.debug link here, so
+# this is testing finding the symbols in .dynsym via PT_DYNAMIC.
+
+cat > testmaps54-64 <<EOF
+1000000000-1000001000 r--p 00000000 fd:11 1 `pwd`/testfile54-64.so
+1000001000-1000200000 ---p 00001000 fd:11 1 `pwd`/testfile54-64.so
+1000200000-1000201000 rw-p 00000000 fd:11 1 `pwd`/testfile54-64.so
+3000000000-3000001000 r--p 00000000 fd:11 2 `pwd`/testfile54-64.prelink.so
+3000001000-3000200000 ---p 00001000 fd:11 2 `pwd`/testfile54-64.prelink.so
+3000200000-3000201000 rw-p 00000000 fd:11 2 `pwd`/testfile54-64.prelink.so
+3800000000-3800001000 r--p 00000000 fd:11 3 `pwd`/testfile54-64.noshdrs.so
+3800001000-3800200000 ---p 00001000 fd:11 3 `pwd`/testfile54-64.noshdrs.so
+3800200000-3800201000 rw-p 00000000 fd:11 3 `pwd`/testfile54-64.noshdrs.so
+EOF
+
+testrun_compare ../src/addr2line -S -M testmaps54-64 \
+    0x10000002f8 0x1000200448 0x30000002f9 0x3000200449 0x38000002fa <<\EOF
+foo
+??:0
+pstdin
+??:0
+foo+0x1
+??:0
+pstdin+0x1
+??:0
+foo+0x2
+??:0
+EOF
diff --git a/elfutils/tests/testfile52-32.noshdrs.so.bz2 b/elfutils/tests/testfile52-32.noshdrs.so.bz2
new file mode 100755
index 00000000..01d27424
--- /dev/null
+++ b/elfutils/tests/testfile52-32.noshdrs.so.bz2
diff --git a/elfutils/tests/testfile52-32.prelink.so.bz2 b/elfutils/tests/testfile52-32.prelink.so.bz2
new file mode 100755
index 00000000..ccb9ae32
--- /dev/null
+++ b/elfutils/tests/testfile52-32.prelink.so.bz2
diff --git a/elfutils/tests/testfile52-32.so.bz2 b/elfutils/tests/testfile52-32.so.bz2
new file mode 100755
index 00000000..2a5b56ea
--- /dev/null
+++ b/elfutils/tests/testfile52-32.so.bz2
diff --git a/elfutils/tests/testfile52-32.so.debug.bz2 b/elfutils/tests/testfile52-32.so.debug.bz2
new file mode 100755
index 00000000..818b36d5
--- /dev/null
+++ b/elfutils/tests/testfile52-32.so.debug.bz2
diff --git a/elfutils/tests/testfile52-64.noshdrs.so.bz2 b/elfutils/tests/testfile52-64.noshdrs.so.bz2
new file mode 100755
index 00000000..5ca310f0
--- /dev/null
+++ b/elfutils/tests/testfile52-64.noshdrs.so.bz2
diff --git a/elfutils/tests/testfile52-64.prelink.so.bz2 b/elfutils/tests/testfile52-64.prelink.so.bz2
new file mode 100755
index 00000000..8cb8f482
--- /dev/null
+++ b/elfutils/tests/testfile52-64.prelink.so.bz2
diff --git a/elfutils/tests/testfile52-64.so.bz2 b/elfutils/tests/testfile52-64.so.bz2
new file mode 100755
index 00000000..8009f07c
--- /dev/null
+++ b/elfutils/tests/testfile52-64.so.bz2
diff --git a/elfutils/tests/testfile52-64.so.debug.bz2 b/elfutils/tests/testfile52-64.so.debug.bz2
new file mode 100755
index 00000000..4397788f
--- /dev/null
+++ b/elfutils/tests/testfile52-64.so.debug.bz2
diff --git a/elfutils/tests/testfile53-32.bz2 b/elfutils/tests/testfile53-32.bz2
new file mode 100755
index 00000000..7bf48d9f
--- /dev/null
+++ b/elfutils/tests/testfile53-32.bz2
diff --git a/elfutils/tests/testfile53-32.debug.bz2 b/elfutils/tests/testfile53-32.debug.bz2
new file mode 100755
index 00000000..79ea566d
--- /dev/null
+++ b/elfutils/tests/testfile53-32.debug.bz2
diff --git a/elfutils/tests/testfile53-32.prelink.bz2 b/elfutils/tests/testfile53-32.prelink.bz2
new file mode 100755
index 00000000..8e05abf0
--- /dev/null
+++ b/elfutils/tests/testfile53-32.prelink.bz2
diff --git a/elfutils/tests/testfile53-64.bz2 b/elfutils/tests/testfile53-64.bz2
new file mode 100755
index 00000000..235a7631
--- /dev/null
+++ b/elfutils/tests/testfile53-64.bz2
diff --git a/elfutils/tests/testfile53-64.debug.bz2 b/elfutils/tests/testfile53-64.debug.bz2
new file mode 100755
index 00000000..675c6eaf
--- /dev/null
+++ b/elfutils/tests/testfile53-64.debug.bz2
diff --git a/elfutils/tests/testfile53-64.prelink.bz2 b/elfutils/tests/testfile53-64.prelink.bz2
new file mode 100755
index 00000000..853aba78
--- /dev/null
+++ b/elfutils/tests/testfile53-64.prelink.bz2
diff --git a/elfutils/tests/testfile54-32.noshdrs.so.bz2 b/elfutils/tests/testfile54-32.noshdrs.so.bz2
new file mode 100755
index 00000000..846bc91e
--- /dev/null
+++ b/elfutils/tests/testfile54-32.noshdrs.so.bz2
diff --git a/elfutils/tests/testfile54-32.prelink.so.bz2 b/elfutils/tests/testfile54-32.prelink.so.bz2
new file mode 100755
index 00000000..85c8526c
--- /dev/null
+++ b/elfutils/tests/testfile54-32.prelink.so.bz2
diff --git a/elfutils/tests/testfile54-32.so.bz2 b/elfutils/tests/testfile54-32.so.bz2
new file mode 100755
index 00000000..4bc4fa37
--- /dev/null
+++ b/elfutils/tests/testfile54-32.so.bz2
diff --git a/elfutils/tests/testfile54-32.so.debug.bz2 b/elfutils/tests/testfile54-32.so.debug.bz2
new file mode 100755
index 00000000..79dd614d
--- /dev/null
+++ b/elfutils/tests/testfile54-32.so.debug.bz2
diff --git a/elfutils/tests/testfile54-64.noshdrs.so.bz2 b/elfutils/tests/testfile54-64.noshdrs.so.bz2
new file mode 100755
index 00000000..3da726a6
--- /dev/null
+++ b/elfutils/tests/testfile54-64.noshdrs.so.bz2
diff --git a/elfutils/tests/testfile54-64.prelink.so.bz2 b/elfutils/tests/testfile54-64.prelink.so.bz2
new file mode 100755
index 00000000..e296a1d9
--- /dev/null
+++ b/elfutils/tests/testfile54-64.prelink.so.bz2
diff --git a/elfutils/tests/testfile54-64.so.bz2 b/elfutils/tests/testfile54-64.so.bz2
new file mode 100755
index 00000000..6072bf19
--- /dev/null
+++ b/elfutils/tests/testfile54-64.so.bz2
diff --git a/elfutils/tests/testfile54-64.so.debug.bz2 b/elfutils/tests/testfile54-64.so.debug.bz2
new file mode 100755
index 00000000..6b45390e
--- /dev/null
+++ b/elfutils/tests/testfile54-64.so.debug.bz2
diff --git a/elfutils/version.h b/elfutils/version.h
index 64dfefdc..687236d9 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	149
+#define _ELFUTILS_VERSION	151
 
 #define _ELFUTILS_PREREQ(major, minor) \
   (_ELFUTILS_VERSION >= ((major) * 1000 + (minor)))