Author: Zahira Ammarguellat Date: 2020-07-28T18:04:36-05:00 New Revision: 80bd6ae13ea23d453a1f45d6ccdbfc7d0c877bb0
URL: https://github.com/llvm/llvm-project/commit/80bd6ae13ea23d453a1f45d6ccdbfc7d0c877bb0 DIFF: https://github.com/llvm/llvm-project/commit/80bd6ae13ea23d453a1f45d6ccdbfc7d0c877bb0.diff LOG: On Windows build, making the /bigobj flag global , instead of passing it per file. To avoid having this flag be passed in per/file manner, we are instead passing it globally. This fixes this bug: https://bugs.llvm.org/show_bug.cgi?id=46733 Reviewed-by: aaron.ballman, beanz, meinersbur Differential Revision: https://reviews.llvm.org/D84038 Added: Modified: clang/lib/ASTMatchers/Dynamic/CMakeLists.txt clang/lib/CodeGen/CMakeLists.txt clang/lib/Sema/CMakeLists.txt clang/unittests/AST/CMakeLists.txt clang/unittests/ASTMatchers/CMakeLists.txt clang/unittests/Tooling/CMakeLists.txt lldb/source/API/CMakeLists.txt llvm/cmake/modules/HandleLLVMOptions.cmake llvm/lib/Passes/CMakeLists.txt mlir/lib/Dialect/SPIRV/CMakeLists.txt Removed: ################################################################################ diff --git a/clang/lib/ASTMatchers/Dynamic/CMakeLists.txt b/clang/lib/ASTMatchers/Dynamic/CMakeLists.txt index adb891575b30..7110a503869e 100644 --- a/clang/lib/ASTMatchers/Dynamic/CMakeLists.txt +++ b/clang/lib/ASTMatchers/Dynamic/CMakeLists.txt @@ -3,15 +3,6 @@ set(LLVM_LINK_COMPONENTS Support ) -# The registry source file ends up generating a lot of sections for each -# matcher. Each matcher appears to get a vtable and several methods. Each -# method needs .text, .pdata, .xdata, and .debug sections, adding to the -# section multiplier. By default MSVC has a 2^16 limit on the number of -# sections in an object file, and this needs more than that. -if (MSVC) - set_source_files_properties(Registry.cpp PROPERTIES COMPILE_FLAGS /bigobj) -endif() - add_clang_library(clangDynamicASTMatchers Diagnostics.cpp Marshallers.cpp diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt index 8afd7219fbe1..88647a2007fb 100644 --- a/clang/lib/CodeGen/CMakeLists.txt +++ b/clang/lib/CodeGen/CMakeLists.txt @@ -26,10 +26,6 @@ set(LLVM_LINK_COMPONENTS TransformUtils ) -if (MSVC) - set_source_files_properties(CodeGenModule.cpp PROPERTIES COMPILE_FLAGS /bigobj) -endif() - add_clang_library(clangCodeGen BackendUtil.cpp CGAtomic.cpp diff --git a/clang/lib/Sema/CMakeLists.txt b/clang/lib/Sema/CMakeLists.txt index adadc06e209c..042ff561664d 100644 --- a/clang/lib/Sema/CMakeLists.txt +++ b/clang/lib/Sema/CMakeLists.txt @@ -3,15 +3,6 @@ set(LLVM_LINK_COMPONENTS Support ) -if (MSVC) - set_source_files_properties(SemaDeclAttr.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(SemaExpr.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(SemaExprCXX.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(SemaTemplate.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(SemaTemplateDeduction.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(SemaOpenMP.cpp PROPERTIES COMPILE_FLAGS /bigobj) -endif() - clang_tablegen(OpenCLBuiltins.inc -gen-clang-opencl-builtins SOURCE OpenCLBuiltins.td TARGET ClangOpenCLBuiltinsImpl diff --git a/clang/unittests/AST/CMakeLists.txt b/clang/unittests/AST/CMakeLists.txt index 2e750ac9ea92..2d5d0172afed 100644 --- a/clang/unittests/AST/CMakeLists.txt +++ b/clang/unittests/AST/CMakeLists.txt @@ -3,9 +3,6 @@ set(LLVM_LINK_COMPONENTS Support ) -if (MSVC) - set_source_files_properties(ASTImporterTest.cpp PROPERTIES COMPILE_FLAGS /bigobj) -endif() add_clang_unittest(ASTTests ASTContextParentMapTest.cpp diff --git a/clang/unittests/ASTMatchers/CMakeLists.txt b/clang/unittests/ASTMatchers/CMakeLists.txt index c9ac6c57d689..b40b3886dcd2 100644 --- a/clang/unittests/ASTMatchers/CMakeLists.txt +++ b/clang/unittests/ASTMatchers/CMakeLists.txt @@ -3,15 +3,6 @@ set(LLVM_LINK_COMPONENTS Support ) -# By default MSVC has a 2^16 limit on the number of sections in an object file, -# and this needs more than that. -if (MSVC) - set_source_files_properties(InternalASTMatchersTest.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(NodeMatchersTest.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(NarrowingMatchersTest.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(ASTTraversalMatchersTest.cpp PROPERTIES COMPILE_FLAGS /bigobj) -endif() - add_clang_unittest(ASTMatchersTests ASTMatchersInternalTest.cpp ASTMatchersNodeTest.cpp diff --git a/clang/unittests/Tooling/CMakeLists.txt b/clang/unittests/Tooling/CMakeLists.txt index c439f5a78637..f290c3d2bede 100644 --- a/clang/unittests/Tooling/CMakeLists.txt +++ b/clang/unittests/Tooling/CMakeLists.txt @@ -4,14 +4,6 @@ set(LLVM_LINK_COMPONENTS Support ) -# By default MSVC has a 2^16 limit on the number of sections in an object file, -# and this needs more than that. -if (MSVC) - set_source_files_properties(RecursiveASTVisitorTest.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(RecursiveASTVisitorTestExprVisitor.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(RecursiveASTVisitorTests/Callbacks.cpp PROPERTIES COMPILE_FLAGS /bigobj) - set_source_files_properties(SourceCodeTest.cpp PROPERTIES COMPILE_FLAGS /bigobj) -endif() add_clang_unittest(ToolingTests ASTSelectionTest.cpp diff --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt index ce6a7ec830fc..34f03e11c007 100644 --- a/lldb/source/API/CMakeLists.txt +++ b/lldb/source/API/CMakeLists.txt @@ -126,9 +126,6 @@ if(PYTHON_RPATH) set_property(TARGET liblldb APPEND PROPERTY BUILD_RPATH "${PYTHON_RPATH}") endif() -if (MSVC) - set_source_files_properties(SBReproducer.cpp PROPERTIES COMPILE_FLAGS /bigobj) -endif() if(lldb_python_wrapper) add_dependencies(liblldb swig_wrapper) diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index 89f7016a7db4..0df9334363b4 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -473,6 +473,10 @@ if( MSVC ) endif() endif() endif() + # By default MSVC has a 2^16 limit on the number of sections in an object file, + # but in many objects files need more than that. This flag is to increase the + # number of sections. + append("/bigobj" CMAKE_CXX_FLAGS) endif( MSVC ) # Warnings-as-errors handling for GCC-compatible compilers: diff --git a/llvm/lib/Passes/CMakeLists.txt b/llvm/lib/Passes/CMakeLists.txt index 371a21c113dc..35fde7ba4e28 100644 --- a/llvm/lib/Passes/CMakeLists.txt +++ b/llvm/lib/Passes/CMakeLists.txt @@ -1,7 +1,3 @@ -if (MSVC) - set_source_files_properties(PassBuilder.cpp PROPERTIES COMPILE_FLAGS /bigobj) -endif() - add_llvm_component_library(LLVMPasses PassBuilder.cpp PassPlugin.cpp diff --git a/mlir/lib/Dialect/SPIRV/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/CMakeLists.txt index fd34c1462804..10f06fdb8861 100644 --- a/mlir/lib/Dialect/SPIRV/CMakeLists.txt +++ b/mlir/lib/Dialect/SPIRV/CMakeLists.txt @@ -1,6 +1,3 @@ -if (MSVC) - set_source_files_properties(SPIRVDialect.cpp PROPERTIES COMPILE_FLAGS /bigobj) -endif() set(LLVM_TARGET_DEFINITIONS SPIRVCanonicalization.td) mlir_tablegen(SPIRVCanonicalization.inc -gen-rewriters) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
