diff options
Diffstat (limited to 'llvm')
6 files changed, 8 insertions, 6 deletions
diff --git a/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn b/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn index a3c0d5a0524..539083253e6 100644 --- a/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn +++ b/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn @@ -29,7 +29,6 @@ write_cmake_config("Config") { "CLANG_CONFIG_FILE_USER_DIR=", "DEFAULT_SYSROOT=", "GCC_INSTALL_PREFIX=", - "CLANG_ANALYZER_WITH_Z3=", "BACKEND_PACKAGE_STRING=LLVM ${llvm_version}svn", "ENABLE_LINKER_BUILD_ID=", "ENABLE_X86_RELAX_RELOCATIONS=", diff --git a/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn index 745bc236935..a9dd15c9401 100644 --- a/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn +++ b/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn @@ -48,6 +48,7 @@ static_library("Core") { "RangeConstraintManager.cpp", "RangedConstraintManager.cpp", "RegionStore.cpp", + "SMTConstraintManager.cpp", "SValBuilder.cpp", "SVals.cpp", "SarifDiagnostics.cpp", @@ -58,9 +59,5 @@ static_library("Core") { "SymbolManager.cpp", "TaintManager.cpp", "WorkList.cpp", - "Z3ConstraintManager.cpp", ] - - # FIXME: clang/Config/BUILD.gn currently always sets CLANG_ANALYZER_WITH_Z3 - # to false. If that changes we need to link to Z3 libs here. } diff --git a/llvm/utils/gn/secondary/clang/test/BUILD.gn b/llvm/utils/gn/secondary/clang/test/BUILD.gn index 681b07cb860..bdaa97b2631 100644 --- a/llvm/utils/gn/secondary/clang/test/BUILD.gn +++ b/llvm/utils/gn/secondary/clang/test/BUILD.gn @@ -39,7 +39,7 @@ write_lit_config("lit_site_cfg") { output = clang_lit_site_cfg_file extra_values = [ - "CLANG_ANALYZER_WITH_Z3=", # Must be empty, not 0. + "LLVM_WITH_Z3=", # Must be empty, not 0. "CLANG_BUILD_EXAMPLES=0", "CLANG_DEFAULT_CXX_STDLIB=", # Empty string means "default value" here. "CLANG_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"), diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn index 4d0a3a8144c..820f6312075 100644 --- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn @@ -124,6 +124,7 @@ write_cmake_config("config") { "RETSIGTYPE=void", "LLVM_GISEL_COV_ENABLED=", "LLVM_GISEL_COV_PREFIX=", + "LLVM_WITH_Z3=", # This is both in llvm-config.h and config.h; llvm-config.h doesn't # define it if it's not set while config.h defines it to empty in that case. diff --git a/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn index 9a5fbd9b607..ab5f3362f39 100644 --- a/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn @@ -152,10 +152,14 @@ static_library("Support") { "Valgrind.cpp", "VirtualFileSystem.cpp", "Watchdog.cpp", + "Z3Solver.cpp", ] libs = [] + # FIXME: llvm/Config/BUILD.gn currently always sets LLVM_WITH_Z3 + # to false. If that changes we need to link to Z3 libs here. + if (current_os == "linux" || current_os == "android") { libs += [ "dl" ] } diff --git a/llvm/utils/gn/secondary/llvm/lib/Transforms/InstCombine/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Transforms/InstCombine/BUILD.gn index 0082528307b..d68a0071272 100644 --- a/llvm/utils/gn/secondary/llvm/lib/Transforms/InstCombine/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/lib/Transforms/InstCombine/BUILD.gn @@ -17,6 +17,7 @@ static_library("InstCombine") { sources = [ "InstCombineAddSub.cpp", "InstCombineAndOrXor.cpp", + "InstCombineAtomicRMW.cpp", "InstCombineCalls.cpp", "InstCombineCasts.cpp", "InstCombineCompares.cpp", |
