[libcxx-commits] [libcxx] d0e95fe - [runtimes] Remove add_target_flags* functions and use add_flags* instead
Nikolas Klauser via libcxx-commits
libcxx-commits at lists.llvm.org
Tue Feb 21 04:16:50 PST 2023
Author: Nikolas Klauser
Date: 2023-02-21T13:16:44+01:00
New Revision: d0e95fec65b7ac68021e956a3da74aa8d42e699f
URL: https://github.com/llvm/llvm-project/commit/d0e95fec65b7ac68021e956a3da74aa8d42e699f
DIFF: https://github.com/llvm/llvm-project/commit/d0e95fec65b7ac68021e956a3da74aa8d42e699f.diff
LOG: [runtimes] Remove add_target_flags* functions and use add_flags* instead
Reviewed By: phosek, #libunwind, #libc, #libc_abi
Spies: libcxx-commits
Differential Revision: https://reviews.llvm.org/D144398
Added:
Modified:
libcxx/CMakeLists.txt
libcxx/cmake/Modules/HandleLibcxxFlags.cmake
libcxxabi/CMakeLists.txt
libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake
libunwind/cmake/Modules/HandleLibunwindFlags.cmake
Removed:
################################################################################
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 3e7a4ac637b04..0c1b2fe32f7ae 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -465,7 +465,7 @@ include(HandleLibcxxFlags)
# 'LIBCXX_COMPILE_FLAGS' and 'LIBCXX_LINK_FLAGS'
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)
endif()
diff --git a/libcxx/cmake/Modules/HandleLibcxxFlags.cmake b/libcxx/cmake/Modules/HandleLibcxxFlags.cmake
index d8aee2a7190ad..ec1434184f82c 100644
--- a/libcxx/cmake/Modules/HandleLibcxxFlags.cmake
+++ b/libcxx/cmake/Modules/HandleLibcxxFlags.cmake
@@ -9,37 +9,6 @@ include(HandleFlags)
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
# 'LIBCXX_LINK_FLAGS'.
macro(add_flags)
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
index a92ada7cb96c0..120d31677b561 100644
--- a/libcxxabi/CMakeLists.txt
+++ b/libcxxabi/CMakeLists.txt
@@ -246,11 +246,11 @@ include(HandleLibcxxabiFlags)
# Configure target flags
if(ZOS)
- add_target_flags_if_supported("-fzos-le-char-mode=ebcdic")
+ add_flags_if_supported("-fzos-le-char-mode=ebcdic")
endif()
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)
endif()
add_compile_flags("${LIBCXXABI_ADDITIONAL_COMPILE_FLAGS}")
diff --git a/libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake b/libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake
index 976c6b52bac67..16aed0242a6df 100644
--- a/libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake
+++ b/libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake
@@ -9,37 +9,6 @@ include(HandleFlags)
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
# 'LIBCXXABI_LINK_FLAGS'.
macro(add_flags)
diff --git a/libunwind/cmake/Modules/HandleLibunwindFlags.cmake b/libunwind/cmake/Modules/HandleLibunwindFlags.cmake
index 47b7083428554..5fa765afd1ef3 100644
--- a/libunwind/cmake/Modules/HandleLibunwindFlags.cmake
+++ b/libunwind/cmake/Modules/HandleLibunwindFlags.cmake
@@ -10,37 +10,6 @@ include(HandleFlags)
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
# 'LIBUNWIND_LINK_FLAGS'.
macro(add_flags)
More information about the libcxx-commits
mailing list