9 files changed, 61 insertions, 1 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 7f62a66ff2..6a9718844d 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -503,6 +503,14 @@ fi
 AC_DEFINE_UNQUOTED([LLVM_DEFAULT_TARGET_HASHSTYLE],"$with_default_hash_style",
   [Default hash-style to use to all linker invocations.])
 
+dnl Default cpu (-mabi=abi) to use to all compiler invocations
+AC_ARG_WITH(default-abi,
+  AS_HELP_STRING([--with-default-abi],
+  [Add by default -mabi=abi (if --with-default-abi=abi) to all compiler invocations.]),,
+  with_default_abi="")
+AC_DEFINE_UNQUOTED([LLVM_DEFAULT_TARGET_ABI],"$with_default_abi",
+  [Add by default -mabi=abi to all compiler invocations.])
+
 dnl Check for the endianness of the target
 AC_C_BIGENDIAN(AC_SUBST([ENDIAN],[big]),AC_SUBST([ENDIAN],[little]))
 
diff --git a/configure b/configure
index ec4fab2de9..3d65fb18b3 100755
--- a/configure
+++ b/configure
@@ -1474,6 +1474,8 @@ Optional Packages:
                           case of hard float.
 
 Default hash-style to use to all linker invocations: gnu
+  --with-default-abi      Add by default -mabi=abi (if --with-default-abi=abi)
+                          to all compiler invocations.
   --with-optimize-option  Select the compiler options to use for optimized
                           builds
   --with-extra-options    Specify additional options to compile LLVM with
@@ -4179,6 +4181,20 @@ _ACEOF
 
 
 
+# Check whether --with-default-abi was given.
+if test "${with_default_abi+set}" = set; then
+  withval=$with_default_abi;
+else
+  with_default_abi=""
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define LLVM_DEFAULT_TARGET_ABI "$with_default_abi"
+_ACEOF
+
+
+
 
 { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
@@ -10682,7 +10698,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10685 "configure"
+#line 10701 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
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();
diff --git a/lib/Support/Unix/Host.inc b/lib/Support/Unix/Host.inc
index 5b55b4f0e9..28828eb83c 100644
--- a/lib/Support/Unix/Host.inc
+++ b/lib/Support/Unix/Host.inc
@@ -93,3 +93,11 @@ std::string sys::getDefaultTargetHashStyle() {
 bool sys::hasDefaultTargetHashStyle() {
   return getDefaultTargetHashStyle() != "";
 }
+
+std::string sys::getDefaultTargetAbi() {
+  return LLVM_DEFAULT_TARGET_ABI;
+}
+
+bool sys::hasDefaultTargetAbi() {
+  return getDefaultTargetAbi() != "";
+}
diff --git a/lib/Support/Windows/Host.inc b/lib/Support/Windows/Host.inc
index e48021ef6d..9ec5e0a348 100644
--- a/lib/Support/Windows/Host.inc
+++ b/lib/Support/Windows/Host.inc
@@ -52,3 +52,11 @@ std::string sys::getDefaultTargetHashStyle() {
 bool sys::hasDefaultTargetHashStyle() {
   return getDefaultTargetHashStyle() != "";
 }
+
+std::string sys::getDefaultTargetAbi() {
+  return LLVM_DEFAULT_TARGET_ABI;
+}
+
+bool sys::hasDefaultTargetAbi() {
+  return getDefaultTargetAbi() != "";
+}