propagate from branch 'com.redhat.elfutils.roland.pending' (head e723b1541850630f0047...

            to branch 'com.redhat.elfutils' (head 4e5f7cffa97269b8cc9232cd1e299a2e1f3a819c)

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 814299b8903570cf43f1e100b06f34492620af27..61170d59f407cbcf33a5c7cc51cb6fbefe71cce3 100644 (file)
--- 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 7791ca17ac3e1623770d3fd64f2f8942e5b82c16..4b763ffa853911c6282918aef3e24f5e31e42682 100644 (file)
--- 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 26920df1552d045e6c9e42d5366781eed9957018..bb45f8263a44534934eab46dfd03ea26bb79ff6d 100644 (file)
--- 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 fd61b3699d6133ca08c6164d1816bdf6b001069a..ab276ec649caff80a8cccd4dc993b838fa6e73eb 100644 (file)
--- 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
          {