* objdump.c (dump_headers, dump_section_header): Change objdump -h

	output to be simpler and to include section file offsets.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 02010896cdbdb396e909dfc6d8b8ae58e9d3326c..a54a104899af1499b89f15a374537fe2c14a9d60 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 25 13:51:44 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+       * objdump.c (dump_headers, dump_section_header): Change objdump -h
+       output to be simpler and to include section file offsets.
+
 Wed Jan 24 12:06:05 1996  Ian Lance Taylor  <ian@cygnus.com>
 
        * stabs.c (parse_stab_members): Don't adjust voffset.

diff --git a/binutils/objdump.c b/binutils/objdump.c
index f45c8a9b938c269e548edf01b604bfc1980dc546..acb4c5079132cb31f5284b15c53739b21c4a5383 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -193,20 +193,22 @@ dump_section_header (abfd, section, ignored)
 {
   char *comma = "";
 
-#define PF(x,y) \
-  if (section->flags & x) {  printf("%s%s",comma,y); comma = ", "; }
+  printf ("%3d %-14s%08lx  ", section->index,
+         bfd_get_section_name (abfd, section),
+         (unsigned long) bfd_section_size (abfd, section));
+  printf_vma (bfd_get_section_vma (abfd, section));
+  printf ("  ");
+  printf_vma (section->lma);
+  printf ("  %08lx  2**%u", section->filepos,
+         bfd_get_section_alignment (abfd, section));
+  if (! wide_output)
+    printf ("\n                ");
+  printf ("  ");
 
+#define PF(x, y) \
+  if (section->flags & x) { printf ("%s%s", comma, y); comma = ", "; }
 
-  printf ("SECTION %d [%s]\t: size %08x",
-         section->index,
-         section->name,
-         (unsigned) bfd_get_section_size_before_reloc (section));
-  printf (" vma ");
-  printf_vma (section->vma);
-  printf (" lma ");
-  printf_vma (section->lma);
-  printf (" align 2**%u%s ",
-         section->alignment_power, (wide_output) ? "" : "\n");
+  PF (SEC_HAS_CONTENTS, "CONTENTS");
   PF (SEC_ALLOC, "ALLOC");
   PF (SEC_CONSTRUCTOR, "CONSTRUCTOR");
   PF (SEC_CONSTRUCTOR_TEXT, "CONSTRUCTOR TEXT");
@@ -233,6 +235,12 @@ static void
 dump_headers (abfd)
      bfd *abfd;
 {
+  printf ("Sections:\n");
+#ifndef BFD64
+  printf ("Idx Name          Size      VMA       LMA       File off  Algn\n");
+#else
+  printf ("Idx Name          Size      VMA               LMA               File off  Algn\n");
+#endif
   bfd_map_over_sections (abfd, dump_section_header, (PTR) NULL);
 }
 \f