Author: Konstantin Varlamov Date: 2023-11-08T13:16:01-10:00 New Revision: 4a9c71b8c2d01bf4efacf488d46ed2d92e71f355
URL: https://github.com/llvm/llvm-project/commit/4a9c71b8c2d01bf4efacf488d46ed2d92e71f355 DIFF: https://github.com/llvm/llvm-project/commit/4a9c71b8c2d01bf4efacf488d46ed2d92e71f355.diff LOG: [libc++][hardening] Fix references to old names for hardening modes (#71743) This should fix some builds broken by https://github.com/llvm/llvm-project/pull/70575 Added: Modified: clang/cmake/caches/Fuchsia-stage2.cmake clang/cmake/caches/Fuchsia.cmake llvm/cmake/modules/HandleLLVMOptions.cmake Removed: ################################################################################ diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake index a4d2926559eee7f..4b9085d99378c6f 100644 --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -81,7 +81,7 @@ if(APPLE) set(LIBCXX_ABI_VERSION 2 CACHE STRING "") set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "") set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "") - set(LIBCXX_HARDENING_MODE "unchecked" CACHE STRING "") + set(LIBCXX_HARDENING_MODE "none" CACHE STRING "") set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13;-DCMAKE_OSX_ARCHITECTURES=arm64|x86_64" CACHE STRING "") endif() diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake index 4c9cd12101d478a..dad434be720da11 100644 --- a/clang/cmake/caches/Fuchsia.cmake +++ b/clang/cmake/caches/Fuchsia.cmake @@ -116,7 +116,7 @@ else() set(LIBCXX_ABI_VERSION 2 CACHE STRING "") set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "") set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "") - set(LIBCXX_HARDENING_MODE "unchecked" CACHE STRING "") + set(LIBCXX_HARDENING_MODE "none" CACHE STRING "") set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "") set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13;-DCMAKE_OSX_ARCHITECTURES=arm64|x86_64" CACHE STRING "") diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index ca7cedd6e4afff4..6a3c49edc912ded 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -111,12 +111,12 @@ if( LLVM_ENABLE_ASSERTIONS ) endif() # Enable assertions in libstdc++. add_compile_definitions(_GLIBCXX_ASSERTIONS) - # Cautiously enable the safe hardened mode in libc++. + # Cautiously enable the extensive hardening mode in libc++. if((DEFINED LIBCXX_HARDENING_MODE) AND - (NOT LIBCXX_HARDENING_MODE STREQUAL "safe")) - message(WARNING "LLVM_ENABLE_ASSERTIONS implies LIBCXX_HARDENING_MODE \"safe\" but is overriden from command line with value \"${LIBCXX_HARDENING_MODE}\".") + (NOT LIBCXX_HARDENING_MODE STREQUAL "extensive")) + message(WARNING "LLVM_ENABLE_ASSERTIONS implies LIBCXX_HARDENING_MODE \"extensive\" but is overriden from command line with value \"${LIBCXX_HARDENING_MODE}\".") else() - set(LIBCXX_HARDENING_MODE "safe") + set(LIBCXX_HARDENING_MODE "extensive") endif() endif() _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
