compiler-rt/builtins: Make check-builtins run tests on macOS.

[thakis]

delcypher, kubamracek : ping.

[thakis]

delcypher, kubamracek: Would you prefer if someone else looked at this?

[delcypher]

@thakis This looks like a reasonable start but I'd like to test this before landing it. @arphaman might have opinions too.

[arphaman]

The approach seems reasonable to me

[thakis]

What's the next step here?

[arphaman]

I think @delcypher wanted to test it first

[thakis]

smaller diff

[delcypher]

@thakis Sorry for the delay on this. I should have some time this afternoon to try this out.

[delcypher]

@thakis I gave this patch a try. It seems to work apart from the i386 tests that will not work on macOS Catalina. We can deal with that later though.

I've never looked at the builtins before. There are some very weird things about the tests here that don't make any sense to me but that's not part of this patch so I won't dwell on them here.

compiler-rt/test/builtins/CMakeLists.txt

 # compiler was clang-cl, we will enable some features that the host compiler
 # will not, like C99 _Complex and int128.
 set(BUILTINS_IS_MSVC OFF)
 if (MSVC AND NOT "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
   set(BUILTINS_IS_MSVC ON)
 endif()
 pythonize_bool(BUILTINS_IS_MSVC)
 
-#TODO: Add support for Apple.
-if (NOT APPLE)
-foreach(arch ${BUILTIN_SUPPORTED_ARCH})
+set(BUILTIN_TEST_ARCH ${BUILTIN_SUPPORTED_ARCH})
+if(APPLE)
+  darwin_filter_host_archs(BUILTIN_SUPPORTED_ARCH BUILTIN_TEST_ARCH)
+endif()
+
+foreach(arch ${BUILTIN_TEST_ARCH})
   set(BUILTINS_TEST_TARGET_ARCH ${arch})
+  set(BUILTINS_TEST_APPLE_PLATFORM "osx")
   string(TOLOWER "-${arch}-${OS_NAME}" BUILTINS_TEST_CONFIG_SUFFIX)
   get_test_cc_for_arch(${arch} BUILTINS_TEST_TARGET_CC BUILTINS_TEST_TARGET_CFLAGS)
   if (${arch} STREQUAL "armhf")
     list(APPEND BUILTINS_TEST_TARGET_CFLAGS -fomit-frame-pointer -DCOMPILER_RT_ARMHF_TARGET)
     string(REPLACE ";" " " BUILTINS_TEST_TARGET_CFLAGS "${BUILTINS_TEST_TARGET_CFLAGS}")
   endif()
 
   if (${arch} STREQUAL "riscv32")
     list(APPEND BUILTINS_TEST_TARGET_CFLAGS -fforce-enable-int128)
     string(REPLACE ";" " " BUILTINS_TEST_TARGET_CFLAGS "${BUILTINS_TEST_TARGET_CFLAGS}")
   endif()
 
   string(TOUPPER ${arch} ARCH_UPPER_CASE)
   set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config)
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
     ${CMAKE_CURRENT_BINARY_DIR}/Unit/${CONFIG_NAME}/lit.site.cfg.py
     )
   list(APPEND BUILTINS_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit/${CONFIG_NAME})
 endforeach()
-endif()
+
+# TODO: Add support for running tests on iOS and iOS simulator.
 
 add_lit_testsuite(check-builtins "Running the Builtins tests"
   ${BUILTINS_TESTSUITES}
   DEPENDS ${BUILTINS_TEST_DEPS})
 set_target_properties(check-builtins PROPERTIES FOLDER "Compiler-RT Misc")

compiler-rt/test/builtins/Unit/lit.cfg.py

 config.test_source_root = os.path.dirname(__file__)
 
 # Path to the static library
 is_msvc = get_required_attr(config, "is_msvc")
 if is_msvc:
   base_lib = os.path.join(config.compiler_rt_libdir, "clang_rt.builtins%s.lib "
                           % config.target_suffix)
   config.substitutions.append( ("%librt ", base_lib) )
+elif config.host_os  == 'Darwin':
+  base_lib = os.path.join(config.compiler_rt_libdir, "libclang_rt.osx.a ")
+  config.substitutions.append( ("%librt ", base_lib + ' -lSystem ') )
 else:
   base_lib = os.path.join(config.compiler_rt_libdir, "libclang_rt.builtins%s.a"
                           % config.target_suffix)
   config.substitutions.append( ("%librt ", base_lib + ' -lc -lm ') )
 
 builtins_source_dir = os.path.join(
   get_required_attr(config, "compiler_rt_src_root"), "lib", "builtins")
 builtins_lit_source_dir = get_required_attr(config, "builtins_lit_source_dir")

compiler-rt/test/builtins/lit.site.cfg.py.in

 @LIT_SITE_CFG_IN_HEADER@
 
+config.apple_platform = "@BUILTINS_TEST_APPLE_PLATFORM@"
+
 # Load common config for all compiler-rt lit tests.
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
 lit_config.load_config(config, "@BUILTINS_LIT_SOURCE_DIR@/lit.cfg.py")