ArmPkg/ArmSoftFloatLib: add support for RVCT

The ARM softfloat library in ArmSoftfloatLib currently does not build
under RVCT, simply because the code includes system header files that
RVCT does not provide. However, nothing exported by those include files
is actually used by the library when built in SOFTFLOAT_FOR_GCC mode,
so we can just drop all of them.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19031 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpeq.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpeq.c
index 8bde7a5489e2bf0675824ddb10b4687dc4b9b255..614c7c61c8e145f8b782d815a02e04209efad6c9 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpeq.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpeq.c
@@ -18,7 +18,6 @@
  * Written by Ben Harris, 2000.  This file is in the Public Domain.\r
  */\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_dcmpeq.c,v 1.1 2013/04/16 10:37:39 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpge.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpge.c
index c153feb6a838f246c3d9c82980e2921c777eeab2..5062a286b7ef2a8c85fa31b454f446972b4754f5 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpge.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpge.c
@@ -20,7 +20,6 @@
 #include "milieu.h"\r
 #include "softfloat.h"\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_dcmpge.c,v 1.2 2013/04/16 13:38:34 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpgt.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpgt.c
index 5fb1606697a3a38b951393768f5bd7aea1c249e8..b98652bf940ffd8a70c3a23e7292b693d4eccebb 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpgt.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpgt.c
@@ -22,7 +22,6 @@
 #include "milieu.h"\r
 #include "softfloat.h"\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_dcmpgt.c,v 1.2 2013/04/16 13:38:34 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmple.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmple.c
index a8327c5e5bec2b2f48250ded7ae2e02753272073..8053985f9bc7de34aace9d102a870b11ff6673d9 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmple.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmple.c
@@ -22,7 +22,6 @@
 #include "milieu.h"\r
 #include "softfloat.h"\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_dcmple.c,v 1.1 2013/04/16 10:37:39 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmplt.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmplt.c
index 8d0e143cb499581623abb32664c037e345014d11..cd166440ef6c4ae0ca80506c82b9fdb340fc727d 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmplt.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmplt.c
@@ -22,7 +22,6 @@
 #include "milieu.h"\r
 #include "softfloat.h"\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_dcmplt.c,v 1.1 2013/04/16 10:37:39 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpun.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpun.c
index fa91120a6c3985e8a7be8c5f71db06c6c7eea0b6..36fd3468ccd62f1597a2f35f352e940edc743de0 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpun.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpun.c
@@ -22,7 +22,6 @@
 #include "milieu.h"\r
 #include "softfloat.h"\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_dcmpun.c,v 1.1 2013/04/16 10:37:39 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpeq.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpeq.c
index 83db09e6a46e9280c7deb5a0073573e5984cf91f..ccea1f75e1cbeda19920d19e60cd4d21eff06c9e 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpeq.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpeq.c
@@ -18,7 +18,6 @@
  * Written by Ben Harris, 2000.  This file is in the Public Domain.\r
  */\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_fcmpeq.c,v 1.1 2013/04/16 10:37:39 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpge.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpge.c
index db59a98822d1f10585daf327d6980d6261ec43fe..69dabbdf944ab399852cdaf4e259af25fe0a3a4e 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpge.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpge.c
@@ -22,7 +22,6 @@
 #include "milieu.h"\r
 #include "softfloat.h"\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_fcmpge.c,v 1.2 2013/04/16 13:38:34 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpgt.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpgt.c
index 6d6dea608885f621fea9a1d769d5a8ce4e3e76c1..5739a2d6c6f88fbd31173a28d0eccc5b7ebb02df 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpgt.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpgt.c
@@ -22,7 +22,6 @@
 #include "milieu.h"\r
 #include "softfloat.h"\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_fcmpgt.c,v 1.2 2013/04/16 13:38:34 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmple.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmple.c
index 84c0355e2ef2366ce2e29ebaf4e99ba4df68b884..8534b30fc44f5f27878e9cd558cff4a122d68dbd 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmple.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmple.c
@@ -22,7 +22,6 @@
 #include "milieu.h"\r
 #include "softfloat.h"\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_fcmple.c,v 1.1 2013/04/16 10:37:39 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmplt.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmplt.c
index a421e8ce21b252dacdf9a556b26a2e46f9437826..e5b12cdef2f0195b5fbbe14ff1ef461d0a2103b8 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmplt.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmplt.c
@@ -22,7 +22,6 @@
 #include "milieu.h"\r
 #include "softfloat.h"\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_fcmplt.c,v 1.1 2013/04/16 10:37:39 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpun.c b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpun.c
index 403afba17e3ba2f6e030c78a1605a6ffa70cb727..903066f3ff43bfddf9718df4d99d4e62c47d1086 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpun.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpun.c
@@ -22,7 +22,6 @@
 #include "milieu.h"\r
 #include "softfloat.h"\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: __aeabi_fcmpun.c,v 1.1 2013/04/16 10:37:39 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf b/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
index 7fefb107a8fa331c4b80697c2e3f603e64fa29a0..39c74bf1a3c248953c52f5bac407f9a7f841e25a 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
+++ b/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
@@ -46,3 +46,4 @@
 \r
 [BuildOptions]\r
   GCC:*_*_*_CC_FLAGS = -DSOFTFLOAT_FOR_GCC -Wno-enum-compare -fno-tree-vrp\r
+  RVCT:*_*_*_CC_FLAGS = -DSOFTFLOAT_FOR_GCC\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/bits32/softfloat.c b/ArmPkg/Library/ArmSoftFloatLib/bits32/softfloat.c
index a513bf94e17265bea64e774d4e4de4f8a8e532d6..759b8a0077e1be37e9e3e64e1347968d3bf4fa85 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/bits32/softfloat.c
+++ b/ArmPkg/Library/ArmSoftFloatLib/bits32/softfloat.c
@@ -51,7 +51,6 @@ this code that are retained.
 ===============================================================================\r
 */\r
 \r
-#include <sys/cdefs.h>\r
 #if defined(LIBC_SCCS) && !defined(lint)\r
 __RCSID("$NetBSD: softfloat.c,v 1.3 2013/01/10 08:16:11 matt Exp $");\r
 #endif /* LIBC_SCCS and not lint */\r

diff --git a/ArmPkg/Library/ArmSoftFloatLib/softfloat-specialize b/ArmPkg/Library/ArmSoftFloatLib/softfloat-specialize
index 13ada988d1987b5fbdb158f4b191841acb26df46..4c99d0ae99377c33081971316e50bcae67d59408 100644 (file)
--- a/ArmPkg/Library/ArmSoftFloatLib/softfloat-specialize
+++ b/ArmPkg/Library/ArmSoftFloatLib/softfloat-specialize
@@ -32,10 +32,6 @@ this code that are retained.
 ===============================================================================\r
 */\r
 \r
-#include <signal.h>\r
-#include <string.h>\r
-#include <unistd.h>\r
-\r
 /*\r
 -------------------------------------------------------------------------------\r
 Underflow tininess-detection mode, statically initialized to default value.\r