Merge branch 'master' into roland/relocate

Conflicts:
	backends/alpha_symbol.c
	libdw/libdwP.h

diff --cc backends/ChangeLog
Simple merge

diff --cc backends/alpha_init.c
Simple merge

diff --cc backends/alpha_symbol.c
index 0e85f497579c0dce8c9ba8dd4544ebff4fc92817,5d25d3e48fc8227ff1fc627e7513ca1830137453..2ccc62552c696fd389b9706874f828b153617b95
--- 1/backends/alpha_symbol.c
--- 2/backends/alpha_symbol.c
+++ b/backends/alpha_symbol.c
@@@ -1,5 -1,5 +1,5 @@@
  /* Alpha specific symbolic name handling.
-    Copyright (C) 2002-2010 Red Hat, Inc.
 -   Copyright (C) 2002-2011 Red Hat, Inc.
++   Copyright (C) 2002-2012 Red Hat, Inc.
     This file is part of Red Hat elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2002.
  

diff --cc libdw/ChangeLog
Simple merge

diff --cc libdw/Makefile.am
Simple merge

diff --cc libdw/dwarf_begin_elf.c
Simple merge

diff --cc libdw/dwarf_end.c
Simple merge

diff --cc libdw/libdw.h
Simple merge

diff --cc libdw/libdwP.h
index b850dd314090e8d2d2519d1d0efc43888977d58b,b84bf02c3e02ed044e91e93bec8052dec27969e9..580e203ffe8ed97c957d236dd84b00a0a42e6809
--- 1/libdw/libdwP.h
--- 2/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@@ -1,5 -1,5 +1,5 @@@
  /* Internal definitions for libdwarf.
-    Copyright (C) 2002-2010 Red Hat, Inc.
 -   Copyright (C) 2002-2011 Red Hat, Inc.
++   Copyright (C) 2002-2012 Red Hat, Inc.
     This file is part of Red Hat elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2002.
  
@@@ -157,9 -150,11 +157,14 @@@ struct Dwar
    /* The section data.  */
    Elf_Data *sectiondata[IDX_last];
  
+ #if USE_ZLIB
+   /* The 1 << N bit is set if sectiondata[N] is malloc'd decompressed data.  */
+   unsigned int sectiondata_gzip_mask:IDX_last;
+ #endif
+ 
 +  /* Information for relocating an ET_REL file, or null.  */
 +  struct dwarf_file_reloc *relocate;
 +
    /* True if the file has a byte order different from the host.  */
    bool other_byte_order;
  

diff --cc libdwfl/ChangeLog
Simple merge

diff --cc libdwfl/derelocate.c
Simple merge

diff --cc libdwfl/dwfl_module_getdwarf.c
Simple merge

diff --cc libdwfl/libdwflP.h
Simple merge

diff --cc libebl/ChangeLog
Simple merge

diff --cc libebl/Makefile.am
Simple merge

diff --cc libebl/ebl-hooks.h
Simple merge

diff --cc libebl/eblopenbackend.c
Simple merge

diff --cc libebl/libebl.h
Simple merge

diff --cc tests/ChangeLog
Simple merge