* gas/i386/opcode.s: Pad section.

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

diff --git a/binutils/objdump.c b/binutils/objdump.c
index 6c42d3ad0d25a3462bc7c7e42137002321c7ba92..3338fc57cc5929c5545358a8b5a5c505e4a1a146 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -102,6 +102,7 @@ static bfd_vma start_address = (bfd_vma) -1; /* --start-address */
 static bfd_vma stop_address = (bfd_vma) -1;  /* --stop-address */
 static int dump_debugging;             /* --debugging */
 static int dump_debugging_tags;                /* --debugging-tags */
+static int dump_special_syms = 0;      /* --special-syms */
 static bfd_vma adjust_section_vma = 0; /* --adjust-vma */
 static int file_start_context = 0;      /* --file-start-context */
 
@@ -217,6 +218,7 @@ usage (FILE *stream, int status)
       --prefix-addresses         Print complete address alongside disassembly\n\
       --[no-]show-raw-insn       Display hex alongside symbolic disassembly\n\
       --adjust-vma=OFFSET        Add OFFSET to all displayed section addresses\n\
+      --special-syms             Include special symbols in symbol dumps\n\
 \n"));
       list_supported_targets (program_name, stream);
       list_supported_architectures (program_name, stream);
@@ -268,6 +270,7 @@ static struct option long_options[]=
   {"section-headers", no_argument, NULL, 'h'},
   {"show-raw-insn", no_argument, &show_raw_insn, 1},
   {"source", no_argument, NULL, 'S'},
+  {"special-syms", no_argument, &dump_special_syms, 1},
   {"include", required_argument, NULL, 'I'},
   {"stabs", no_argument, NULL, 'G'},
   {"start-address", required_argument, NULL, OPTION_START_ADDRESS},
@@ -331,6 +334,7 @@ dump_section_header (bfd *abfd ATTRIBUTE_UNUSED, asection *section,
   if ((section->flags & SEC_LINK_ONCE) != 0)
     {
       const char *ls;
+      struct coff_comdat_info *comdat;
 
       switch (section->flags & SEC_LINK_DUPLICATES)
        {
@@ -351,9 +355,9 @@ dump_section_header (bfd *abfd ATTRIBUTE_UNUSED, asection *section,
        }
       printf ("%s%s", comma, ls);
 
-      if (section->comdat != NULL)
-       printf (" (COMDAT %s %ld)", section->comdat->name,
-               section->comdat->symbol);
+      comdat = bfd_coff_get_comdat_section (abfd, section);
+      if (comdat != NULL)
+       printf (" (COMDAT %s %ld)", comdat->name, comdat->symbol);
 
       comma = ", ";
     }
@@ -1406,6 +1410,7 @@ disassemble_bytes (struct disassemble_info * info,
              for (j = addr_offset * opb; j < addr_offset * opb + pb; j += bpc)
                {
                  int k;
+
                  if (bpc > 1 && info->display_endian == BFD_ENDIAN_LITTLE)
                    {
                      for (k = bpc - 1; k >= 0; k--)
@@ -2275,13 +2280,14 @@ dump_symbols (bfd *abfd ATTRIBUTE_UNUSED, bfd_boolean dynamic)
       bfd *cur_bfd;
 
       if (*current == NULL)
-       printf (_("no information for the %ld'th symbol"), count);
+       printf (_("no information for symbol number %ld\n"), count);
 
       else if ((cur_bfd = bfd_asymbol_bfd (*current)) == NULL)
-       printf (_("could not determine the type of the %ld'th symbol"),
+       printf (_("could not determine the type of symbol number %ld\n"),
                count);
 
-      else
+      else if (dump_special_syms
+              || !bfd_is_target_special_symbol (cur_bfd, *current))
        {
          const char *name = (*current)->name;
 
@@ -2302,9 +2308,8 @@ dump_symbols (bfd *abfd ATTRIBUTE_UNUSED, bfd_boolean dynamic)
          else
            bfd_print_symbol (cur_bfd, stdout, *current,
                              bfd_print_symbol_all);
+         printf ("\n");
        }
-
-      printf ("\n");
       current++;
     }
   printf ("\n\n");
@@ -2562,10 +2567,12 @@ dump_bfd (bfd *abfd)
   if (dump_dynamic_symtab || dump_dynamic_reloc_info
       || (disassemble && bfd_get_dynamic_symtab_upper_bound (abfd) > 0))
     dynsyms = slurp_dynamic_symtab (abfd);
-  if (disassemble && dynsymcount > 0)
+  if (disassemble)
     {
-      synthcount = bfd_get_synthetic_symtab (abfd, dynsyms, &synthsyms);
-      if (synthcount < 0) synthcount = 0;
+      synthcount = bfd_get_synthetic_symtab (abfd, symcount, syms,
+                                            dynsymcount, dynsyms, &synthsyms);
+      if (synthcount < 0)
+       synthcount = 0;
     }
 
   if (dump_symtab)