* archures.c (enum bfd_architecture): #define constants for

PowerPc and RS6000 machine numbers.
	* bfd-in2.h: Regenerate.
	* coffcode.h (coff_set_arch_mach_hook): #ifdef XCOFF64, set arch
	to bfd_arch_powerpc instead of bfd_arch_rs6000.  Refer to PowerPc
	and RS6000 machine numbers using #defined constants from
	archures.c.
	* cpu-powerpc.c (arch_info_struct): Refer to PowerPc and RS6000
	machine numbers using #defined constants from archures.c.  Add
	entries for EC603e, 630, A35, RS64II, RS64III, 7400.  Specify
	64-bit words in 620 entry.
	* cpu-rs6000.c (arch_info_struct): Create with entries for RS1,
	RSC, and RS2.
	(bfd_rs6000_arch): Change default machine to 0 (bfd_mach_rs6k).
This commit is contained in:
Nicholas Duffek
2000-06-16 20:45:33 +00:00
parent a2fdf27064
commit 87f33987cd
6 changed files with 214 additions and 23 deletions

View File

@@ -1966,32 +1966,33 @@ coff_set_arch_mach_hook (abfd, filehdr)
(because that's how they were bootstrapped originally),
but they are always PowerPC architecture. */
arch = bfd_arch_powerpc;
machine = 0;
machine = bfd_mach_ppc;
#else
#ifdef XCOFF64
arch = bfd_arch_powerpc;
machine = bfd_mach_ppc_620;
#else
arch = bfd_arch_rs6000;
#ifdef XCOFF64
machine = 620;
#else
machine = 6000;
machine = bfd_mach_rs6k;
#endif
#endif /* POWERMAC */
break;
case 1:
arch = bfd_arch_powerpc;
machine = 601;
machine = bfd_mach_ppc_601;
break;
case 2: /* 64 bit PowerPC */
arch = bfd_arch_powerpc;
machine = 620;
machine = bfd_mach_ppc_620;
break;
case 3:
arch = bfd_arch_powerpc;
machine = 0;
machine = bfd_mach_ppc;
break;
case 4:
arch = bfd_arch_rs6000;
machine = 6000;
machine = bfd_mach_rs6k;
break;
}
}
@@ -2698,7 +2699,8 @@ coff_set_flags (abfd, magicp, flagsp)
case bfd_arch_powerpc:
#endif
#ifdef XCOFF64
if (bfd_get_mach (abfd) == 620 && !strncmp (abfd->xvec->name,"aix", 3))
if (bfd_get_mach (abfd) == bfd_mach_ppc_620
&& !strncmp (abfd->xvec->name,"aix", 3))
*magicp = U803XTOCMAGIC;
else
#else