diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_cdcmp.asm b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_cdcmp.asm
new file mode 100644
index 0000000000..4383f6a25e
--- /dev/null
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_cdcmp.asm
@@ -0,0 +1,47 @@
+//------------------------------------------------------------------------------
+//
+// Copyright (c) 2015, Linaro Limited. All rights reserved.
+//
+// This program and the accompanying materials
+// are licensed and made available under the terms and conditions of the BSD License
+// which accompanies this distribution.  The full text of the license may be found at
+// http://opensource.org/licenses/bsd-license.php
+//
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
+//------------------------------------------------------------------------------
+
+    EXPORT      __aeabi_cdrcmple
+    EXPORT      __aeabi_cdcmpeq
+    EXPORT      __aeabi_cdcmple
+    IMPORT      _softfloat_float64_eq
+    IMPORT      _softfloat_float64_lt
+
+    AREA        __aeabi_cdcmp, CODE, READONLY
+    PRESERVE8
+
+__aeabi_cdrcmple
+    MOV         IP, R0
+    MOV         R0, R2
+    MOV         R2, IP
+
+    MOV         IP, R1
+    MOV         R1, R3
+    MOV         R3, IP
+
+__aeabi_cdcmpeq
+__aeabi_cdcmple
+    PUSH        {R0 - R3, IP, LR}
+    BL          _softfloat_float64_eq
+    SUB         IP, R0, #1
+    CMP         IP, #0                  // sets C and Z if R0 == 1
+    POPEQ       {R0 - R3, IP, PC}
+
+    LDM         SP, {R0 - R3}
+    BL          _softfloat_float64_lt
+    SUB         IP, R0, #1
+    CMP         IP, #1                  // sets C if R0 == 0
+    POP         {R0 - R3, IP, PC}
+
+    END
diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_cfcmp.asm b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_cfcmp.asm
new file mode 100644
index 0000000000..247f6306eb
--- /dev/null
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_cfcmp.asm
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+//
+// Copyright (c) 2015, Linaro Limited. All rights reserved.
+//
+// This program and the accompanying materials
+// are licensed and made available under the terms and conditions of the BSD License
+// which accompanies this distribution.  The full text of the license may be found at
+// http://opensource.org/licenses/bsd-license.php
+//
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
+//------------------------------------------------------------------------------
+
+    EXPORT      __aeabi_cfrcmple
+    EXPORT      __aeabi_cfcmpeq
+    EXPORT      __aeabi_cfcmple
+    IMPORT      _softfloat_float32_eq
+    IMPORT      _softfloat_float32_lt
+
+    AREA        __aeabi_cfcmp, CODE, READONLY
+    PRESERVE8
+
+__aeabi_cfrcmple
+    MOV         IP, R0
+    MOV         R0, R1
+    MOV         R1, IP
+
+__aeabi_cfcmpeq
+__aeabi_cfcmple
+    PUSH        {R0 - R3, IP, LR}
+    BL          _softfloat_float32_eq
+    SUB         IP, R0, #1
+    CMP         IP, #0                  // sets C and Z if R0 == 1
+    POPEQ       {R0 - R3, IP, PC}
+
+    LDM         SP, {R0 - R1}
+    BL          _softfloat_float32_lt
+    SUB         IP, R0, #1
+    CMP         IP, #1                  // sets C if R0 == 0
+    POP         {R0 - R3, IP, PC}
+
+    END
diff --git a/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf b/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
index 76fa0da903..f090b3f288 100644
--- a/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
+++ b/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
@@ -41,6 +41,9 @@
   Arm/__aeabi_dcmpun.c
   Arm/__aeabi_fcmpun.c
 
+  Arm/__aeabi_cdcmp.asm   | RVCT
+  Arm/__aeabi_cfcmp.asm   | RVCT
+
 [Packages]
   MdePkg/MdePkg.dec
 
diff --git a/ArmPkg/Library/ArmSoftFloatLib/softfloat-for-gcc.h b/ArmPkg/Library/ArmSoftFloatLib/softfloat-for-gcc.h
index 420cecc298..c825d70097 100644
--- a/ArmPkg/Library/ArmSoftFloatLib/softfloat-for-gcc.h
+++ b/ArmPkg/Library/ArmSoftFloatLib/softfloat-for-gcc.h
@@ -196,7 +196,7 @@
 #define float128_gt         __gttf2
 #endif
 
-#ifdef __ARM_EABI__
+#if defined (__ARM_EABI__) || defined (__CC_ARM)
 #ifdef __ARM_PCS_VFP
 #include <arm/aeabi.h>
 #endif