Skip to content

Commit 90bf6a1

Browse files
committed
Revert CMake changes from llvm#133265
1 parent 3843dfe commit 90bf6a1

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

llvm/cmake/modules/HandleLLVMOptions.cmake

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -690,12 +690,6 @@ endif( LLVM_COMPILER_IS_GCC_COMPATIBLE OR CMAKE_CXX_COMPILER_ID MATCHES "XL" )
690690

691691
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
692692
append("-Werror=unguarded-availability-new" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
693-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 21.0)
694-
# LLVM has a policy of including virtual "anchor" functions to control
695-
# where the vtable is emitted. In `final` classes, these are exactly what
696-
# this warning detects: unnecessary virtual methods.
697-
append("-Wno-unnecessary-virtual-specifier" CMAKE_CXX_FLAGS)
698-
endif()
699693
endif()
700694

701695
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND LLVM_ENABLE_LTO)
@@ -780,10 +774,10 @@ if (MSVC)
780774
# any code that uses the LLVM_ALIGNAS macro), so this is must be disabled to
781775
# avoid unwanted alignment warnings.
782776
-wd4324 # Suppress 'structure was padded due to __declspec(align())'
783-
# This is triggered for every variable that is a template type of a class even
777+
# This is triggered for every variable that is a template type of a class even
784778
# if there private when the class is dllexport'ed
785779
-wd4251 # Suppress 'needs to have dll-interface to be used by clients'
786-
# We only putting dll export on classes with out of line members so this
780+
# We only putting dll export on classes with out of line members so this
787781
# warning gets triggered a lot for bases we haven't exported'
788782
-wd4275 # non dll-interface class used as base for dll-interface class
789783

0 commit comments

Comments
 (0)