This is an archive of the discontinued LLVM Phabricator instance.

Differential D144398

[runtimes] Remove add_target_flags* functions and use add_flags* instead
ClosedPublic

Authored by philnik on Feb 20 2023, 7:48 AM.

Details

Reviewers
phosek
ldionne
Group Reviewers
Restricted Project
Restricted Project
Restricted Project
Commits
rGd0e95fec65b7: [runtimes] Remove add_target_flags* functions and use add_flags* instead

Diff Detail

Event Timeline

philnik created this revision.Feb 20 2023, 7:48 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptFeb 20 2023, 7:48 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
philnik requested review of this revision.Feb 20 2023, 7:48 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptFeb 20 2023, 7:48 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
philnik added a parent revision: D144395: [runtimes] Move common functions from Handle{Libcxx,Libcxxabi,Libunwind}Flags.cmake to runtimes/cmake/Modules/HandleFlags.cmake.Feb 20 2023, 7:48 AM
philnik retitled this revision from [runimtes] Remove add_target_flags* functions and use add_flags* instead to [runtimes] Remove add_target_flags* functions and use add_flags* instead.Feb 20 2023, 7:58 AM
Harbormaster completed remote builds in B214770: Diff 498858.Feb 20 2023, 10:33 AM
phosek accepted this revision.Feb 20 2023, 2:22 PM

LGTM

philnik accepted this revision as: Restricted Project.Feb 21 2023, 4:16 AM
This revision is now accepted and ready to land.Feb 21 2023, 4:16 AM
This revision was landed with ongoing or failed builds.Feb 21 2023, 4:17 AM
Closed by commit rGd0e95fec65b7: [runtimes] Remove add_target_flags* functions and use add_flags* instead (authored by philnik). · Explain Why
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rGd0e95fec65b7: [runtimes] Remove add_target_flags* functions and use add_flags* instead.

Revision Contents

PathSize
libcxx/
2 lines
cmake/
Modules/
31 lines
libcxxabi/
4 lines
cmake/
Modules/
31 lines
libunwind/
cmake/
Modules/
31 lines

Diff 499110

libcxx/CMakeLists.txt

Show First 20 Lines • Show All 459 Lines • ▼ Show 20 Lines
include(HandleLibcxxFlags) include(HandleLibcxxFlags)
# Target flags ================================================================ # Target flags ================================================================
# These flags get added to CMAKE_CXX_FLAGS and CMAKE_C_FLAGS so that # These flags get added to CMAKE_CXX_FLAGS and CMAKE_C_FLAGS so that
# 'config-ix' use them during feature checks. It also adds them to both # 'config-ix' use them during feature checks. It also adds them to both
# 'LIBCXX_COMPILE_FLAGS' and 'LIBCXX_LINK_FLAGS' # 'LIBCXX_COMPILE_FLAGS' and 'LIBCXX_LINK_FLAGS'
if (${CMAKE_SYSTEM_NAME} MATCHES "AIX") if (${CMAKE_SYSTEM_NAME} MATCHES "AIX")
add_target_flags_if_supported("-mdefault-visibility-export-mapping=explicit") add_flags_if_supported("-mdefault-visibility-export-mapping=explicit")
set(CMAKE_AIX_EXPORT_ALL_SYMBOLS OFF) set(CMAKE_AIX_EXPORT_ALL_SYMBOLS OFF)
endif() endif()
# Configure compiler. # Configure compiler.
include(config-ix) include(config-ix)
# Configure coverage options. # Configure coverage options.
if (LIBCXX_GENERATE_COVERAGE) if (LIBCXX_GENERATE_COVERAGE)
▲ Show 20 Lines • Show All 462 Lines • Show Last 20 Lines

libcxx/cmake/Modules/HandleLibcxxFlags.cmake

