From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 26 Jan 2012 21:26:37 +0000 (-0800)
Subject: Merge branch 'master' into roland/relocate
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75ab75b44bd0035b8fc4242cd6dae2e21e3684dd;p=thirdparty%2Felfutils.git

Merge branch 'master' into roland/relocate

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

75ab75b44bd0035b8fc4242cd6dae2e21e3684dd
diff --cc backends/alpha_symbol.c
index 0e85f4975,5d25d3e48..2ccc62552
--- a/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/libdwP.h
index b850dd314,b84bf02c3..580e203ff
--- a/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;