[runtimes] Synchronize warnings flags between libc++/libc++abi/libunwind
This mostly keeps the same warning flags. The most important exceptions are `-Wpedantic` and `-Wconversion`, which are now removed from libc++abi and libunwind.
Reviewed By: ldionne, #libunwind, #libc, #libc_abi
Spies: mikhail.ramalho, phosek, libcxx-commits
Differential Revision: https://reviews.llvm.org/D144252
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 3309edd..cf572af 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -24,6 +24,7 @@
set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")
include(GNUInstallDirs)
+include(WarningFlags)
# Require out of source build.
include(MacroEnsureOutOfSourceBuild)
@@ -563,71 +564,6 @@
target_compile_options(${target} PUBLIC "${LIBCXX_ADDITIONAL_COMPILE_FLAGS}")
endfunction()
-# Warning flags ===============================================================
-function(cxx_add_warning_flags target)
- target_compile_definitions(${target} PUBLIC -D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
- if (MSVC)
- # -W4 is the cl.exe/clang-cl equivalent of -Wall. (In cl.exe and clang-cl,
- # -Wall is equivalent to -Weverything in GCC style compiler drivers.)
- target_add_compile_flags_if_supported(${target} PRIVATE -W4)
- else()
- target_add_compile_flags_if_supported(${target} PRIVATE -Wall)
- endif()
- target_add_compile_flags_if_supported(${target} PRIVATE -Wextra
- -W
- -Wwrite-strings
- -Wno-unused-parameter
- -Wno-long-long
- -Werror=return-type
- -Wextra-semi
- -Wundef
- -Wunused-template
- -Wformat-nonliteral)
- if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- target_add_compile_flags_if_supported(${target} PRIVATE
- -Wno-user-defined-literals
- -Wno-covered-switch-default
- -Wno-suggest-override
- )
- if (LIBCXX_TARGETING_CLANG_CL)
- target_add_compile_flags_if_supported(${target} PRIVATE
- -Wno-c++98-compat
- -Wno-c++98-compat-pedantic
- -Wno-c++11-compat
- -Wno-undef
- -Wno-reserved-id-macro
- -Wno-gnu-include-next
- -Wno-gcc-compat # For ignoring "'diagnose_if' is a clang extension" warnings
- -Wno-zero-as-null-pointer-constant # FIXME: Remove this and fix all occurrences.
- -Wno-deprecated-dynamic-exception-spec # For auto_ptr
- -Wno-sign-conversion
- -Wno-old-style-cast
- -Wno-deprecated # FIXME: Remove this and fix all occurrences.
- -Wno-shift-sign-overflow # FIXME: Why do we need this with clang-cl but not clang?
- -Wno-double-promotion # FIXME: remove me
- )
- endif()
- elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- target_add_compile_flags_if_supported(${target} PRIVATE
- -Wno-attributes
- -Wno-literal-suffix
- -Wno-c++14-compat
- -Wno-noexcept-type
- -Wno-suggest-override)
- endif()
- if (LIBCXX_ENABLE_WERROR)
- target_add_compile_flags_if_supported(${target} PRIVATE -Werror)
- target_add_compile_flags_if_supported(${target} PRIVATE -WX)
- else()
- # TODO(EricWF) Remove this. We shouldn't be suppressing errors when -Werror is
- # added elsewhere.
- target_add_compile_flags_if_supported(${target} PRIVATE -Wno-error)
- endif()
- if (LIBCXX_ENABLE_PEDANTIC)
- target_add_compile_flags_if_supported(${target} PRIVATE -pedantic)
- endif()
-endfunction()
-
# Exception flags =============================================================
function(cxx_add_exception_flags target)
if (LIBCXX_ENABLE_EXCEPTIONS)
@@ -910,7 +846,7 @@
# Setup all common build flags =================================================
function(cxx_add_common_build_flags target)
cxx_add_basic_build_flags(${target})
- cxx_add_warning_flags(${target})
+ cxx_add_warning_flags(${target} ${LIBCXX_ENABLE_WERROR} ${LIBCXX_ENABLE_PEDANTIC})
cxx_add_windows_flags(${target})
cxx_add_exception_flags(${target})
cxx_add_rtti_flags(${target})
