diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -286,7 +286,11 @@ # Linux test function-sections-are-bad.cpp fails with the following error: # 'undefined symbol: __sanitizer_unaligned_load32'. if(DEFINED TARGET_powerpc64le_CFLAGS) - append_list_if(COMPILER_RT_HAS_FNO_FUNCTION_SECTIONS_FLAG -fno-function-sections TARGET_powerpc64le_CFLAGS) + if(CMAKE_CXX_COMPILER_ID MATCHES "XL") + append("-qnofuncsect" TARGET_powerpc64le_CFLAGS) + else() + append_list_if(COMPILER_RT_HAS_FNO_FUNCTION_SECTIONS_FLAG -fno-function-sections TARGET_powerpc64le_CFLAGS) + endif() endif() # The following is a workaround for s390x. This avoids creation of "partial diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -782,9 +782,11 @@ NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG") check_c_compiler_flag("-Werror -fno-function-sections" C_SUPPORTS_FNO_FUNCTION_SECTIONS) if (C_SUPPORTS_FNO_FUNCTION_SECTIONS) - # Don't add -ffunction-section if it can be disabled with -fno-function-sections. + # Don't add -ffunction-sections if it can't be disabled with -fno-function-sections. # Doing so will break sanitizers. add_flag_if_supported("-ffunction-sections" FFUNCTION_SECTIONS) + elseif (CMAKE_CXX_COMPILER_ID MATCHES "XL") + append("-qfuncsect" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) endif() add_flag_if_supported("-fdata-sections" FDATA_SECTIONS) endif()