Do not include float interfaces when using libsa.

We don't support float in the boot loaders, so don't include
interfaces for float or double in systems headers. In addition, take
the unusual step of spiking double and float to prevent any more
accidental seepage.

9 files changed, 20 insertions, 0 deletions

diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h
index 0871adc778be..14ab76c5fbde 100644
--- a/sys/arm/include/_types.h
+++ b/sys/arm/include/_types.h
@@ -70,8 +70,10 @@ typedef	unsigned long long	__uint64_t;
  */
 typedef	__uint32_t	__clock_t;		/* clock()... */
 typedef	__int32_t	__critical_t;
+#ifndef _STANDALONE
 typedef	double		__double_t;
 typedef	float		__float_t;
+#endif
 typedef	__int32_t	__intfptr_t;
 typedef	__int64_t	__intmax_t;
 typedef	__int32_t	__intptr_t;
diff --git a/sys/arm64/include/_types.h b/sys/arm64/include/_types.h
index 1019b3bc7a54..b54a17d25024 100644
--- a/sys/arm64/include/_types.h
+++ b/sys/arm64/include/_types.h
@@ -56,8 +56,10 @@ typedef	unsigned long		__uint64_t;
  */
 typedef	__int32_t	__clock_t;		/* clock()... */
 typedef	__int64_t	__critical_t;
+#ifndef _STANDALONE
 typedef	double		__double_t;
 typedef	float		__float_t;
+#endif
 typedef	__int64_t	__intfptr_t;
 typedef	__int64_t	__intmax_t;
 typedef	__int64_t	__intptr_t;
diff --git a/sys/mips/include/_types.h b/sys/mips/include/_types.h
index 31cdb6409353..385280b1ea45 100644
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
@@ -75,8 +75,10 @@ typedef	unsigned long long	__uint64_t;
  * Standard type definitions.
  */
 typedef	__int32_t	__clock_t;		/* clock()... */
+#ifndef _STANDALONE
 typedef	double		__double_t;
 typedef	float		__float_t;
+#endif
 #ifdef __mips_n64
 typedef	__int64_t	__critical_t;
 typedef	__int64_t	__intfptr_t;
diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h
index 83293a60e7d8..7915f5627579 100644
--- a/sys/powerpc/include/_types.h
+++ b/sys/powerpc/include/_types.h
@@ -74,8 +74,10 @@ typedef	unsigned long long	__uint64_t;
  * Standard type definitions.
  */
 typedef	__uint32_t	__clock_t;		/* clock()... */
+#ifndef _STANDALONE
 typedef	double		__double_t;
 typedef	float		__float_t;
+#endif
 #ifdef __LP64__
 typedef	__int64_t	__critical_t;
 typedef	__int64_t	__intfptr_t;
diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h
index ecddc3fddb23..8c378807f169 100644
--- a/sys/powerpc/include/pcb.h
+++ b/sys/powerpc/include/pcb.h
@@ -39,6 +39,7 @@
 
 #include <machine/setjmp.h>
 
+#ifndef _STANDALONE
 struct pcb {
 	register_t	pcb_context[20];	/* non-volatile r14-r31 */
 	register_t	pcb_cr;			/* Condition register */
@@ -81,6 +82,7 @@ struct pcb {
 		} booke;
 	} pcb_cpu;
 };
+#endif
 
 #ifdef	_KERNEL
 
diff --git a/sys/riscv/include/_types.h b/sys/riscv/include/_types.h
index 0c4b6c775ab0..50b80af4c636 100644
--- a/sys/riscv/include/_types.h
+++ b/sys/riscv/include/_types.h
@@ -56,8 +56,10 @@ typedef	unsigned long		__uint64_t;
  */
 typedef	__int32_t	__clock_t;		/* clock()... */
 typedef	__int64_t	__critical_t;
+#ifndef _STANDALONE
 typedef	double		__double_t;
 typedef	float		__float_t;
+#endif
 typedef	__int64_t	__intfptr_t;
 typedef	__int64_t	__intmax_t;
 typedef	__int64_t	__intptr_t;
diff --git a/sys/sparc64/include/_types.h b/sys/sparc64/include/_types.h
index bd956b1ac77f..9d71fefc52eb 100644
--- a/sys/sparc64/include/_types.h
+++ b/sys/sparc64/include/_types.h
@@ -58,8 +58,10 @@ typedef	unsigned long		__uint64_t;
  */
 typedef	__int32_t	__clock_t;		/* clock()... */
 typedef	__int64_t	__critical_t;
+#ifndef _STANDALONE
 typedef	double		__double_t;
 typedef	float		__float_t;
+#endif
 typedef	__int64_t	__intfptr_t;
 typedef	__int64_t	__intmax_t;
 typedef	__int64_t	__intptr_t;
diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index 8ecf9d059239..22a37c53389a 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -104,7 +104,9 @@ typedef	__uint_least32_t __char32_t;
 
 typedef struct {
 	long long __max_align1 __aligned(_Alignof(long long));
+#ifndef _STANDALONE
 	long double __max_align2 __aligned(_Alignof(long double));
+#endif
 } __max_align_t;
 
 typedef	__uint64_t	__dev_t;	/* device number */
diff --git a/sys/x86/include/_types.h b/sys/x86/include/_types.h
index b459951d0efe..2c7301dd857f 100644
--- a/sys/x86/include/_types.h
+++ b/sys/x86/include/_types.h
@@ -74,15 +74,19 @@ typedef	unsigned long long	__uint64_t;
 #ifdef	__LP64__
 typedef	__int32_t	__clock_t;		/* clock()... */
 typedef	__int64_t	__critical_t;
+#ifndef _STANDALONE
 typedef	double		__double_t;
 typedef	float		__float_t;
+#endif
 typedef	__int64_t	__intfptr_t;
 typedef	__int64_t	__intptr_t;
 #else
 typedef	unsigned long	__clock_t;
 typedef	__int32_t	__critical_t;
+#ifndef _STANDALONE
 typedef	long double	__double_t;
 typedef	long double	__float_t;
+#endif
 typedef	__int32_t	__intfptr_t;
 typedef	__int32_t	__intptr_t;
 #endif