address comments

Author: qinkunbao

compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake

@@ -120,6 +120,6 @@ if (WIN32)
   set(ALL_ORC_SUPPORTED_ARCH ${X86_64})
 endif()
 
-if (UNIX)
+if (OS_NAME MATCHES "Linux")
   set(ALL_PFP_SUPPORTED_ARCH ${X86_64} ${ARM64})
 endif()

compiler-rt/test/CMakeLists.txt

@@ -106,8 +106,6 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
   # ShadowCallStack does not yet provide a runtime with compiler-rt, the tests
   # include their own minimal runtime
   add_subdirectory(shadowcallstack)
-  # PointerFieldProtection does not yet provide a runtime with compiler-rt, the tests
-  # include their own minimal runtime
   add_subdirectory(pfp)
 endif()
 

compiler-rt/test/pfp/CMakeLists.txt

@@ -1,34 +1,19 @@
 set(PFP_TESTSUITES)
-set(PFP_TEST_DEPS
-  ${SANITIZER_COMMON_LIT_TEST_DEPS})
+set(PFP_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS} unwind lld compiler-rt)
+set(PFP_TEST_USE_LLD True)
 
-
-macro(add_pfp_testsuite arch lld thinlto compilerrt libunwind)
+macro(add_pfp_testsuite arch thinlto)
   set(PFP_TEST_TARGET_ARCH ${arch})
   get_test_cc_for_arch(${arch} PFP_TEST_TARGET_CC PFP_TEST_TARGET_CFLAGS)
 
   string(TOUPPER ${arch} CONFIG_NAME)
 
   if (${thinlto})
+    set(PFP_TEST_USE_THINLTO ${thinlto})
     set(CONFIG_NAME "thinlto-${CONFIG_NAME}")
     list(APPEND PFP_TEST_DEPS LTO)
-  endif()
-   if (${libunwind})
-    set(CONFIG_NAME "libunwind-${CONFIG_NAME}")
-    list(APPEND PFP_TEST_DEPS unwind)
-  endif()
-  if (${lld})
-    set(CONFIG_NAME "lld-${CONFIG_NAME}")
-    if (TARGET lld)
-      list(APPEND PFP_TEST_DEPS lld)
-    endif()
-  endif()
-  if (${compilerrt})
-    set(CONFIG_NAME "compiler-rt-${CONFIG_NAME}")
-    list(APPEND PFP_TEST_DEPS compiler-rt)
   endif()
   set(PFP_TEST_USE_THINLTO ${thinlto})
-  set(PFP_TEST_USE_LLD ${lld})
 
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
@@ -38,17 +23,11 @@ endmacro()
 
 set(PFP_TEST_ARCH ${PFP_SUPPORTED_ARCH})
 
-
 foreach(arch ${PFP_TEST_ARCH})
-  if (arch STREQUAL ${X86_64})
-    add_pfp_testsuite(${arch} False False False False)
-  endif()
-  if (arch STREQUAL ${ARM64})
-    add_pfp_testsuite(${arch} True True True True)
-  endif()
+  add_pfp_testsuite(${arch} False)
+  add_pfp_testsuite(${arch} True)
 endforeach()
 
-message(STATUS "PFP tests. " "Arch: ${PFP_TEST_ARCH} Deps: ${PFP_TEST_DEPS}")
 add_lit_testsuite(check-pfp "Running the PointerFieldProtection tests"
   ${PFP_TESTSUITES}
   DEPENDS ${PFP_TEST_DEPS})

compiler-rt/test/pfp/lit.cfg.py

@@ -11,9 +11,6 @@
 # Default test suffixes.
 config.suffixes = [".c", ".cpp"]
 
-if config.host_os not in ["Linux"]:
-    config.unsupported = True
-
 # Setup source root.
 config.test_source_root = os.path.dirname(__file__)
 # Setup default compiler flags used with -fsanitize=memory option.
@@ -25,13 +22,19 @@
 
 
 clang_pfp_cxxflags = config.cxx_mode_flags + clang_pfp_tagged_common_cflags
-if config.target_arch == 'aarch64':
-    clang_pfp_cxxflags = clang_pfp_cxxflags + ["-fuse-ld=lld --rtlib=compiler-rt --unwindlib=libunwind  -static-libgcc"]
+clang_pfp_cxxflags = clang_pfp_cxxflags + ["-fuse-ld=lld --rtlib=compiler-rt --unwindlib=libunwind  -static-libgcc"]
 
 
-def build_invocation(compile_flags):
-    return " " + " ".join([config.clang] + compile_flags) + " "
+def build_invocation(compile_flags, with_lto=False):
+    lto_flags = []
+    if with_lto and config.lto_supported:
+        lto_flags += config.lto_flags
+
+    return " " + " ".join([config.clang] + lto_flags + compile_flags) + " "
 
 
 config.substitutions.append(("%clangxx ", build_invocation(clang_cxxflags)))
-config.substitutions.append(("%clangxx_pfp ", build_invocation(clang_pfp_cxxflags)))
+if config.target_arch == 'aarch64':
+    config.substitutions.append(("%clangxx_pfp ", build_invocation(clang_pfp_cxxflags, True)))
+else:
+    config.substitutions.append(("%clangxx_pfp ", build_invocation(clang_pfp_cxxflags)))