On Fri, Nov 27, 2015 at 04:21:55PM +0100, Ard Biesheuvel wrote:
> 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.
Looks plausible. If you can confirm you've tested it as well:
Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
> ---
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpeq.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpge.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpgt.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmple.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmplt.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpun.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpeq.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpge.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpgt.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmple.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmplt.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpun.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf | 1 +
> ArmPkg/Library/ArmSoftFloatLib/bits32/softfloat.c | 1 -
> ArmPkg/Library/ArmSoftFloatLib/softfloat-specialize | 4 ----
> 15 files changed, 1 insertion(+), 17 deletions(-)
>
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpeq.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpeq.c
> index 8bde7a5489e2..614c7c61c8e1 100644
> --- 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.
> */
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_dcmpeq.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpge.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpge.c
> index c153feb6a838..5062a286b7ef 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpge.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpge.c
> @@ -20,7 +20,6 @@
> #include "milieu.h"
> #include "softfloat.h"
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_dcmpge.c,v 1.2 2013/04/16 13:38:34 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpgt.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpgt.c
> index 5fb1606697a3..b98652bf940f 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpgt.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpgt.c
> @@ -22,7 +22,6 @@
> #include "milieu.h"
> #include "softfloat.h"
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_dcmpgt.c,v 1.2 2013/04/16 13:38:34 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmple.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmple.c
> index a8327c5e5bec..8053985f9bc7 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmple.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmple.c
> @@ -22,7 +22,6 @@
> #include "milieu.h"
> #include "softfloat.h"
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_dcmple.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmplt.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmplt.c
> index 8d0e143cb499..cd166440ef6c 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmplt.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmplt.c
> @@ -22,7 +22,6 @@
> #include "milieu.h"
> #include "softfloat.h"
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_dcmplt.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpun.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpun.c
> index fa91120a6c39..36fd3468ccd6 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpun.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_dcmpun.c
> @@ -22,7 +22,6 @@
> #include "milieu.h"
> #include "softfloat.h"
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_dcmpun.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpeq.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpeq.c
> index 83db09e6a46e..ccea1f75e1cb 100644
> --- 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.
> */
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_fcmpeq.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpge.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpge.c
> index db59a98822d1..69dabbdf944a 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpge.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpge.c
> @@ -22,7 +22,6 @@
> #include "milieu.h"
> #include "softfloat.h"
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_fcmpge.c,v 1.2 2013/04/16 13:38:34 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpgt.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpgt.c
> index 6d6dea608885..5739a2d6c6f8 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpgt.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpgt.c
> @@ -22,7 +22,6 @@
> #include "milieu.h"
> #include "softfloat.h"
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_fcmpgt.c,v 1.2 2013/04/16 13:38:34 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmple.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmple.c
> index 84c0355e2ef2..8534b30fc44f 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmple.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmple.c
> @@ -22,7 +22,6 @@
> #include "milieu.h"
> #include "softfloat.h"
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_fcmple.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmplt.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmplt.c
> index a421e8ce21b2..e5b12cdef2f0 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmplt.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmplt.c
> @@ -22,7 +22,6 @@
> #include "milieu.h"
> #include "softfloat.h"
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_fcmplt.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpun.c
> b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpun.c
> index 403afba17e3b..903066f3ff43 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpun.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/Arm/__aeabi_fcmpun.c
> @@ -22,7 +22,6 @@
> #include "milieu.h"
> #include "softfloat.h"
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: __aeabi_fcmpun.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
> b/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
> index 7fefb107a8fa..39c74bf1a3c2 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
> +++ b/ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
> @@ -46,3 +46,4 @@ [Packages]
>
> [BuildOptions]
> GCC:*_*_*_CC_FLAGS = -DSOFTFLOAT_FOR_GCC -Wno-enum-compare -fno-tree-vrp
> + RVCT:*_*_*_CC_FLAGS = -DSOFTFLOAT_FOR_GCC
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/bits32/softfloat.c
> b/ArmPkg/Library/ArmSoftFloatLib/bits32/softfloat.c
> index a513bf94e172..759b8a0077e1 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/bits32/softfloat.c
> +++ b/ArmPkg/Library/ArmSoftFloatLib/bits32/softfloat.c
> @@ -51,7 +51,6 @@ this code that are retained.
>
> ===============================================================================
> */
>
> -#include <sys/cdefs.h>
> #if defined(LIBC_SCCS) && !defined(lint)
> __RCSID("$NetBSD: softfloat.c,v 1.3 2013/01/10 08:16:11 matt Exp $");
> #endif /* LIBC_SCCS and not lint */
> diff --git a/ArmPkg/Library/ArmSoftFloatLib/softfloat-specialize
> b/ArmPkg/Library/ArmSoftFloatLib/softfloat-specialize
> index 13ada988d198..4c99d0ae9937 100644
> --- a/ArmPkg/Library/ArmSoftFloatLib/softfloat-specialize
> +++ b/ArmPkg/Library/ArmSoftFloatLib/softfloat-specialize
> @@ -32,10 +32,6 @@ this code that are retained.
>
> ===============================================================================
> */
>
> -#include <signal.h>
> -#include <string.h>
> -#include <unistd.h>
> -
> /*
>
> -------------------------------------------------------------------------------
> Underflow tininess-detection mode, statically initialized to default value.
> --
> 1.9.1
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
