* dwarf.c (init_dwarf_regnames_i386, init_dwarf_regnames_x86_64): New.

	(init_dwarf_regnames): Use them.
	* dwarf.h: Declare them.
	* objdump.c (dump_dwarf): Use bfd_get_arch + bfd_get_mach to set up
	the regnames, rather than using elf_machine_code.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index ed4030a8e28ed5b04f4cbaa68d62351ea9c8ddc4..c3f12785cdc5925df77017428b0fd3084b922a07 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,4 +1,12 @@
-2010-08-23  Richard Henderson  <rth@redhat.com>
+2010-09-02  Richard Henderson  <rth@redhat.com>
+
+       * dwarf.c (init_dwarf_regnames_i386, init_dwarf_regnames_x86_64): New.
+       (init_dwarf_regnames): Use them.
+       * dwarf.h: Declare them.
+       * objdump.c (dump_dwarf): Use bfd_get_arch + bfd_get_mach to set up
+       the regnames, rather than using elf_machine_code.
+
+2010-09-02  Richard Henderson  <rth@redhat.com>
 
        * objdump.c (dump_dwarf): Use bfd_arch_bits_per_address.
 

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 84e22eb713e911d25d9127c100aa93253492f5ac..1d2679befcd670afe39648e11a3b31b734be6d03 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -3961,6 +3961,13 @@ static const char *const dwarf_regnames_i386[] =
   "tr", "ldtr"
 };
 
+void
+init_dwarf_regnames_i386 (void)
+{
+  dwarf_regnames = dwarf_regnames_i386;
+  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_i386);
+}
+
 static const char *const dwarf_regnames_x86_64[] =
 {
   "rax", "rdx", "rcx", "rbx",
@@ -3983,6 +3990,13 @@ static const char *const dwarf_regnames_x86_64[] =
   "mxcsr", "fcw", "fsw"
 };
 
+void
+init_dwarf_regnames_x86_64 (void)
+{
+  dwarf_regnames = dwarf_regnames_x86_64;
+  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_x86_64);
+}
+
 void
 init_dwarf_regnames (unsigned int e_machine)
 {
@@ -3990,14 +4004,12 @@ init_dwarf_regnames (unsigned int e_machine)
     {
     case EM_386:
     case EM_486:
-      dwarf_regnames = dwarf_regnames_i386;
-      dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_i386);
+      init_dwarf_regnames_i386 ();
       break;
 
     case EM_X86_64:
     case EM_L1OM:
-      dwarf_regnames = dwarf_regnames_x86_64;
-      dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_x86_64);
+      init_dwarf_regnames_x86_64 ();
       break;
 
     default:

diff --git a/binutils/dwarf.h b/binutils/dwarf.h
index 58ecc67b26627ba4dc23b301a821a192daa49c15..a9b501f3e7ea460dc369c3aecda86af2995f7541 100644 (file)
--- a/binutils/dwarf.h
+++ b/binutils/dwarf.h
@@ -122,6 +122,8 @@ extern int do_trace_aranges;
 extern int do_wide;
 
 extern void init_dwarf_regnames (unsigned int);
+extern void init_dwarf_regnames_i386 (void);
+extern void init_dwarf_regnames_x86_64 (void);
 
 extern int load_debug_section (enum dwarf_section_display_enum,
                               void *);

diff --git a/binutils/objdump.c b/binutils/objdump.c
index ca7741d6fc2027eb28ed83c82127a81d06579d8e..8e7d24d2900c05661581db72426e055699d1f63c 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -2349,10 +2349,24 @@ dump_dwarf (bfd *abfd)
   else
     abort ();
 
-  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+  switch (bfd_get_arch (abfd))
     {
-      const struct elf_backend_data *bed = get_elf_backend_data (abfd);
-      init_dwarf_regnames (bed->elf_machine_code);
+    case bfd_arch_i386:
+      switch (bfd_get_mach (abfd))
+       {
+       case bfd_mach_x86_64:
+       case bfd_mach_x86_64_intel_syntax:
+         init_dwarf_regnames_x86_64 ();
+         break;
+
+       default:
+         init_dwarf_regnames_i386 ();
+         break;
+       }
+      break;
+
+    default:
+      break;
     }
 
   bfd_map_over_sections (abfd, dump_dwarf_section, NULL);