# HandleLibcxxFlags - A set of macros used to setup the flags used to compile # HandleLibcxxFlags - A set of macros used to setup the flags used to compile
# and link libc++. These macros add flags to the following CMake variables. # and link libc++. These macros add flags to the following CMake variables.
# - LIBCXX_COMPILE_FLAGS: flags used to compile libc++ # - LIBCXX_COMPILE_FLAGS: flags used to compile libc++
# - LIBCXX_LINK_FLAGS: flags used to link libc++ # - LIBCXX_LINK_FLAGS: flags used to link libc++
# - LIBCXX_LIBRARIES: libraries to link libc++ to. # - LIBCXX_LIBRARIES: libraries to link libc++ to.
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
include(HandleFlags) include(HandleFlags)
unset(add_flag_if_supported) unset(add_flag_if_supported)
# Add a list of flags to all of 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS',
# 'LIBCXX_COMPILE_FLAGS' and 'LIBCXX_LINK_FLAGS'.
macro(add_target_flags)
foreach(value ${ARGN})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${value}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${value}")
list(APPEND LIBCXX_COMPILE_FLAGS ${value})
list(APPEND LIBCXX_LINK_FLAGS ${value})
endforeach()
endmacro()
# If the specified 'condition' is true then add a list of flags to
# all of 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS', 'LIBCXX_COMPILE_FLAGS'
# and 'LIBCXX_LINK_FLAGS'.
macro(add_target_flags_if condition)
if (${condition})
add_target_flags(${ARGN})
endif()
endmacro()
# Add all the flags supported by the compiler to all of
# 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS', 'LIBCXX_COMPILE_FLAGS'
# and 'LIBCXX_LINK_FLAGS'.
macro(add_target_flags_if_supported)
foreach(flag ${ARGN})
mangle_name("${flag}" flagname)
check_cxx_compiler_flag("${flag}" "CXX_SUPPORTS_${flagname}_FLAG")
add_target_flags_if(CXX_SUPPORTS_${flagname}_FLAG ${flag})
endforeach()
endmacro()
# Add a specified list of flags to both 'LIBCXX_COMPILE_FLAGS' and # Add a specified list of flags to both 'LIBCXX_COMPILE_FLAGS' and
# 'LIBCXX_LINK_FLAGS'. # 'LIBCXX_LINK_FLAGS'.
macro(add_flags) macro(add_flags)
foreach(value ${ARGN}) foreach(value ${ARGN})
list(APPEND LIBCXX_COMPILE_FLAGS ${value}) list(APPEND LIBCXX_COMPILE_FLAGS ${value})
list(APPEND LIBCXX_LINK_FLAGS ${value}) list(APPEND LIBCXX_LINK_FLAGS ${value})
endforeach() endforeach()
endmacro() endmacro()
▲ Show 20 Lines • Show All 95 Lines • Show Last 20 Lines

libcxxabi/CMakeLists.txt

Show First 20 Lines • Show All 240 Lines • ▼ Show 20 Lines
include(HandleLibcxxabiFlags) include(HandleLibcxxabiFlags)
#=============================================================================== #===============================================================================
# Setup Compiler Flags # Setup Compiler Flags
#=============================================================================== #===============================================================================
# Configure target flags # Configure target flags
if(ZOS) if(ZOS)
add_target_flags_if_supported("-fzos-le-char-mode=ebcdic") add_flags_if_supported("-fzos-le-char-mode=ebcdic")
endif() endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "AIX") if (${CMAKE_SYSTEM_NAME} MATCHES "AIX")
add_target_flags_if_supported("-mdefault-visibility-export-mapping=explicit") add_flags_if_supported("-mdefault-visibility-export-mapping=explicit")
set(CMAKE_AIX_EXPORT_ALL_SYMBOLS OFF) set(CMAKE_AIX_EXPORT_ALL_SYMBOLS OFF)
endif() endif()
add_compile_flags("${LIBCXXABI_ADDITIONAL_COMPILE_FLAGS}") add_compile_flags("${LIBCXXABI_ADDITIONAL_COMPILE_FLAGS}")
add_library_flags("${LIBCXXABI_ADDITIONAL_LIBRARIES}") add_library_flags("${LIBCXXABI_ADDITIONAL_LIBRARIES}")
# Configure compiler. Must happen after setting the target flags. # Configure compiler. Must happen after setting the target flags.
include(config-ix) include(config-ix)
▲ Show 20 Lines • Show All 254 Lines • Show Last 20 Lines

libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake

