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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 01935536abfc03d3fb7798ef38409976beedcb44..aaba40691eeeaacada4137d702addefc0894d3c6 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-26  Tristan Gingold  <gingold@adacore.com>
+
+       * mach-o.c (bfd_mach_o_convert_architecture): Add
+       BFD_MACH_O_CPU_TYPE_ARM64.
+
 2014-03-26  Alan Modra  <amodra@gmail.com>
 
        * elf64-ppc.c (ppc64_elf_check_relocs): Account for possibly

diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index c77520a66544e71beb79a11c467fe013126cd9ac..62376020215bb41b873df5c38f8bc66c583ba8f0 100644 (file)
--- 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 98ecae0da7a094915b131744f992395099ef42ab..0d9648c1bb5d8e755c329a1068de0cd8a42feceb 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-26  Tristan Gingold  <gingold@adacore.com>
+
+       * od-macho.c (bfd_mach_o_cpu_name): Add BFD_MACH_O_CPU_TYPE_ARM64.
+
 2014-03-24  Tristan Gingold  <gingold@adacore.com>
 
        * od-macho.c (dump_unwind_encoding_x86): Set the factor.

diff --git a/binutils/od-macho.c b/binutils/od-macho.c
index 3cd2cf0f148b0e377f14124b2d53ae3cc15adb31..6f881129b6ed22c5f25c2a1961b42b2cb0890286 100644 (file)
--- 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 c4a4a2c300f0ef8076c58bca1fdecca12b91b46d..3624f8ac330b4598303886f21dab79126ae7731f 100644 (file)
--- a/include/mach-o/ChangeLog
+++ b/include/mach-o/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-26  Tristan Gingold  <gingold@adacore.com>
+
+       * loader.h (bfd_mach_o_cpu_type): Add BFD_MACH_O_CPU_TYPE_ARM64.
+
 2014-03-17  Tristan Gingold  <gingold@adacore.com>
 
        * 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 f7b2b42c3618ab3ecb64e27b86e04de94dfd4563..952346d6e60a887c692f75cd4dbf668c0d23fee8 100644 (file)
--- 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;