Index: lldb/trunk/include/lldb/Core/ArchSpec.h
===================================================================
--- lldb/trunk/include/lldb/Core/ArchSpec.h
+++ lldb/trunk/include/lldb/Core/ArchSpec.h
@@ -72,6 +72,13 @@
         eMIPSABI_mask       = 0x000ff000
     };
 
+    // ARM specific e_flags
+    enum ARMeflags
+    {
+        eARM_abi_soft_float = 0x00000200,
+        eARM_abi_hard_float = 0x00000400
+    };
+
     enum Core
     {
         eCore_arm_generic,
Index: lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.h
===================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.h
+++ lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.h
@@ -79,6 +79,9 @@
     const lldb_private::RegisterInfo *
     GetRegisterInfoArray (uint32_t &count) override;
 
+    bool
+    IsArmHardFloat (lldb_private::Thread &thread) const;
+
     //------------------------------------------------------------------
     // Static Functions
     //------------------------------------------------------------------
Index: lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp
===================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp
+++ lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp
@@ -414,6 +414,20 @@
     return true;
 }
 
+bool
+ABISysV_arm::IsArmHardFloat (Thread &thread) const
+{
+    ProcessSP process_sp (thread.GetProcess());
+    if (process_sp)
+    {
+        const ArchSpec &arch (process_sp->GetTarget().GetArchitecture());
+
+        return (arch.GetFlags() & ArchSpec::eARM_abi_hard_float) != 0;
+    }
+
+    return false;
+}
+
 ValueObjectSP
 ABISysV_arm::GetReturnValueObjectImpl (Thread &thread,
                                        lldb_private::CompilerType &compiler_type) const
@@ -516,19 +530,42 @@
                 case 64:
                 {
                     static_assert(sizeof(double) == sizeof(uint64_t), "");
-                    const RegisterInfo *r1_reg_info = reg_ctx->GetRegisterInfo(eRegisterKindGeneric, LLDB_REGNUM_GENERIC_ARG2);
-                    uint64_t raw_value;
-                    raw_value = reg_ctx->ReadRegisterAsUnsigned(r0_reg_info, 0) & UINT32_MAX;
-                    raw_value |= ((uint64_t)(reg_ctx->ReadRegisterAsUnsigned(r1_reg_info, 0) & UINT32_MAX)) << 32;
-                    value.GetScalar() = *reinterpret_cast<double*>(&raw_value);
+
+                    if (IsArmHardFloat(thread))
+                    {
+                        RegisterValue reg_value;
+                        const RegisterInfo *d0_reg_info = reg_ctx->GetRegisterInfoByName("d0", 0);
+                        reg_ctx->ReadRegister(d0_reg_info, reg_value);
+                        value.GetScalar() = reg_value.GetAsDouble();
+                    }
+                    else
+                    {
+                        uint64_t raw_value;
+                        const RegisterInfo *r1_reg_info = reg_ctx->GetRegisterInfo(eRegisterKindGeneric, LLDB_REGNUM_GENERIC_ARG2);
+                        raw_value = reg_ctx->ReadRegisterAsUnsigned(r0_reg_info, 0) & UINT32_MAX;
+                        raw_value |= ((uint64_t)(reg_ctx->ReadRegisterAsUnsigned(r1_reg_info, 0) & UINT32_MAX)) << 32;
+                        value.GetScalar() = *reinterpret_cast<double*>(&raw_value);
+                    }
                     break;
                 }
                 case 16: // Half precision returned after a conversion to single precision
                 case 32:
                 {
                     static_assert(sizeof(float) == sizeof(uint32_t), "");
-                    uint32_t raw_value = reg_ctx->ReadRegisterAsUnsigned(r0_reg_info, 0) & UINT32_MAX;
-                    value.GetScalar() = *reinterpret_cast<float*>(&raw_value);
+
+                    if (IsArmHardFloat(thread))
+                    {
+                        RegisterValue reg_value;
+                        const RegisterInfo *s0_reg_info = reg_ctx->GetRegisterInfoByName("s0", 0);
+                        reg_ctx->ReadRegister(s0_reg_info, reg_value);
+                        value.GetScalar() = reg_value.GetAsFloat();
+                    }
+                    else
+                    {
+                        uint32_t raw_value;
+                        raw_value = reg_ctx->ReadRegisterAsUnsigned(r0_reg_info, 0) & UINT32_MAX;
+                        value.GetScalar() = *reinterpret_cast<float*>(&raw_value);
+                    }
                     break;
                 }
             }
Index: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
===================================================================
--- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -1562,6 +1562,15 @@
         }
     }
 
+    if (arch_spec.GetMachine() == llvm::Triple::arm ||
+        arch_spec.GetMachine() == llvm::Triple::thumb)
+    {
+        if (header.e_flags & llvm::ELF::EF_ARM_SOFT_FLOAT)
+            arch_spec.SetFlags (ArchSpec::eARM_abi_soft_float);
+        else if (header.e_flags & llvm::ELF::EF_ARM_VFP_FLOAT)
+            arch_spec.SetFlags (ArchSpec::eARM_abi_hard_float);
+    }
+
     // If there are no section headers we are done.
     if (header.e_shnum == 0)
         return 0;