* cpu-h8300.c: Make default h8300 machine first in machine list.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c4b7cc71b008d4fffe3aa42a52131f951cfa44c6..b96730ba7906373f95bfc86a46d04673af222831 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-29  Andrey Volkov  <avolkov@transas.com>
+
+       * cpu-h8300.c: Make default h8300 machine first in machine list.
+
 2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
 
        * config.bfd: Added DLX configuraton.

diff --git a/bfd/cpu-h8300.c b/bfd/cpu-h8300.c
index 07beae5c1b51fc63e961dc4a6f0128f38049daed..10ca3fdfc2b8b9e9d3447296f0f82d9edb0a8df1 100644 (file)
--- a/bfd/cpu-h8300.c
+++ b/bfd/cpu-h8300.c
@@ -97,23 +97,20 @@ compatible (in, out)
     return in;
 }
 
-static const bfd_arch_info_type h8300_info_struct =
+static const bfd_arch_info_type h8300s_info_struct =
 {
-  16,                          /* 16 bits in a word */
-  16,                          /* 16 bits in an address */
+  32,                          /* 32 bits in a word */
+  32,                          /* 32 bits in an address */
   8,                           /* 8 bits in a byte */
   bfd_arch_h8300,
-  bfd_mach_h8300,
-  "h8300",                     /* arch_name  */
-  "h8300",                     /* printable name */
+  bfd_mach_h8300s,
+  "h8300s",                    /* arch_name  */
+  "h8300s",                    /* printable name */
   1,
-  true,                                /* the default machine */
+  false,                       /* the default machine */
   compatible,
   h8300_scan,
-#if 0
-  local_bfd_reloc_type_lookup,
-#endif
-  0,
+  0
 };
 
 static const bfd_arch_info_type h8300h_info_struct =
@@ -129,27 +126,21 @@ static const bfd_arch_info_type h8300h_info_struct =
   false,                       /* the default machine */
   compatible,
   h8300_scan,
-#if 0
-  local_bfd_reloc_type_lookup,
-#endif
-  &h8300_info_struct,
+  &h8300s_info_struct
 };
 
 const bfd_arch_info_type bfd_h8300_arch =
 {
-  32,                          /* 32 bits in a word */
-  32,                          /* 32 bits in an address */
+  16,                          /* 16 bits in a word */
+  16,                          /* 16 bits in an address */
   8,                           /* 8 bits in a byte */
   bfd_arch_h8300,
-  bfd_mach_h8300s,
-  "h8300s",                    /* arch_name  */
-  "h8300s",                    /* printable name */
+  bfd_mach_h8300,
+  "h8300",                     /* arch_name  */
+  "h8300",                     /* printable name */
   1,
-  false,                       /* the default machine */
+  true,                                /* the default machine */
   compatible,
   h8300_scan,
-#if 0
-  local_bfd_reloc_type_lookup,
-#endif
-  &h8300h_info_struct,
+  &h8300h_info_struct
 };