From d80285301a6a55f4f3bb4fbf4df1d20d91b0ee24 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 26 Mar 2014 10:40:06 +0100 Subject: [PATCH] Mach-O: Add BFD_MACH_O_CPU_TYPE_ARM64. include/mach-o/ * loader.h (bfd_mach_o_cpu_type): Add BFD_MACH_O_CPU_TYPE_ARM64. bfd/ * mach-o.c (bfd_mach_o_convert_architecture): Add BFD_MACH_O_CPU_TYPE_ARM64. binutils/ * od-macho.c (bfd_mach_o_cpu_name): Add BFD_MACH_O_CPU_TYPE_ARM64. --- bfd/ChangeLog | 5 +++++ bfd/mach-o.c | 4 ++++ binutils/ChangeLog | 4 ++++ binutils/od-macho.c | 1 + include/mach-o/ChangeLog | 6 +++++- include/mach-o/loader.h | 8 ++++++-- 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 01935536abf..aaba40691ee 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2014-03-26 Tristan Gingold + + * mach-o.c (bfd_mach_o_convert_architecture): Add + BFD_MACH_O_CPU_TYPE_ARM64. + 2014-03-26 Alan Modra * elf64-ppc.c (ppc64_elf_check_relocs): Account for possibly diff --git a/bfd/mach-o.c b/bfd/mach-o.c index c77520a6654..62376020215 100644 --- a/bfd/mach-o.c +++ b/bfd/mach-o.c @@ -905,6 +905,10 @@ bfd_mach_o_convert_architecture (bfd_mach_o_cpu_type mtype, *type = bfd_arch_powerpc; *subtype = bfd_mach_ppc64; break; + case BFD_MACH_O_CPU_TYPE_ARM64: + *type = bfd_arch_aarch64; + *subtype = bfd_mach_aarch64; + break; default: *type = bfd_arch_unknown; break; diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 98ecae0da7a..0d9648c1bb5 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2014-03-26 Tristan Gingold + + * od-macho.c (bfd_mach_o_cpu_name): Add BFD_MACH_O_CPU_TYPE_ARM64. + 2014-03-24 Tristan Gingold * od-macho.c (dump_unwind_encoding_x86): Set the factor. diff --git a/binutils/od-macho.c b/binutils/od-macho.c index 3cd2cf0f148..6f881129b6e 100644 --- a/binutils/od-macho.c +++ b/binutils/od-macho.c @@ -99,6 +99,7 @@ static const bfd_mach_o_xlat_name bfd_mach_o_cpu_name[] = { "powerpc", BFD_MACH_O_CPU_TYPE_POWERPC }, { "powerpc_64", BFD_MACH_O_CPU_TYPE_POWERPC_64 }, { "x86_64", BFD_MACH_O_CPU_TYPE_X86_64 }, + { "arm64", BFD_MACH_O_CPU_TYPE_ARM64 }, { NULL, 0} }; diff --git a/include/mach-o/ChangeLog b/include/mach-o/ChangeLog index c4a4a2c300f..3624f8ac330 100644 --- a/include/mach-o/ChangeLog +++ b/include/mach-o/ChangeLog @@ -1,3 +1,7 @@ +2014-03-26 Tristan Gingold + + * loader.h (bfd_mach_o_cpu_type): Add BFD_MACH_O_CPU_TYPE_ARM64. + 2014-03-17 Tristan Gingold * unwind.h: New file. @@ -14,7 +18,7 @@ * loader.h (bfd_mach_o_load_command_type): Add BFD_MACH_O_LC_MAIN, BFD_MACH_O_LC_DATA_IN_CODE, - BFD_MACH_O_LC_SOURCE_VERSION and BFD_MACH_O_LC_DYLIB_CODE_SIGN_DRS. + BFD_MACH_O_LC_SOURCE_VERSION and BFD_MACH_O_LC_DYLIB_CODE_SIGN_DRS. (BFD_MACH_O_REFERENCE_MASK): Adjust value. (BFD_MACH_O_N_REF_TO_WEAK): New definition. (BFD_MACH_O_N_ARM_THUMB_DEF, BFD_MACH_O_N_SYMBOL_RESOLVER): Likewise. diff --git a/include/mach-o/loader.h b/include/mach-o/loader.h index f7b2b42c361..952346d6e60 100644 --- a/include/mach-o/loader.h +++ b/include/mach-o/loader.h @@ -48,8 +48,12 @@ typedef enum bfd_mach_o_cpu_type BFD_MACH_O_CPU_TYPE_I860 = 15, BFD_MACH_O_CPU_TYPE_ALPHA = 16, BFD_MACH_O_CPU_TYPE_POWERPC = 18, - BFD_MACH_O_CPU_TYPE_POWERPC_64 = (BFD_MACH_O_CPU_TYPE_POWERPC | BFD_MACH_O_CPU_IS64BIT), - BFD_MACH_O_CPU_TYPE_X86_64 = (BFD_MACH_O_CPU_TYPE_I386 | BFD_MACH_O_CPU_IS64BIT) + BFD_MACH_O_CPU_TYPE_POWERPC_64 = + (BFD_MACH_O_CPU_TYPE_POWERPC | BFD_MACH_O_CPU_IS64BIT), + BFD_MACH_O_CPU_TYPE_X86_64 = + (BFD_MACH_O_CPU_TYPE_I386 | BFD_MACH_O_CPU_IS64BIT), + BFD_MACH_O_CPU_TYPE_ARM64 = + (BFD_MACH_O_CPU_TYPE_ARM | BFD_MACH_O_CPU_IS64BIT) } bfd_mach_o_cpu_type; -- 2.30.2