diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index c4a80dd..66433c9 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -3530,14 +3530,15 @@
 
   virtual void getArchDefines(const LangOptions &Opts,
                               MacroBuilder &Builder) const {
-    if (SoftFloat)
-      Builder.defineMacro("__mips_soft_float", Twine(1));
-    else if (SingleFloat)
-      Builder.defineMacro("__mips_single_float", Twine(1));
-    else if (!SoftFloat && !SingleFloat)
-      Builder.defineMacro("__mips_hard_float", Twine(1));
-    else
+    if (SoftFloat && SingleFloat)
       llvm_unreachable("Invalid float ABI for Mips.");
+    else if (SoftFloat)
+      Builder.defineMacro("__mips_soft_float", Twine(1));
+    else {
+      Builder.defineMacro("__mips_hard_float", Twine(1));
+      if (SingleFloat)
+        Builder.defineMacro("__mips_single_float", Twine(1));
+    }
 
     Builder.defineMacro("_MIPS_SZPTR", Twine(getPointerWidth(0)));
     Builder.defineMacro("_MIPS_SZINT", Twine(getIntWidth()));
diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c
index 4d5c36c..8af1ccd 100644
--- a/test/Preprocessor/init.c
+++ b/test/Preprocessor/init.c
@@ -873,6 +873,7 @@
 // RUN: %clang_cc1 -target-feature +single-float -E -dM -ffreestanding \
 // RUN:   -triple=mips-none-none < /dev/null \
 // RUN:   | FileCheck -check-prefix MIPS-FABI-SINGLE %s
+// MIPS-FABI-SINGLE:#define __mips_hard_float 1
 // MIPS-FABI-SINGLE:#define __mips_single_float 1
 //
 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=msp430-none-none < /dev/null | FileCheck -check-prefix MSP430 %s