gdb: resume ongoing step after handling fork or vfork

[deliverable/binutils-gdb.git] / binutils / readelf.c

diff --git a/binutils/readelf.c b/binutils/readelf.c
index e104a7ed2a16b171c0fc692bf7572c702ea60d07..af10bcd0e170f1a3267a321571285c9d28ea2d9d 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -18843,8 +18843,6 @@ get_note_type (Filedata * filedata, unsigned e_type)
        return _("NT_SIGINFO (siginfo_t data)");
       case NT_FILE:
        return _("NT_FILE (mapped files)");
-      case NT_MEMTAG:
-       return _("NT_MEMTAG (memory tags)");
       default:
        break;
       }
@@ -18859,6 +18857,8 @@ get_note_type (Filedata * filedata, unsigned e_type)
        return _("OPEN");
       case NT_GNU_BUILD_ATTRIBUTE_FUNC:
        return _("func");
+      case NT_GO_BUILDID:
+       return _("GO BUILDID");
       default:
        break;
       }
@@ -19505,6 +19505,21 @@ print_gnu_property_note (Filedata * filedata, Elf_Internal_Note * pnote)
              goto next;
 
            default:
+             if ((type >= GNU_PROPERTY_UINT32_AND_LO
+                  && type <= GNU_PROPERTY_UINT32_AND_HI)
+                 || (type >= GNU_PROPERTY_UINT32_OR_LO
+                     && type <= GNU_PROPERTY_UINT32_OR_HI))
+               {
+                 if (type <= GNU_PROPERTY_UINT32_AND_HI)
+                   printf (_("UINT32_AND (%#x): "), type);
+                 else
+                   printf (_("UINT32_OR (%#x): "), type);
+                 if (datasz != 4)
+                   printf (_("<corrupt length: %#x> "), datasz);
+                 else
+                   printf ("%#x", (unsigned int) byte_get (ptr, 4));
+                 goto next;
+               }
              break;
            }
        }
@@ -21775,6 +21790,9 @@ process_archive (Filedata * filedata, bool is_thin_archive)
          filedata->archive_file_offset = arch.nested_member_origin;
          member_filedata->file_name = qualified_name;
 
+         /* The call to process_object() expects the file to be at the beginning.  */
+         rewind (member_filedata->handle);
+
          if (! process_object (member_filedata))
            ret = false;