Merge "Add platform support for building LLVMgold.so in LLVM."

diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h
index a1978a8..7b6dcb5 100644 (file)
--- a/host/include/llvm/Config/config.h
+++ b/host/include/llvm/Config/config.h
@@ -586,7 +586,7 @@
 #define LLVM_DATADIR "/opt/llvm-android/share/llvm"
 
 /* Target triple LLVM will generate code for by default */
-#define LLVM_DEFAULT_TARGET_TRIPLE "i386-unknown-linux"
+#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux"
 
 /* Installation directory for documentation */
 #define LLVM_DOCSDIR "/opt/llvm-android/share/doc/llvm"

diff --git a/host/include/llvm/Config/llvm-config.h b/host/include/llvm/Config/llvm-config.h
index 6cb218e..393967e 100644 (file)
--- a/host/include/llvm/Config/llvm-config.h
+++ b/host/include/llvm/Config/llvm-config.h
@@ -27,7 +27,7 @@
 #define LLVM_DATADIR "/opt/llvm-android/share/llvm"
 
 /* Target triple LLVM will generate code for by default */
-#define LLVM_DEFAULT_TARGET_TRIPLE "i386-unknown-linux"
+#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux"
 
 /* Installation directory for documentation */
 #define LLVM_DOCSDIR "/opt/llvm-android/share/doc/llvm"