[compiler-rt] abf3997 - Revert "[compiler-rt][builtins] Skip building (b)float16 support on i386-freebsd"

[Dimitry Andric via llvm-commits]

Author: Dimitry Andric
Date: 2023-01-23T11:22:28+01:00
New Revision: abf399737ea8bf6a6af4d66fc21a250a5dc76b6d

URL: https://github.com/llvm/llvm-project/commit/abf399737ea8bf6a6af4d66fc21a250a5dc76b6d
DIFF: https://github.com/llvm/llvm-project/commit/abf399737ea8bf6a6af4d66fc21a250a5dc76b6d.diff

LOG: Revert "[compiler-rt][builtins] Skip building (b)float16 support on i386-freebsd"

This reverts commit 45368c75582f0bded1f06d5c82c1f2ee023fb186.

There were some unexpected failures in aarch64 and arm buildbots, I will
have to investigate why these suddenly fell over.

Added: 
    

Modified: 
    compiler-rt/lib/builtins/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
index d18b82fc6299c..5e2274d522560 100644
--- a/compiler-rt/lib/builtins/CMakeLists.txt
+++ b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -192,13 +192,10 @@ set(GENERIC_SOURCES
 
 # Build BF16 files only when "__bf16" is available.
 if(COMPILER_RT_HAS_BFLOAT16 AND NOT APPLE)
-  set(GENERIC_BF_SOURCES
-    truncdfbf2.c
-    truncsfbf2.c
-  )
   set(GENERIC_SOURCES
     ${GENERIC_SOURCES}
-    ${GENERIC_BF_SOURCES}
+    truncdfbf2.c
+    truncsfbf2.c
   )
 endif()
 
@@ -372,11 +369,6 @@ if (NOT MSVC)
       i386/chkstk2.S
     )
   endif()
-
-  if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    # Do not build bfloat16 sources i386-freebsd, as it is not supported.
-    list(REMOVE_ITEM i386_SOURCES ${GENERIC_BF_SOURCES})
-  endif()
 else () # MSVC
   # Use C versions of functions when building on MSVC
   # MSVC's assembler takes Intel syntax, not AT&T syntax.
@@ -755,6 +747,8 @@ else ()
     append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS)
   endif()
 
+  append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS)
+
   append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS)
 
   # These flags would normally be added to CMAKE_C_FLAGS by the llvm
@@ -831,11 +825,6 @@ else ()
         set(deps_aarch64 lse_builtin_symlinks)
       endif()
 
-      # Do not enable float16 on i386-freebsd, as it is not supported.
-      if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" AND ${arch} STREQUAL "i386"))
-        append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS)
-      endif()
-
       add_compiler_rt_runtime(clang_rt.builtins
                               STATIC
                               ARCHS ${arch}