[PATCH] D30578: remove Cmake option for LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING

[Bob Wilson via Phabricator via llvm-commits]

bob.wilson created this revision.
Herald added subscribers: mgorny, mcrosier.

This is a follow-up to my change in r295090, which added support for disabling these checks selectively based on setting the preprocessor macro without relying on the Cmake setting. Swift has moved over to use that approach, so we can clean up here and remove the Cmake setting.


https://reviews.llvm.org/D30578

Files:
  CMakeLists.txt
  llvm/Config/abi-breaking.h.cmake


Index: llvm/Config/abi-breaking.h.cmake
===================================================================
--- llvm/Config/abi-breaking.h.cmake
+++ llvm/Config/abi-breaking.h.cmake
@@ -15,11 +15,8 @@
 /* Define to enable checks that alter the LLVM C++ ABI */
 #cmakedefine01 LLVM_ENABLE_ABI_BREAKING_CHECKS
 
-/* Define to disable the link-time checking of mismatch for
-   LLVM_ENABLE_ABI_BREAKING_CHECKS */
-#ifndef LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING
-#cmakedefine01 LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING
-#endif
+/* Allow selectively disabling link-time mismatch checking so that header-only
+   ADT content from LLVM can be used without linking libSupport. */
 #if !LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING
 
 // ABI_BREAKING_CHECKS protection: provides link-time failure when clients build
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -396,9 +396,6 @@
 set(LLVM_ABI_BREAKING_CHECKS "WITH_ASSERTS" CACHE STRING
   "Enable abi-breaking checks.  Can be WITH_ASSERTS, FORCE_ON or FORCE_OFF.")
 
-option(LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING
-  "Disable abi-breaking checks mismatch detection at link-tim." OFF)
-
 option(LLVM_FORCE_USE_OLD_HOST_TOOLCHAIN
        "Set to ON to force using an old, unsupported host toolchain." OFF)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D30578.90490.patch
Type: text/x-patch
Size: 1341 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170303/549550ac/attachment.bin>