# HandleLibcxxFlags - A set of macros used to setup the flags used to compile # HandleLibcxxFlags - A set of macros used to setup the flags used to compile
# and link libc++abi. These macros add flags to the following CMake variables. # and link libc++abi. These macros add flags to the following CMake variables.
# - LIBCXXABI_COMPILE_FLAGS: flags used to compile libc++abi # - LIBCXXABI_COMPILE_FLAGS: flags used to compile libc++abi
# - LIBCXXABI_LINK_FLAGS: flags used to link libc++abi # - LIBCXXABI_LINK_FLAGS: flags used to link libc++abi
# - LIBCXXABI_LIBRARIES: libraries to link libc++abi to. # - LIBCXXABI_LIBRARIES: libraries to link libc++abi to.
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
include(HandleFlags) include(HandleFlags)
unset(add_flag_if_supported) unset(add_flag_if_supported)
# Add a list of flags to all of 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS',
# 'LIBCXXABI_COMPILE_FLAGS' and 'LIBCXXABI_LINK_FLAGS'.
macro(add_target_flags)
foreach(value ${ARGN})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${value}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${value}")
list(APPEND LIBCXXABI_COMPILE_FLAGS ${value})
list(APPEND LIBCXXABI_LINK_FLAGS ${value})
endforeach()
endmacro()
# If the specified 'condition' is true then add a list of flags to
# all of 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS', 'LIBCXXABI_COMPILE_FLAGS'
# and 'LIBCXXABI_LINK_FLAGS'.
macro(add_target_flags_if condition)
if (${condition})
add_target_flags(${ARGN})
endif()
endmacro()
# Add all the flags supported by the compiler to all of
# 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS', 'LIBCXXABI_COMPILE_FLAGS'
# and 'LIBCXXABI_LINK_FLAGS'.
macro(add_target_flags_if_supported)
foreach(flag ${ARGN})
mangle_name("${flag}" flagname)
check_cxx_compiler_flag("${flag}" "CXX_SUPPORTS_${flagname}_FLAG")
add_target_flags_if(CXX_SUPPORTS_${flagname}_FLAG ${flag})
endforeach()
endmacro()
# Add a specified list of flags to both 'LIBCXXABI_COMPILE_FLAGS' and # Add a specified list of flags to both 'LIBCXXABI_COMPILE_FLAGS' and
# 'LIBCXXABI_LINK_FLAGS'. # 'LIBCXXABI_LINK_FLAGS'.
macro(add_flags) macro(add_flags)
foreach(value ${ARGN}) foreach(value ${ARGN})
list(APPEND LIBCXXABI_COMPILE_FLAGS ${value}) list(APPEND LIBCXXABI_COMPILE_FLAGS ${value})
list(APPEND LIBCXXABI_LINK_FLAGS ${value}) list(APPEND LIBCXXABI_LINK_FLAGS ${value})
endforeach() endforeach()
endmacro() endmacro()
▲ Show 20 Lines • Show All 93 Lines • Show Last 20 Lines

libunwind/cmake/Modules/HandleLibunwindFlags.cmake

# HandleLibcxxFlags - A set of macros used to setup the flags used to compile # HandleLibcxxFlags - A set of macros used to setup the flags used to compile
# and link libc++abi. These macros add flags to the following CMake variables. # and link libc++abi. These macros add flags to the following CMake variables.
# - LIBUNWIND_COMPILE_FLAGS: flags used to compile libunwind # - LIBUNWIND_COMPILE_FLAGS: flags used to compile libunwind
# - LIBUNWIND_LINK_FLAGS: flags used to link libunwind # - LIBUNWIND_LINK_FLAGS: flags used to link libunwind
# - LIBUNWIND_LIBRARIES: libraries to link libunwind to. # - LIBUNWIND_LIBRARIES: libraries to link libunwind to.
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
include(HandleFlags) include(HandleFlags)
unset(add_flag_if_supported) unset(add_flag_if_supported)
# Add a list of flags to all of 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS',
# 'LIBUNWIND_COMPILE_FLAGS' and 'LIBUNWIND_LINK_FLAGS'.
macro(add_target_flags)
foreach(value ${ARGN})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${value}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${value}")
list(APPEND LIBUNWIND_COMPILE_FLAGS ${value})
list(APPEND LIBUNWIND_LINK_FLAGS ${value})
endforeach()
endmacro()
# If the specified 'condition' is true then add a list of flags to
# all of 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS', 'LIBUNWIND_COMPILE_FLAGS'
# and 'LIBUNWIND_LINK_FLAGS'.
macro(add_target_flags_if condition)
if (${condition})
add_target_flags(${ARGN})
endif()
endmacro()
# Add all the flags supported by the compiler to all of
# 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS', 'LIBUNWIND_COMPILE_FLAGS'
# and 'LIBUNWIND_LINK_FLAGS'.
macro(add_target_flags_if_supported)
foreach(flag ${ARGN})
mangle_name("${flag}" flagname)
check_cxx_compiler_flag("${flag}" "CXX_SUPPORTS_${flagname}_FLAG")
add_target_flags_if(CXX_SUPPORTS_${flagname}_FLAG ${flag})
endforeach()
endmacro()
# Add a specified list of flags to both 'LIBUNWIND_COMPILE_FLAGS' and # Add a specified list of flags to both 'LIBUNWIND_COMPILE_FLAGS' and
# 'LIBUNWIND_LINK_FLAGS'. # 'LIBUNWIND_LINK_FLAGS'.
macro(add_flags) macro(add_flags)
foreach(value ${ARGN}) foreach(value ${ARGN})
list(APPEND LIBUNWIND_COMPILE_FLAGS ${value}) list(APPEND LIBUNWIND_COMPILE_FLAGS ${value})
list(APPEND LIBUNWIND_LINK_FLAGS ${value}) list(APPEND LIBUNWIND_LINK_FLAGS ${value})
endforeach() endforeach()
endmacro() endmacro()
▲ Show 20 Lines • Show All 133 Lines • Show Last 20 Lines