From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 15 Feb 2007 19:40:37 +0000 (+0000)
Subject: propagate from branch 'com.redhat.elfutils.roland.pending' (head e723b1541850630f0047... 
X-Git-Tag: elfutils-0.127~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=903c1162c0c2afd0d962f6b481edfec0e0209b83;p=thirdparty%2Felfutils.git

propagate from branch 'com.redhat.elfutils.roland.pending' (head e723b1541850630f0047cf0c73d64c909529f439)
            to branch 'com.redhat.elfutils' (head 4e5f7cffa97269b8cc9232cd1e299a2e1f3a819c)
---

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 814299b89..61170d59f 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-10  Roland McGrath  <roland@redhat.com>
+
+	* dwarf.h (DW_OP_fbreg): Comment fix.
+
 2007-02-03  Roland McGrath  <roland@redhat.com>
 
 	* dwarf_getelf.c (dwarf_getelf): Renamed from dwarf_get_elf.
diff --git a/libdw/dwarf.h b/libdw/dwarf.h
index 7791ca17a..4b763ffa8 100644
--- a/libdw/dwarf.h
+++ b/libdw/dwarf.h
@@ -1,5 +1,5 @@
 /* This file defines standard DWARF types, structures, and macros.
-   Copyright (C) 2000, 2002, 2005, 2006 Red Hat, Inc.
+   Copyright (C) 2000, 2002, 2005, 2006, 2007 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -418,7 +418,7 @@ enum
     DW_OP_breg30 = 0x8e,	/* Base register 30.  */
     DW_OP_breg31 = 0x8f,	/* Base register 31.  */
     DW_OP_regx = 0x90,		/* Unsigned LEB128 register.  */
-    DW_OP_fbreg = 0x91,		/* Signed LEB128 register.  */
+    DW_OP_fbreg = 0x91,		/* Signed LEB128 offset.  */
     DW_OP_bregx = 0x92,		/* ULEB128 register followed by SLEB128 off. */
     DW_OP_piece = 0x93,		/* ULEB128 size of piece addressed. */
     DW_OP_deref_size = 0x94,	/* 1-byte size of data retrieved.  */
diff --git a/src/ChangeLog b/src/ChangeLog
index 26920df15..bb45f8263 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-15  Roland McGrath  <roland@redhat.com>
+
+	* readelf.c (print_debug): Fix brainos in SHDR test.
+
 2007-02-05  Roland McGrath  <roland@redhat.com>
 
 	* ar.c: Include <limits.h>, since we use LONG_MAX.
diff --git a/src/readelf.c b/src/readelf.c
index fd61b3699..ab276ec64 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -4953,7 +4953,7 @@ print_debug (Ebl *ebl, GElf_Ehdr *ehdr)
       GElf_Shdr shdr_mem;
       GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
 
-      if (shdr != NULL || shdr->sh_type != SHT_PROGBITS)
+      if (shdr != NULL && shdr->sh_type == SHT_PROGBITS)
 	{
 	  static const struct
 	  {