diff options
| author | Tim Murray <timmurray@google.com> | 2014-03-17 11:43:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-17 11:43:04 -0700 |
| commit | 15492aa781bfda21531c05562e138e16657d37b9 (patch) | |
| tree | 1c782022aeb5ca9e1236aecfd6a71853825d62e8 | |
| parent | 91cda01e1343429d296a9cdd46e13d64c988d525 (diff) | |
| parent | 4afc3292eec5c576c091dee244b92bc60f61f692 (diff) | |
| download | external_llvm-15492aa781bfda21531c05562e138e16657d37b9.zip external_llvm-15492aa781bfda21531c05562e138e16657d37b9.tar.gz external_llvm-15492aa781bfda21531c05562e138e16657d37b9.tar.bz2 | |
am 4afc3292: Merge "Enable x86_64 build"
* commit '4afc3292eec5c576c091dee244b92bc60f61f692':
Enable x86_64 build
| -rw-r--r-- | device/include/llvm/Config/AsmParsers.def | 2 | ||||
| -rw-r--r-- | device/include/llvm/Config/AsmPrinters.def | 2 | ||||
| -rw-r--r-- | device/include/llvm/Config/Disassemblers.def | 2 | ||||
| -rw-r--r-- | device/include/llvm/Config/Targets.def | 2 | ||||
| -rw-r--r-- | llvm.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/device/include/llvm/Config/AsmParsers.def b/device/include/llvm/Config/AsmParsers.def index cf6b221..ca3af2c 100644 --- 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 --- 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 --- 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 --- 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) @@ -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 |