5 files changed, 20 insertions, 0 deletions
diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index 2e724af328..6967c8af16 100644
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -507,6 +507,9 @@
 /* Default float abi to use to all compiler invocations. */
 #cmakedefine LLVM_DEFAULT_TARGET_FLOAT "${LLVM_DEFAULT_TARGET_FLOAT}"
 
+/* Default FPU to use to all compiler invocations, in case of hard float. */
+#cmakedefine LLVM_DEFAULT_TARGET_FPU "${LLVM_DEFAULT_TARGET_FPU}"
+
 /* 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 e262e6ca32..d61e099c47 100644
--- a/include/llvm/Config/config.h.in
+++ b/include/llvm/Config/config.h.in
@@ -542,6 +542,9 @@
 /* Default float abi to use to all compiler invocations. */
 #undef LLVM_DEFAULT_TARGET_FLOAT
 
+/* Default FPU to use to all compiler invocations, in case of hard float. */
+#undef LLVM_DEFAULT_TARGET_FPU
+
 /* 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 8a30abf8a7..a1101d3604 100644
--- a/include/llvm/Config/llvm-config.h.cmake
+++ b/include/llvm/Config/llvm-config.h.cmake
@@ -28,6 +28,9 @@
 /* Default float abi to use to all compiler invocations. */
 #cmakedefine LLVM_DEFAULT_TARGET_FLOAT "${LLVM_DEFAULT_TARGET_FLOAT}"
 
+/* Default FPU to use to all compiler invocations, in case of hard float. */
+#cmakedefine LLVM_DEFAULT_TARGET_FPU "${LLVM_DEFAULT_TARGET_FPU}"
+
 /* 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 4e066e8421..04c1664d3e 100644
--- a/include/llvm/Config/llvm-config.h.in
+++ b/include/llvm/Config/llvm-config.h.in
@@ -28,6 +28,9 @@
 /* Default float abi to use to all compiler invocations. */
 #undef LLVM_DEFAULT_TARGET_FLOAT
 
+/* Default FPU to use to all compiler invocations, in case of hard float. */
+#undef LLVM_DEFAULT_TARGET_FPU
+
 /* 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 9a17fb89e6..637d8139e7 100644
--- a/include/llvm/Support/Host.h
+++ b/include/llvm/Support/Host.h
@@ -63,6 +63,14 @@ namespace sys {
   /// otherwise.
   bool hasDefaultTargetFloat();
 
+  /// getDefaultTargetFpu() - Return the default target FPU for which the
+  /// compiler is configured to generate code for, or "" if empty.
+  std::string getDefaultTargetFpu();
+
+  /// hasDefaultTargetFpu() - Return true if the compiler was configured to
+  /// generate by default code for a given FPU and false otherwise.
+  bool hasDefaultTargetFpu();
+
   /// 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();