9 files changed, 62 insertions, 1 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index a44b228334..2da5a19aeb 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -472,6 +472,14 @@ AC_ARG_WITH(default-cpu,
 AC_DEFINE_UNQUOTED([LLVM_DEFAULT_TARGET_MCPU],"$with_default_cpu",
   [Default cpu (-mcpu=cpu) to use to all compiler invocations.])
 
+dnl Default float abi to use to all compiler invocations
+AC_ARG_WITH(default-float,
+  AS_HELP_STRING([--with-default-float],
+  [Default float abi to use to all compiler invocations.]),,
+  with_default_float="")
+AC_DEFINE_UNQUOTED([LLVM_DEFAULT_TARGET_FLOAT],"$with_default_float",
+  [Default float abi to use 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 d8081ee6c8..46bb6110f7 100755
--- a/configure
+++ b/configure
@@ -1468,6 +1468,8 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-default-cpu      Add by default -mcpu=cpu to all compiler
                           invocations.
+  --with-default-float    Default float abi to use 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
@@ -4119,6 +4121,20 @@ _ACEOF
 
 
 
+# Check whether --with-default-float was given.
+if test "${with_default_float+set}" = set; then
+  withval=$with_default_float;
+else
+  with_default_float=""
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define LLVM_DEFAULT_TARGET_FLOAT "$with_default_float"
+_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; }
@@ -10622,7 +10638,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10625 "configure"
+#line 10641 "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 d91022829f..2e724af328 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}"
 
+/* Default float abi to use to all compiler invocations. */
+#cmakedefine LLVM_DEFAULT_TARGET_FLOAT "${LLVM_DEFAULT_TARGET_FLOAT}"
+
 /* Default cpu (-mcpu=cpu) to use to all compiler invocations. */
 #cmakedefine LLVM_DEFAULT_TARGET_MCPU "${LLVM_DEFAULT_TARGET_MCPU}"
 
diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
index f147abbb5d..e262e6ca32 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
 
+/* Default float abi to use to all compiler invocations. */
+#undef LLVM_DEFAULT_TARGET_FLOAT
+
 /* Default cpu (-mcpu=cpu) to use to all compiler invocations. */
 #undef LLVM_DEFAULT_TARGET_MCPU
 
diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake
index be6338c40c..8a30abf8a7 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}"
 
+/* Default float abi to use to all compiler invocations. */
+#cmakedefine LLVM_DEFAULT_TARGET_FLOAT "${LLVM_DEFAULT_TARGET_FLOAT}"
+
 /* Default cpu (-mcpu=cpu) to use to all compiler invocations. */
 #cmakedefine LLVM_DEFAULT_TARGET_MCPU "${LLVM_DEFAULT_TARGET_MCPU}"
 
diff --git a/include/llvm/Config/llvm-config.h.in b/include/llvm/Config/llvm-config.h.in
index 18fdf3fe84..4e066e8421 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
 
+/* Default float abi to use to all compiler invocations. */
+#undef LLVM_DEFAULT_TARGET_FLOAT
+
 /* Default cpu (-mcpu=cpu) to use to all compiler invocations. */
 #undef LLVM_DEFAULT_TARGET_MCPU
 
diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h
index 192fbd4d64..9a17fb89e6 100644
--- a/include/llvm/Support/Host.h
+++ b/include/llvm/Support/Host.h
@@ -54,6 +54,15 @@ namespace sys {
   /// generate by default code for a given target cpu and false otherwise.
   bool hasDefaultTargetCpu();
 
+  /// getDefaultTargetFloat() - Return the default target float abi for which
+  /// the compiler is configured to generate code for, or "" if empty.
+  std::string getDefaultTargetFloat();
+
+  /// hasDefaultTargetFloat() - Return true if the compiler was configured to
+  /// generate by default code for a given floating point abi and false
+  /// otherwise.
+  bool hasDefaultTargetFloat();
+
   /// 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 d272ac813d..261a495c1b 100644
--- a/lib/Support/Unix/Host.inc
+++ b/lib/Support/Unix/Host.inc
@@ -69,3 +69,11 @@ std::string sys::getDefaultTargetCpu() {
 bool sys::hasDefaultTargetCpu() {
  return getDefaultTargetCpu() != "";
 }
+
+std::string sys::getDefaultTargetFloat() {
+  return LLVM_DEFAULT_TARGET_FLOAT;
+}
+
+bool sys::hasDefaultTargetFloat() {
+  return getDefaultTargetFloat() != "";
+}
diff --git a/lib/Support/Windows/Host.inc b/lib/Support/Windows/Host.inc
index ae7e9ef9ed..e2a1c64c70 100644
--- a/lib/Support/Windows/Host.inc
+++ b/lib/Support/Windows/Host.inc
@@ -28,3 +28,11 @@ std::string sys::getDefaultTargetCpu() {
 bool sys::hasDefaultTargetCpu() {
   return getDefaultTargetCpu() != "";
 }
+
+std::string sys::getDefaultTargetFloat() {
+  return LLVM_DEFAULT_TARGET_FLOAT;
+}
+
+bool sys::hasDefaultTargetFloat() {
+  return getDefaultTargetFloat() != "";
+}