Add arm64 support for Darwin to llvm-10 configs

Modified update.py to add arm64 for Darwin, then re-ran the script to update the configs. Note that due to an earlier change to update.py, this also removed the unsupported platforms from config files. This replicates the similar change made to llvm-7 here: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46029 Bug: b/152339534 Change-Id: Ib504e54cb99f3dac03a0dd3992db678d56b1b090 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46309Tested-by: Antonio Maiorano <amaiorano@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Add arm64 support for Darwin to llvm-10 configs
12345577 · Antonio Maiorano · a12f56ee · 12345577 · 12345577 · 12345577
Commit 12345577 authored Jul 09, 2020 by Antonio Maiorano
7 changed files
--- a/third_party/llvm-10.0/configs/darwin/include/llvm/Config/AsmParsers.def
+++ b/third_party/llvm-10.0/configs/darwin/include/llvm/Config/AsmParsers.def
@@ -27,18 +27,9 @@
 #if defined(__aarch64__)
 LLVM_ASM_PARSER(AArch64)
 #endif
-#if defined(__arm__)
-LLVM_ASM_PARSER(ARM)
-#endif
 #if defined(__i386__) || defined(__x86_64__)
 LLVM_ASM_PARSER(X86)
 #endif
-#if defined(__mips__)
-LLVM_ASM_PARSER(Mips)
-#endif
-#if defined(__powerpc64__)
-LLVM_ASM_PARSER(PowerPC)
-#endif


 #undef LLVM_ASM_PARSER
--- a/third_party/llvm-10.0/configs/darwin/include/llvm/Config/AsmPrinters.def
+++ b/third_party/llvm-10.0/configs/darwin/include/llvm/Config/AsmPrinters.def
@@ -27,18 +27,9 @@
 #if defined(__aarch64__)
 LLVM_ASM_PRINTER(AArch64)
 #endif
-#if defined(__arm__)
-LLVM_ASM_PRINTER(ARM)
-#endif
 #if defined(__i386__) || defined(__x86_64__)
 LLVM_ASM_PRINTER(X86)
 #endif
-#if defined(__mips__)
-LLVM_ASM_PRINTER(Mips)
-#endif
-#if defined(__powerpc64__)
-LLVM_ASM_PRINTER(PowerPC)
-#endif


 #undef LLVM_ASM_PRINTER
--- a/third_party/llvm-10.0/configs/darwin/include/llvm/Config/Disassemblers.def
+++ b/third_party/llvm-10.0/configs/darwin/include/llvm/Config/Disassemblers.def
@@ -27,18 +27,9 @@
 #if defined(__aarch64__)
 LLVM_DISASSEMBLER(AArch64)
 #endif
-#if defined(__arm__)
-LLVM_DISASSEMBLER(ARM)
-#endif
 #if defined(__i386__) || defined(__x86_64__)
 LLVM_DISASSEMBLER(X86)
 #endif
-#if defined(__mips__)
-LLVM_DISASSEMBLER(Mips)
-#endif
-#if defined(__powerpc64__)
-LLVM_DISASSEMBLER(PowerPC)
-#endif


 #undef LLVM_DISASSEMBLER
--- a/third_party/llvm-10.0/configs/darwin/include/llvm/Config/Targets.def
+++ b/third_party/llvm-10.0/configs/darwin/include/llvm/Config/Targets.def
@@ -26,18 +26,9 @@
 #if defined(__aarch64__)
 LLVM_TARGET(AArch64)
 #endif
-#if defined(__arm__)
-LLVM_TARGET(ARM)
-#endif
 #if defined(__i386__) || defined(__x86_64__)
 LLVM_TARGET(X86)
 #endif
-#if defined(__mips__)
-LLVM_TARGET(Mips)
-#endif
-#if defined(__powerpc64__)
-LLVM_TARGET(PowerPC)
-#endif


 #undef LLVM_TARGET
--- a/third_party/llvm-10.0/configs/darwin/include/llvm/Config/config.h
+++ b/third_party/llvm-10.0/configs/darwin/include/llvm/Config/config.h
@@ -296,6 +296,8 @@
 /* Doesn't use `cmakedefine` because it is allowed to be empty. */
 #if defined(__x86_64__)
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-apple-darwin"
+#elif defined(__aarch64__)
+#define LLVM_DEFAULT_TARGET_TRIPLE "arm64-apple-darwin"
 #else
 #error "unknown architecture"
 #endif

--- a/third_party/llvm-10.0/configs/darwin/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-10.0/configs/darwin/include/llvm/Config/llvm-config.h
@@ -30,6 +30,8 @@
 /* Target triple LLVM will generate code for by default */
 #if defined(__x86_64__)
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-apple-darwin"
+#elif defined(__aarch64__)
+#define LLVM_DEFAULT_TARGET_TRIPLE "arm64-apple-darwin"
 #else
 #error "unknown architecture"
 #endif
@@ -43,6 +45,8 @@
 /* Host triple LLVM will be executed on */
 #if defined(__x86_64__)
 #define LLVM_HOST_TRIPLE "x86_64-apple-darwin"
+#elif defined(__aarch64__)
+#define LLVM_HOST_TRIPLE "arm64-apple-darwin"
 #else
 #error "unknown architecture"
 #endif

--- a/third_party/llvm-10.0/scripts/update.py
+++ b/third_party/llvm-10.0/scripts/update.py
@@ -67,6 +67,7 @@ LLVM_TRIPLES = {
    ],
    'darwin': [
        ('__x86_64__', 'x86_64-apple-darwin'),
+        ('__aarch64__', 'arm64-apple-darwin'),
    ],
    'windows': [
        ('__x86_64__', 'x86_64-pc-win32'),