git: 6dba98b9281d - stable/12 - Reapply r329859 (partially, by imp):

The branch stable/12 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=6dba98b9281d0cedbf96af2dc565b71011181a22

commit 6dba98b9281d0cedbf96af2dc565b71011181a22
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2020-08-06 16:12:13 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2021-12-22 09:58:16 +0000

    Reapply r329859 (partially, by imp):
    
    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.
    
    (cherry picked from commit 8630bfad40a427d0ab21d9f051c876480ad15dc2)
---
 contrib/llvm-project/compiler-rt/lib/builtins/int_types.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h b/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h
index 705355a4840d..5a4fe97b9fb3 100644
--- a/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h
+++ b/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h
@@ -121,6 +121,7 @@ static __inline tu_int make_tu(du_int h, du_int l) {
 
 #endif // CRT_HAS_128BIT
 
+#ifndef _STANDALONE
 typedef union {
   su_int u;
   float f;
@@ -130,6 +131,7 @@ typedef union {
   udwords u;
   double f;
 } double_bits;
+#endif
 
 typedef struct {
 #if _YUGA_LITTLE_ENDIAN
@@ -155,6 +157,7 @@ typedef struct {
 #define HAS_80_BIT_LONG_DOUBLE 0
 #endif
 
+#ifndef _STANDALONE
 typedef union {
   uqwords u;
   long double f;
@@ -183,4 +186,5 @@ typedef struct {
 #define COMPLEX_REAL(x) (x).real
 #define COMPLEX_IMAGINARY(x) (x).imaginary
 #endif
+#endif
 #endif // INT_TYPES_H