71c71
< #define PPC_HIGHER(v) (((v) >> 32) & 0xffff)
---
> #define PPC_HIGHER(v) (((v) >> 16 >> 16) & 0xffff)
78c78
< #define PPC_HIGHEST(v) (((v) >> 48) & 0xffff)
---
> #define PPC_HIGHEST(v) (((v) >> 24 >> 24) & 0xffff)
855c855,861
< ppc_obj64 = 1;
---
> {
> #ifdef BFD64
> ppc_obj64 = 1;
> #else
> as_fatal (_("%s unsupported"), "-a64");
> #endif
> }
1065,1066c1071,1074
< if (strncmp (default_os, "aix", 3) == 0
< && default_os[3] >= '4' && default_os[3] <= '9')
---
> if (ppc_obj64)
> ppc_cpu = PPC_OPCODE_PPC | PPC_OPCODE_64;
> else if (strncmp (default_os, "aix", 3) == 0
> && default_os[3] >= '4' && default_os[3] <= '9')
1112c1120,1125
< return ppc_obj64 ? bfd_mach_ppc64 : bfd_mach_ppc;
---
> if (ppc_obj64)
> return bfd_mach_ppc64;
> else if (ppc_arch () == bfd_arch_rs6000)
> return bfd_mach_rs6k;
> else
> return bfd_mach_ppc;