5 files changed, 20 insertions, 0 deletions
diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index ff1de7f484..c8aca052eb 100644
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -504,6 +504,9 @@
 /* Installation directory for data files */
 #cmakedefine LLVM_DATADIR "${LLVM_DATADIR}"
 
+/* Add by default -mabi=abi to all compiler invocations. */
+#cmakedefine LLVM_DEFAULT_TARGET_ABI "${LLVM_DEFAULT_TARGET_ABI}"
+
 /* Default float abi to use to all compiler invocations. */
 #cmakedefine LLVM_DEFAULT_TARGET_FLOAT "${LLVM_DEFAULT_TARGET_FLOAT}"
 
diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
index 2a5917123c..5018a515be 100644
--- a/include/llvm/Config/config.h.in
+++ b/include/llvm/Config/config.h.in
@@ -539,6 +539,9 @@
 /* Installation directory for data files */
 #undef LLVM_DATADIR
 
+/* Add by default -mabi=abi to all compiler invocations. */
+#undef LLVM_DEFAULT_TARGET_ABI
+
 /* Default float abi to use to all compiler invocations. */
 #undef LLVM_DEFAULT_TARGET_FLOAT
 
diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake
index bb66f01bd7..4b582da365 100644
--- a/include/llvm/Config/llvm-config.h.cmake
+++ b/include/llvm/Config/llvm-config.h.cmake
@@ -25,6 +25,9 @@
 /* Installation directory for data files */
 #cmakedefine LLVM_DATADIR "${LLVM_DATADIR}"
 
+/* Add by default -mabi=abi to all compiler invocations. */
+#cmakedefine LLVM_DEFAULT_TARGET_ABI "${LLVM_DEFAULT_TARGET_ABI}"
+
 /* Default float abi to use to all compiler invocations. */
 #cmakedefine LLVM_DEFAULT_TARGET_FLOAT "${LLVM_DEFAULT_TARGET_FLOAT}"
 
diff --git a/include/llvm/Config/llvm-config.h.in b/include/llvm/Config/llvm-config.h.in
index 8515e5ba57..4482da4f17 100644
--- a/include/llvm/Config/llvm-config.h.in
+++ b/include/llvm/Config/llvm-config.h.in
@@ -25,6 +25,9 @@
 /* Installation directory for data files */
 #undef LLVM_DATADIR
 
+/* Add by default -mabi=abi to all compiler invocations. */
+#undef LLVM_DEFAULT_TARGET_ABI
+
 /* Default float abi to use to all compiler invocations. */
 #undef LLVM_DEFAULT_TARGET_FLOAT
 
diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h
index ceb44ce6f3..83ea87bf74 100644
--- a/include/llvm/Support/Host.h
+++ b/include/llvm/Support/Host.h
@@ -79,6 +79,14 @@ namespace sys {
   /// to generate by default code with a given hash-style and false otherwise.
   bool hasDefaultTargetHashStyle();
 
+  /// getDefaultTargetAbi() - Return the default target ABI for which the
+  /// compiler is configured to generate code for, or "" if empty.
+  std::string getDefaultTargetAbi();
+
+  /// hasDefaultTargetAbi() - Return true if the compiler was configured to
+  /// generate code for a given ABI and false otherwise.
+  bool hasDefaultTargetAbi();
+
   /// getProcessTriple() - Return an appropriate target triple for generating
   /// code to be loaded into the current process, e.g. when using the JIT.
   std::string getProcessTriple();