X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fobjdump.c;h=6a1f142a0ebc8f354c2999ba3c5d91aa8148554f;hb=229a22cfd2fd3c82a1b57d4af104f361cb0b0a33;hp=115f1fc000421d723230747990bff3597ea8b0dd;hpb=955ff7fcf8ddc90200819a184380c64c27b76e91;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/objdump.c b/binutils/objdump.c
index 115f1fc000..6a1f142a0e 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -2975,44 +2975,8 @@ dump_dwarf (bfd *abfd)
       return;
     }
 
-  eh_addr_size = bfd_arch_bits_per_address (abfd) / 8;
-
   switch (bfd_get_arch (abfd))
     {
-    case bfd_arch_i386:
-      switch (bfd_get_mach (abfd))
-	{
-	case bfd_mach_x86_64:
-	case bfd_mach_x86_64_intel_syntax:
-	case bfd_mach_x86_64_nacl:
-	case bfd_mach_x64_32:
-	case bfd_mach_x64_32_intel_syntax:
-	case bfd_mach_x64_32_nacl:
-	  init_dwarf_regnames_x86_64 ();
-	  break;
-
-	default:
-	  init_dwarf_regnames_i386 ();
-	  break;
-	}
-      break;
-
-    case bfd_arch_iamcu:
-      init_dwarf_regnames_iamcu ();
-      break;
-
-    case bfd_arch_aarch64:
-      init_dwarf_regnames_aarch64();
-      break;
-
-    case bfd_arch_s390:
-      init_dwarf_regnames_s390 ();
-      break;
-
-    case bfd_arch_riscv:
-      init_dwarf_regnames_riscv ();
-      break;
-
     case bfd_arch_s12z:
       /* S12Z has a 24 bit address space.  But the only known
 	 producer of dwarf_info encodes addresses into 32 bits.  */
@@ -3020,9 +2984,13 @@ dump_dwarf (bfd *abfd)
       break;
 
     default:
+      eh_addr_size = bfd_arch_bits_per_address (abfd) / 8;
       break;
     }
 
+  init_dwarf_regnames_by_bfd_arch_and_mach (bfd_get_arch (abfd),
+					    bfd_get_mach (abfd));
+
   bfd_map_over_sections (abfd, dump_dwarf_section, NULL);
 }