#include "sysdep.h"
#include "libbfd.h"
-/* Don't mix 32 bit and 64 bit files. */
-
-static const bfd_arch_info_type *i386_compatible
- PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
-
-static const bfd_arch_info_type *
-i386_compatible (a, b)
- const bfd_arch_info_type *a;
- const bfd_arch_info_type *b;
-{
- if (a->bits_per_word != b->bits_per_word)
- return NULL;
-
- return bfd_default_compatible (a, b);
-}
-
const bfd_arch_info_type bfd_i386_arch_intel_syntax =
{
32, /* 32 bits in a word */
"i386:intel",
"i386:intel",
3,
- true,
- i386_compatible,
+ TRUE,
+ bfd_default_compatible,
bfd_default_scan ,
0,
};
8, /* 8 bits in a byte */
bfd_arch_i386,
bfd_mach_x86_64_intel_syntax,
- "x86-64:intel",
- "x86-64:intel",
+ "i386:intel",
+ "i386:x86-64:intel",
3,
- true,
- i386_compatible,
+ TRUE,
+ bfd_default_compatible,
bfd_default_scan ,
&bfd_i386_arch_intel_syntax,
};
"i8086",
"i8086",
3,
- false,
- i386_compatible,
+ FALSE,
+ bfd_default_compatible,
bfd_default_scan ,
&bfd_x86_64_arch_intel_syntax,
};
8, /* 8 bits in a byte */
bfd_arch_i386,
bfd_mach_x86_64,
- "x86-64",
- "x86-64",
+ "i386",
+ "i386:x86-64",
3,
- true,
- i386_compatible,
+ TRUE,
+ bfd_default_compatible,
bfd_default_scan ,
&i8086_arch,
};
"i386",
"i386",
3,
- true,
- i386_compatible,
+ TRUE,
+ bfd_default_compatible,
bfd_default_scan ,
&bfd_x86_64_arch
};