case bfd_arch_powerpc:
return bfd_default_compatible (a, b);
case bfd_arch_rs6000:
- if (a->mach == 0)
+ if (b->mach == bfd_mach_rs6k)
return a;
return NULL;
}
const bfd_arch_info_type bfd_powerpc_archs[] =
{
-#if BFD_DEFAULT_TARGET_SIZE == 64 /* default arch must come first. */
+#if BFD_DEFAULT_TARGET_SIZE == 64
+ /* Default arch must come first. */
{
64, /* 64 bits in a word */
64, /* 64 bits in an address */
"powerpc",
"powerpc:common64",
3,
- true, /* default for 64 bit target */
+ TRUE, /* default for 64 bit target */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[1]
},
+ /* elf32-ppc:ppc_elf_object_p relies on the default 32 bit arch
+ being immediately after the 64 bit default. */
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
"powerpc",
"powerpc:common",
3,
- false,
+ FALSE,
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[2],
},
#else
+ /* Default arch must come first. */
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
"powerpc",
"powerpc:common",
3,
- true, /* default for 32 bit target */
+ TRUE, /* default for 32 bit target */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[1],
},
+ /* elf64-ppc:ppc64_elf_object_p relies on the default 64 bit arch
+ being immediately after the 32 bit default. */
{
64, /* 64 bits in a word */
64, /* 64 bits in an address */
"powerpc",
"powerpc:common64",
3,
- false,
+ FALSE,
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[2]
"powerpc",
"powerpc:603",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[3]
"powerpc",
"powerpc:EC603e",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[4]
"powerpc",
"powerpc:604",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[5]
"powerpc",
"powerpc:403",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[6]
"powerpc",
"powerpc:601",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[7]
"powerpc",
"powerpc:620",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[8]
"powerpc",
"powerpc:630",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[9]
"powerpc",
"powerpc:a35",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[10]
"powerpc",
"powerpc:rs64ii",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[11]
"powerpc",
"powerpc:rs64iii",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[12]
"powerpc",
"powerpc:7400",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
&bfd_powerpc_archs[13]
},
+ {
+ 32, /* 32 bits in a word */
+ 32, /* 32 bits in an address */
+ 8, /* 8 bits in a byte */
+ bfd_arch_powerpc,
+ bfd_mach_ppc_e500,
+ "powerpc",
+ "powerpc:e500",
+ 3,
+ FALSE,
+ powerpc_compatible,
+ bfd_default_scan,
+ &bfd_powerpc_archs[14]
+ },
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
"powerpc",
"powerpc:MPC8XX",
3,
- false, /* not the default */
+ FALSE, /* not the default */
powerpc_compatible,
bfd_default_scan,
0