Enable x86_64 build

Change-Id: I9feecd151ab91351c42e230df4eb3aa3af76799a

diff --git a/device/include/llvm/Config/AsmParsers.def b/device/include/llvm/Config/AsmParsers.def
index cf6b221..ca3af2c 100644 (file)
--- a/device/include/llvm/Config/AsmParsers.def
+++ b/device/include/llvm/Config/AsmParsers.def
@@ -28,7 +28,7 @@
   LLVM_ASM_PARSER(ARM)
 #elif defined(__mips__)
   LLVM_ASM_PARSER(Mips)
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
   LLVM_ASM_PARSER(X86)
 #elif defined(__aarch64__)
   LLVM_ASM_PARSER(AArch64)

diff --git a/device/include/llvm/Config/AsmPrinters.def b/device/include/llvm/Config/AsmPrinters.def
index 57502f1..3a396c2 100644 (file)
--- a/device/include/llvm/Config/AsmPrinters.def
+++ b/device/include/llvm/Config/AsmPrinters.def
@@ -28,7 +28,7 @@
   LLVM_ASM_PRINTER(ARM)
 #elif defined(__mips__)
   LLVM_ASM_PRINTER(Mips)
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
   LLVM_ASM_PRINTER(X86)
 #elif defined(__aarch64__)
   LLVM_ASM_PRINTER(AArch64)

diff --git a/device/include/llvm/Config/Disassemblers.def b/device/include/llvm/Config/Disassemblers.def
index 3f135e4..aba88f8 100644 (file)
--- a/device/include/llvm/Config/Disassemblers.def
+++ b/device/include/llvm/Config/Disassemblers.def
@@ -28,7 +28,7 @@
   LLVM_DISASSEMBLER(ARM)
 #elif defined(__mips__)
   LLVM_DISASSEMBLER(Mips)
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
   LLVM_DISASSEMBLER(X86)
 #elif defined(__aarch64__)
   LLVM_DISASSEMBLER(AArch64)

diff --git a/device/include/llvm/Config/Targets.def b/device/include/llvm/Config/Targets.def
index 8a08894..f30c81f 100644 (file)
--- a/device/include/llvm/Config/Targets.def
+++ b/device/include/llvm/Config/Targets.def
@@ -27,7 +27,7 @@
   LLVM_TARGET(ARM)
 #elif defined(__mips__)
   LLVM_TARGET(Mips)
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
   LLVM_TARGET(X86)
 #elif defined(__aarch64__)
   LLVM_TARGET(AArch64)

diff --git a/llvm.mk b/llvm.mk
index 1047632..073ceb7 100644 (file)
--- a/llvm.mk
+++ b/llvm.mk
@@ -8,4 +8,4 @@ LLVM_DEVICE_BUILD_MK := $(LLVM_ROOT_PATH)/llvm-device-build.mk
 LLVM_GEN_INTRINSICS_MK := $(LLVM_ROOT_PATH)/llvm-gen-intrinsics.mk
 LLVM_TBLGEN_RULES_MK := $(LLVM_ROOT_PATH)/llvm-tblgen-rules.mk
 
-LLVM_SUPPORTED_ARCH := arm mips x86 arm64
+LLVM_SUPPORTED_ARCH := arm arm64 mips x86 x86_64