From nobody Wed Dec 22 10:05:51 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 480B81905778; Wed, 22 Dec 2021 10:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJpql6psqz4YKg; Wed, 22 Dec 2021 10:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 39B3D1B1D4; Wed, 22 Dec 2021 10:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMA5phZ091904; Wed, 22 Dec 2021 10:05:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5p2i091903; Wed, 22 Dec 2021 10:05:51 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:51 GMT Message-Id: <202112221005.1BMA5p2i091903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: bc35b35cc9c3 - stable/12 - Update Makefiles under lib/clang and usr.bin/clang for 11.0.0 builds, and also bump the version in the mtree files. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: bc35b35cc9c3d099da2e7f64d5f4522f745c3cbb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vPQHEbEsGAsSCrOe7JRSXfVthiAmDz+oM3ibOsmmB7Y=; b=pdXe08lIlcbCyRVPuzDxL4Ftg6dgjXvBOTUfpLr8DPwGUt6ueXuBpySTcBC666ZNnb6hOZ 7rzkotT1tjRRYNF6k8HkOX9KgR4EX3omR4NRMpz31n9qY6hBix8VKfxroLt03W7cOZhIVo fAN+QXvZ+HmI6cVgjMRWSobjS9pLv8co7Y/dfWDMeTiBFDnq32KhxO5rLeEvUJ4cBflpRb 6O8PK8A5BFtIoqOHQq1FjDp1d+tEKwqGIjzSe3wofwfXQhHFv/L25fkaT1LaqlE48T7ySI C3yDYt7KxLP7YFPn/7xbTGI1CcQHkdlfsjtg9/YrFiW9VGbaOri0sNk49N6nGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167558; a=rsa-sha256; cv=none; b=tet1qsnH5K5X+WDJXhoSgeQVfpOVYSfooSPbrLxDlLamUl0r3r7LWZ2utM6LXxHyZ2N3eL ISl8xHcg+jcUBmzCKDgWYPfIw+koUeNWfZiw/aR/ytXnwrP0OJ9OPWC0lnGaiK6hG2CnzU LvFl+fRFVzqvnpNE1TyTxrTvvcmwpARrm2TXaaLWwACAzyB3BgmClrtIMClQfpDEXYSRTn eFACWxxugZeJ3egCm8cauzkygk15PCePMFVAB672KI962QDTQnoW/tBMrhKE65Ug00EWzK H9LjgoUk9tMvWacpI7h6EP7NrdMHEy/HhotrBJVQO9fK9WiPy2AMCIG4dW0qaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bc35b35cc9c3d099da2e7f64d5f4522f745c3cbb commit bc35b35cc9c3d099da2e7f64d5f4522f745c3cbb Author: Dimitry Andric AuthorDate: 2020-08-06 19:30:00 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:25 +0000 Update Makefiles under lib/clang and usr.bin/clang for 11.0.0 builds, and also bump the version in the mtree files. (cherry picked from commit 48aaf27bca484047c923eb06644c7666d5d89c24) --- etc/mtree/BSD.debug.dist | 2 +- etc/mtree/BSD.usr.dist | 2 +- lib/clang/headers/Makefile | 46 ++++++------- lib/clang/libclang/Makefile | 80 +++++++++++++++++++++- lib/clang/liblldb/Makefile | 70 ++++++++++--------- lib/clang/libllvm/Makefile | 122 +++++++++++++++++++++++++++------- lib/clang/libllvmminimal/Makefile | 1 + lib/libclang_rt/Makefile.inc | 2 +- usr.bin/clang/clang-tblgen/Makefile | 1 + usr.bin/clang/lld/Makefile | 1 - usr.bin/clang/llvm-dwarfdump/Makefile | 1 + usr.bin/clang/llvm-objcopy/Makefile | 4 ++ usr.bin/clang/llvm-objdump/Makefile | 1 + usr.bin/clang/llvm-tblgen/Makefile | 1 + 14 files changed, 250 insertions(+), 84 deletions(-) diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index 7468ae38a8e0..7a7f87b8af70 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -29,7 +29,7 @@ .. lib clang - 10.0.1 + 11.0.0 lib freebsd .. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 68289fbb0544..03b9225dabc3 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -37,7 +37,7 @@ aout .. clang - 10.0.1 + 11.0.0 include cuda_wrappers .. diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index 6a76fba10071..25eb0d34d952 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -1,4 +1,3 @@ - # $FreeBSD$ .include "../clang.pre.mk" @@ -6,29 +5,30 @@ .PATH: ${CLANG_SRCS}/lib/Headers INCSGROUPS= INCS CUDA OMP PPC -INCSDIR= ${LIBDIR}/clang/10.0.1/include +INCSDIR= ${LIBDIR}/clang/11.0.0/include CUDADIR= ${INCSDIR}/cuda_wrappers OMPDIR= ${INCSDIR}/openmp_wrappers PPCDIR= ${INCSDIR}/ppc_wrappers -GENINCS+= arm_fp16.h -GENINCS+= arm_mve.h -GENINCS+= arm_neon.h - INCS+= __clang_cuda_builtin_vars.h INCS+= __clang_cuda_cmath.h INCS+= __clang_cuda_complex_builtins.h INCS+= __clang_cuda_device_functions.h INCS+= __clang_cuda_intrinsics.h INCS+= __clang_cuda_libdevice_declares.h +INCS+= __clang_cuda_math.h INCS+= __clang_cuda_math_forward_declares.h INCS+= __clang_cuda_runtime_wrapper.h +INCS+= __clang_hip_libdevice_declares.h +INCS+= __clang_hip_math.h +INCS+= __clang_hip_runtime_wrapper.h INCS+= __stddef_max_align_t.h INCS+= __wmmintrin_aes.h INCS+= __wmmintrin_pclmul.h INCS+= adxintrin.h INCS+= altivec.h INCS+= ammintrin.h +INCS+= amxintrin.h INCS+= arm64intr.h INCS+= arm_acle.h INCS+= arm_cmse.h @@ -63,6 +63,7 @@ INCS+= avx512vpopcntdqvlintrin.h INCS+= avxintrin.h INCS+= bmi2intrin.h INCS+= bmiintrin.h +INCS+= cet.h INCS+= cetintrin.h INCS+= cldemoteintrin.h INCS+= clflushoptintrin.h @@ -102,16 +103,19 @@ INCS+= ptwriteintrin.h INCS+= rdseedintrin.h INCS+= rtmintrin.h INCS+= s390intrin.h +INCS+= serializeintrin.h INCS+= sgxintrin.h INCS+= shaintrin.h INCS+= smmintrin.h INCS+= tbmintrin.h INCS+= tmmintrin.h +INCS+= tsxldtrkintrin.h INCS+= vadefs.h INCS+= vaesintrin.h INCS+= vecintrin.h INCS+= vpclmulqdqintrin.h INCS+= waitpkgintrin.h +INCS+= wasm_simd128.h INCS+= wbnoinvdintrin.h INCS+= wmmintrin.h INCS+= x86intrin.h @@ -125,7 +129,7 @@ INCS+= xtestintrin.h INCS+= ${GENINCS} # Headers which possibly conflict with our own versions: -.if defined(INSTALL_CONFLICTING_CLANG_HEADERS) +.ifdef INSTALL_CONFLICTING_CLANG_HEADERS INCS+= float.h INCS+= intrin.h INCS+= inttypes.h @@ -139,17 +143,20 @@ INCS+= stddef.h INCS+= stdint.h INCS+= stdnoreturn.h INCS+= tgmath.h +INCS+= unwind.h INCS+= varargs.h -.endif +.endif # INSTALL_CONFLICTING_CLANG_HEADERS CUDA+= cuda_wrappers/algorithm CUDA+= cuda_wrappers/complex CUDA+= cuda_wrappers/new -OMP+= openmp_wrappers/__clang_openmp_math.h -OMP+= openmp_wrappers/__clang_openmp_math_declares.h +OMP+= openmp_wrappers/__clang_openmp_device_functions.h OMP+= openmp_wrappers/cmath +OMP+= openmp_wrappers/complex +OMP+= openmp_wrappers/complex.h OMP+= openmp_wrappers/math.h +OMP+= openmp_wrappers/new PPC+= ppc_wrappers/emmintrin.h PPC+= ppc_wrappers/mm_malloc.h @@ -159,20 +166,13 @@ PPC+= ppc_wrappers/smmintrin.h PPC+= ppc_wrappers/tmmintrin.h PPC+= ppc_wrappers/xmmintrin.h -arm_fp16.h: ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td - ${CLANG_TBLGEN} -gen-arm-fp16 \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td - -arm_mve.h: ${CLANG_SRCS}/include/clang/Basic/arm_mve.td - ${CLANG_TBLGEN} -gen-arm-mve-header \ - -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td - -arm_neon.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td - ${CLANG_TBLGEN} -gen-arm-neon \ +.for hdr in bf16/bf16 cde/cde-header fp16/fp16 mve/mve-header sve/sve-header +arm_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/arm_${hdr:H}.td + ${CLANG_TBLGEN} -gen-arm-${hdr:T} \ -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_neon.td + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_${hdr:H}.td +GENINCS+= arm_${hdr:H}.h +.endfor CLEANFILES= ${GENINCS} ${GENINCS:C/$/.d/} diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 8eb526e93b5b..414394725ca8 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -65,6 +65,7 @@ SRCS_MIN+= AST/CommentLexer.cpp SRCS_MIN+= AST/CommentParser.cpp SRCS_MIN+= AST/CommentSema.cpp SRCS_MIN+= AST/ComparisonCategories.cpp +SRCS_MIN+= AST/ComputeDependence.cpp SRCS_FUL+= AST/DataCollection.cpp SRCS_MIN+= AST/Decl.cpp SRCS_MIN+= AST/DeclBase.cpp @@ -86,7 +87,6 @@ SRCS_LDB+= AST/ExternalASTMerger.cpp SRCS_MIN+= AST/ExternalASTSource.cpp SRCS_MIN+= AST/FormatString.cpp SRCS_MIN+= AST/InheritViz.cpp -SRCS_MIN+= AST/Interp/Block.cpp SRCS_MIN+= AST/Interp/ByteCodeEmitter.cpp SRCS_MIN+= AST/Interp/ByteCodeExprGen.cpp SRCS_MIN+= AST/Interp/ByteCodeGenError.cpp @@ -97,6 +97,7 @@ SRCS_MIN+= AST/Interp/EvalEmitter.cpp SRCS_MIN+= AST/Interp/Frame.cpp SRCS_MIN+= AST/Interp/Function.cpp SRCS_MIN+= AST/Interp/Interp.cpp +SRCS_MIN+= AST/Interp/InterpBlock.cpp SRCS_MIN+= AST/Interp/InterpFrame.cpp SRCS_MIN+= AST/Interp/InterpStack.cpp SRCS_MIN+= AST/Interp/InterpState.cpp @@ -118,6 +119,7 @@ SRCS_MIN+= AST/ODRHash.cpp SRCS_MIN+= AST/OSLog.cpp SRCS_MIN+= AST/OpenMPClause.cpp SRCS_MIN+= AST/ParentMap.cpp +SRCS_MIN+= AST/ParentMapContext.cpp SRCS_MIN+= AST/PrintfFormatString.cpp SRCS_MIN+= AST/QualTypeNames.cpp SRCS_MIN+= AST/RawCommentList.cpp @@ -177,6 +179,7 @@ SRCS_MIN+= Basic/Cuda.cpp SRCS_MIN+= Basic/Diagnostic.cpp SRCS_MIN+= Basic/DiagnosticIDs.cpp SRCS_MIN+= Basic/DiagnosticOptions.cpp +SRCS_MIN+= Basic/ExpressionTraits.cpp SRCS_MIN+= Basic/FileManager.cpp SRCS_MIN+= Basic/FileSystemStatCache.cpp SRCS_MIN+= Basic/FixedPoint.cpp @@ -215,10 +218,12 @@ SRCS_MIN+= Basic/Targets/SPIR.cpp SRCS_MIN+= Basic/Targets/Sparc.cpp SRCS_MIN+= Basic/Targets/SystemZ.cpp SRCS_MIN+= Basic/Targets/TCE.cpp +SRCS_MIN+= Basic/Targets/VE.cpp SRCS_MIN+= Basic/Targets/WebAssembly.cpp SRCS_MIN+= Basic/Targets/X86.cpp SRCS_MIN+= Basic/Targets/XCore.cpp SRCS_MIN+= Basic/TokenKinds.cpp +SRCS_MIN+= Basic/TypeTraits.cpp SRCS_MIN+= Basic/Version.cpp SRCS_MIN+= Basic/Warnings.cpp SRCS_MIN+= Basic/XRayInstr.cpp @@ -303,6 +308,7 @@ SRCS_MIN+= Driver/ToolChains/Arch/PPC.cpp SRCS_MIN+= Driver/ToolChains/Arch/RISCV.cpp SRCS_MIN+= Driver/ToolChains/Arch/Sparc.cpp SRCS_MIN+= Driver/ToolChains/Arch/SystemZ.cpp +SRCS_MIN+= Driver/ToolChains/Arch/VE.cpp SRCS_MIN+= Driver/ToolChains/Arch/X86.cpp SRCS_MIN+= Driver/ToolChains/BareMetal.cpp SRCS_MIN+= Driver/ToolChains/Clang.cpp @@ -337,6 +343,7 @@ SRCS_MIN+= Driver/ToolChains/PS4CPU.cpp SRCS_MIN+= Driver/ToolChains/RISCVToolchain.cpp SRCS_MIN+= Driver/ToolChains/Solaris.cpp SRCS_MIN+= Driver/ToolChains/TCE.cpp +SRCS_MIN+= Driver/ToolChains/VEToolchain.cpp SRCS_MIN+= Driver/ToolChains/WebAssembly.cpp SRCS_MIN+= Driver/ToolChains/XCore.cpp SRCS_MIN+= Driver/Types.cpp @@ -460,6 +467,7 @@ SRCS_MIN+= Sema/ScopeInfo.cpp SRCS_MIN+= Sema/Sema.cpp SRCS_MIN+= Sema/SemaAccess.cpp SRCS_MIN+= Sema/SemaAttr.cpp +SRCS_MIN+= Sema/SemaAvailability.cpp SRCS_MIN+= Sema/SemaCUDA.cpp SRCS_MIN+= Sema/SemaCXXScopeSpec.cpp SRCS_MIN+= Sema/SemaCast.cpp @@ -486,6 +494,7 @@ SRCS_MIN+= Sema/SemaObjCProperty.cpp SRCS_MIN+= Sema/SemaOpenMP.cpp SRCS_MIN+= Sema/SemaOverload.cpp SRCS_MIN+= Sema/SemaPseudoObject.cpp +SRCS_MIN+= Sema/SemaSYCL.cpp SRCS_MIN+= Sema/SemaStmt.cpp SRCS_MIN+= Sema/SemaStmtAsm.cpp SRCS_MIN+= Sema/SemaStmtAttr.cpp @@ -533,9 +542,11 @@ SRCS_FUL+= StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp SRCS_FUL+= StaticAnalyzer/Checkers/CheckSizeofPointer.cpp SRCS_FUL+= StaticAnalyzer/Checkers/ChrootChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/CloneChecker.cpp +SRCS_FUL+= StaticAnalyzer/Checkers/ContainerModeling.cpp SRCS_FUL+= StaticAnalyzer/Checkers/ConversionChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/DeadStoresChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/DebugCheckers.cpp +SRCS_FUL+= StaticAnalyzer/Checkers/DebugContainerModeling.cpp SRCS_FUL+= StaticAnalyzer/Checkers/DebugIteratorModeling.cpp SRCS_FUL+= StaticAnalyzer/Checkers/DeleteWithNonVirtualDtorChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/DereferenceChecker.cpp @@ -599,7 +610,9 @@ SRCS_FUL+= StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/ReturnUndefChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/ReturnValueChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/RunLoopAutoreleaseLeakChecker.cpp +SRCS_FUL+= StaticAnalyzer/Checkers/STLAlgorithmModeling.cpp SRCS_FUL+= StaticAnalyzer/Checkers/SimpleStreamChecker.cpp +SRCS_FUL+= StaticAnalyzer/Checkers/SmartPtrChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/SmartPtrModeling.cpp SRCS_FUL+= StaticAnalyzer/Checkers/StackAddrEscapeChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp @@ -622,6 +635,12 @@ SRCS_FUL+= StaticAnalyzer/Checkers/VLASizeChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/ValistChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/VforkChecker.cpp SRCS_FUL+= StaticAnalyzer/Checkers/VirtualCallChecker.cpp +SRCS_FUL+= StaticAnalyzer/Checkers/cert/PutenvWithAutoChecker.cpp +SRCS_FUL+= StaticAnalyzer/Checkers/WebKit/ASTUtils.cpp +SRCS_FUL+= StaticAnalyzer/Checkers/WebKit/NoUncountedMembersChecker.cpp +SRCS_FUL+= StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp +SRCS_FUL+= StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp +SRCS_FUL+= StaticAnalyzer/Checkers/WebKit/UncountedCallArgsChecker.cpp SRCS_FUL+= StaticAnalyzer/Core/APSIntType.cpp SRCS_FUL+= StaticAnalyzer/Core/AnalysisManager.cpp SRCS_FUL+= StaticAnalyzer/Core/AnalyzerOptions.cpp @@ -634,9 +653,11 @@ SRCS_FUL+= StaticAnalyzer/Core/Checker.cpp SRCS_FUL+= StaticAnalyzer/Core/CheckerContext.cpp SRCS_FUL+= StaticAnalyzer/Core/CheckerHelpers.cpp SRCS_FUL+= StaticAnalyzer/Core/CheckerManager.cpp +SRCS_FUL+= StaticAnalyzer/Core/CheckerRegistryData.cpp SRCS_FUL+= StaticAnalyzer/Core/CommonBugCategories.cpp SRCS_FUL+= StaticAnalyzer/Core/ConstraintManager.cpp SRCS_FUL+= StaticAnalyzer/Core/CoreEngine.cpp +SRCS_FUL+= StaticAnalyzer/Core/DynamicSize.cpp SRCS_FUL+= StaticAnalyzer/Core/DynamicType.cpp SRCS_FUL+= StaticAnalyzer/Core/Environment.cpp SRCS_FUL+= StaticAnalyzer/Core/ExplodedGraph.cpp @@ -663,12 +684,13 @@ SRCS_FUL+= StaticAnalyzer/Core/SarifDiagnostics.cpp SRCS_FUL+= StaticAnalyzer/Core/SimpleConstraintManager.cpp SRCS_FUL+= StaticAnalyzer/Core/SimpleSValBuilder.cpp SRCS_FUL+= StaticAnalyzer/Core/Store.cpp -SRCS_FUL+= StaticAnalyzer/Core/SubEngine.cpp SRCS_FUL+= StaticAnalyzer/Core/SymbolManager.cpp +SRCS_FUL+= StaticAnalyzer/Core/TextDiagnostics.cpp SRCS_FUL+= StaticAnalyzer/Core/WorkList.cpp SRCS_FUL+= StaticAnalyzer/Frontend/AnalysisConsumer.cpp -SRCS_FUL+= StaticAnalyzer/Frontend/CheckerRegistration.cpp +SRCS_FUL+= StaticAnalyzer/Frontend/AnalyzerHelpFlags.cpp SRCS_FUL+= StaticAnalyzer/Frontend/CheckerRegistry.cpp +SRCS_FUL+= StaticAnalyzer/Frontend/CreateCheckerManager.cpp SRCS_FUL+= StaticAnalyzer/Frontend/FrontendActions.cpp SRCS_FUL+= StaticAnalyzer/Frontend/ModelConsumer.cpp SRCS_FUL+= StaticAnalyzer/Frontend/ModelInjector.cpp @@ -876,6 +898,32 @@ clang/Basic/arm_neon.inc: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_neon.td TGHDRS+= clang/Basic/arm_neon.inc +clang/Basic/arm_cde_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} -gen-arm-cde-builtin-def \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td +TGHDRS+= clang/Basic/arm_cde_builtins.inc + +clang/Basic/arm_cde_builtin_aliases.inc: \ + ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} -gen-arm-cde-builtin-aliases \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td +TGHDRS+= clang/Basic/arm_cde_builtin_aliases.inc + +clang/Basic/arm_cde_builtin_cg.inc: ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} -gen-arm-cde-builtin-codegen \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td +TGHDRS+= clang/Basic/arm_cde_builtin_cg.inc + +clang/Basic/arm_cde_builtin_sema.inc: \ + ${CLANG_SRCS}/include/clang/Basic/arm_cde.td + ${CLANG_TBLGEN} -gen-arm-cde-builtin-sema \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_cde.td +TGHDRS+= clang/Basic/arm_cde_builtin_sema.inc + clang/Basic/arm_mve_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_mve.td ${CLANG_TBLGEN} -gen-arm-mve-builtin-def \ -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ @@ -902,6 +950,32 @@ clang/Basic/arm_mve_builtin_sema.inc: \ -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_mve.td TGHDRS+= clang/Basic/arm_mve_builtin_sema.inc +clang/Basic/arm_sve_builtins.inc: ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} -gen-arm-sve-builtins \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td +TGHDRS+= clang/Basic/arm_sve_builtins.inc + +clang/Basic/arm_sve_builtin_cg.inc: ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} -gen-arm-sve-builtin-codegen \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td +TGHDRS+= clang/Basic/arm_sve_builtin_cg.inc + +clang/Basic/arm_sve_sema_rangechecks.inc: \ + ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} -gen-arm-sve-sema-rangechecks \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td +TGHDRS+= clang/Basic/arm_sve_sema_rangechecks.inc + +clang/Basic/arm_sve_typeflags.inc: \ + ${CLANG_SRCS}/include/clang/Basic/arm_sve.td + ${CLANG_TBLGEN} -gen-arm-sve-typeflags \ + -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/arm_sve.td +TGHDRS+= clang/Basic/arm_sve_typeflags.inc + clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td ${LLVM_TBLGEN} -gen-opt-parser-defs \ -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index dff816a17eb8..97deef784dc5 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -7,9 +7,9 @@ SRCDIR= lldb/source CFLAGS+= -I${LLDB_SRCS}/include CFLAGS+= -I${LLDB_SRCS}/source -CFLAGS+= -I${LLDB_SRCS}/source/Plugins/Process/FreeBSD -CFLAGS+= -I${LLDB_SRCS}/source/Plugins/Process/POSIX -CFLAGS+= -I${LLDB_SRCS}/source/Plugins/Process/Utility +#CFLAGS+= -I${LLDB_SRCS}/source/Plugins/Process/FreeBSD +#CFLAGS+= -I${LLDB_SRCS}/source/Plugins/Process/POSIX +#CFLAGS+= -I${LLDB_SRCS}/source/Plugins/Process/Utility CFLAGS+= -I${OBJTOP}/lib/clang/libllvm CFLAGS+= -I${OBJTOP}/lib/clang/libclang CFLAGS+= -I${OBJTOP}/lib/clang/liblldb @@ -25,12 +25,14 @@ SRCS+= API/SBBreakpointName.cpp SRCS+= API/SBBreakpointOptionCommon.cpp SRCS+= API/SBBroadcaster.cpp SRCS+= API/SBCommandInterpreter.cpp +SRCS+= API/SBCommandInterpreterRunOptions.cpp SRCS+= API/SBCommandReturnObject.cpp SRCS+= API/SBCommunication.cpp SRCS+= API/SBCompileUnit.cpp SRCS+= API/SBData.cpp SRCS+= API/SBDebugger.cpp SRCS+= API/SBDeclaration.cpp +SRCS+= API/SBEnvironment.cpp SRCS+= API/SBError.cpp SRCS+= API/SBEvent.cpp SRCS+= API/SBExecutionContext.cpp @@ -235,7 +237,6 @@ SRCS+= Host/common/Socket.cpp SRCS+= Host/common/SocketAddress.cpp SRCS+= Host/common/StringConvert.cpp SRCS+= Host/common/TCPSocket.cpp -SRCS+= Host/common/TaskPool.cpp SRCS+= Host/common/Terminal.cpp SRCS+= Host/common/ThreadLauncher.cpp SRCS+= Host/common/UDPSocket.cpp @@ -298,48 +299,60 @@ SRCS+= Interpreter/OptionValueUUID.cpp SRCS+= Interpreter/Options.cpp SRCS+= Interpreter/Property.cpp SRCS+= Interpreter/ScriptInterpreter.cpp -SRCS+= Plugins/ABI/SysV-arm/ABISysV_arm.cpp -SRCS+= Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp -SRCS+= Plugins/ABI/SysV-i386/ABISysV_i386.cpp -SRCS+= Plugins/ABI/SysV-mips/ABISysV_mips.cpp -SRCS+= Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp -SRCS+= Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp -SRCS+= Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp -SRCS+= Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp +SRCS+= Plugins/ABI/AArch64/ABIAArch64.cpp +SRCS+= Plugins/ABI/AArch64/ABISysV_arm64.cpp +SRCS+= Plugins/ABI/ARM/ABIARM.cpp +SRCS+= Plugins/ABI/ARM/ABISysV_arm.cpp +SRCS+= Plugins/ABI/Mips/ABIMips.cpp +SRCS+= Plugins/ABI/Mips/ABISysV_mips.cpp +SRCS+= Plugins/ABI/Mips/ABISysV_mips64.cpp +SRCS+= Plugins/ABI/PowerPC/ABIPowerPC.cpp +SRCS+= Plugins/ABI/PowerPC/ABISysV_ppc.cpp +SRCS+= Plugins/ABI/PowerPC/ABISysV_ppc64.cpp +SRCS+= Plugins/ABI/X86/ABISysV_i386.cpp +SRCS+= Plugins/ABI/X86/ABISysV_x86_64.cpp +SRCS+= Plugins/ABI/X86/ABIX86.cpp SRCS+= Plugins/Architecture/Arm/ArchitectureArm.cpp SRCS+= Plugins/Architecture/Mips/ArchitectureMips.cpp SRCS+= Plugins/Architecture/PPC64/ArchitecturePPC64.cpp -SRCS+= Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp +SRCS+= Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp SRCS+= Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp SRCS+= Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp SRCS+= Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp SRCS+= Plugins/ExpressionParser/Clang/ASTResultSynthesizer.cpp SRCS+= Plugins/ExpressionParser/Clang/ASTStructExtractor.cpp SRCS+= Plugins/ExpressionParser/Clang/ASTUtils.cpp +SRCS+= Plugins/ExpressionParser/Clang/ClangASTImporter.cpp +SRCS+= Plugins/ExpressionParser/Clang/ClangASTMetadata.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangASTSource.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangDeclVendor.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangExpressionSourceCode.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangExpressionVariable.cpp +SRCS+= Plugins/ExpressionParser/Clang/ClangExternalASTSourceCallbacks.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangFunctionCaller.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangHost.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangPersistentVariables.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangUserExpression.cpp +SRCS+= Plugins/ExpressionParser/Clang/ClangUtil.cpp SRCS+= Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp SRCS+= Plugins/ExpressionParser/Clang/CppModuleConfiguration.cpp +SRCS+= Plugins/ExpressionParser/Clang/CxxModuleHandler.cpp SRCS+= Plugins/ExpressionParser/Clang/IRDynamicChecks.cpp SRCS+= Plugins/ExpressionParser/Clang/IRForTarget.cpp +SRCS+= Plugins/ExpressionParser/Clang/NameSearchContext.cpp SRCS+= Plugins/Instruction/ARM/EmulateInstructionARM.cpp SRCS+= Plugins/Instruction/ARM/EmulationStateARM.cpp SRCS+= Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp SRCS+= Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp SRCS+= Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp SRCS+= Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp -SRCS+= Plugins/InstrumentationRuntime/ASan/ASanRuntime.cpp -SRCS+= Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.cpp -SRCS+= Plugins/InstrumentationRuntime/UBSan/UBSanRuntime.cpp +SRCS+= Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp +SRCS+= Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.cpp +SRCS+= Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp +SRCS+= Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp SRCS+= Plugins/JITLoader/GDB/JITLoaderGDB.cpp SRCS+= Plugins/Language/CPlusPlus/BlockPointer.cpp SRCS+= Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp @@ -378,6 +391,8 @@ SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp SRCS+= Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.cpp +SRCS+= Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp +SRCS+= Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp SRCS+= Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp SRCS+= Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp SRCS+= Plugins/ObjectFile/Breakpad/BreakpadRecords.cpp @@ -418,13 +433,12 @@ SRCS+= Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp SRCS+= Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.cpp SRCS+= Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp SRCS+= Plugins/Process/Utility/RegisterContextHistory.cpp -SRCS+= Plugins/Process/Utility/RegisterContextLLDB.cpp SRCS+= Plugins/Process/Utility/RegisterContextLinux_i386.cpp SRCS+= Plugins/Process/Utility/RegisterContextLinux_mips.cpp SRCS+= Plugins/Process/Utility/RegisterContextLinux_mips64.cpp SRCS+= Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp -SRCS+= Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp SRCS+= Plugins/Process/Utility/RegisterContextMemory.cpp +SRCS+= Plugins/Process/Utility/RegisterContextNetBSD_i386.cpp SRCS+= Plugins/Process/Utility/RegisterContextNetBSD_x86_64.cpp SRCS+= Plugins/Process/Utility/RegisterContextOpenBSD_i386.cpp SRCS+= Plugins/Process/Utility/RegisterContextOpenBSD_x86_64.cpp @@ -440,8 +454,6 @@ SRCS+= Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp SRCS+= Plugins/Process/Utility/RegisterInfoPOSIX_ppc64le.cpp SRCS+= Plugins/Process/Utility/StopInfoMachException.cpp SRCS+= Plugins/Process/Utility/ThreadMemory.cpp -SRCS+= Plugins/Process/Utility/UnwindLLDB.cpp -SRCS+= Plugins/Process/Utility/UnwindMacOSXFrameBackchain.cpp SRCS+= Plugins/Process/elf-core/ProcessElfCore.cpp SRCS+= Plugins/Process/elf-core/RegisterContextPOSIXCore_arm.cpp SRCS+= Plugins/Process/elf-core/RegisterContextPOSIXCore_arm64.cpp @@ -499,27 +511,20 @@ SRCS+= Plugins/SymbolFile/DWARF/NameToDIE.cpp SRCS+= Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp SRCS+= Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp SRCS+= Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp -SRCS+= Plugins/SymbolFile/DWARF/SymbolFileDWARFDwoDwp.cpp -SRCS+= Plugins/SymbolFile/DWARF/SymbolFileDWARFDwp.cpp SRCS+= Plugins/SymbolFile/DWARF/UniqueDWARFASTType.cpp SRCS+= Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp SRCS+= Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp +SRCS+= Plugins/TypeSystem/Clang/TypeSystemClang.cpp SRCS+= Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp SRCS+= Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp SRCS+= Plugins/UnwindAssembly/x86/x86AssemblyInspectionEngine.cpp SRCS+= Symbol/ArmUnwindInfo.cpp SRCS+= Symbol/Block.cpp -SRCS+= Symbol/ClangASTContext.cpp -SRCS+= Symbol/ClangASTImporter.cpp -SRCS+= Symbol/ClangASTMetadata.cpp -SRCS+= Symbol/ClangExternalASTSourceCallbacks.cpp -SRCS+= Symbol/ClangUtil.cpp SRCS+= Symbol/CompactUnwindInfo.cpp SRCS+= Symbol/CompileUnit.cpp SRCS+= Symbol/CompilerDecl.cpp SRCS+= Symbol/CompilerDeclContext.cpp SRCS+= Symbol/CompilerType.cpp -SRCS+= Symbol/CxxModuleHandler.cpp SRCS+= Symbol/DWARFCallFrameInfo.cpp SRCS+= Symbol/DebugMacros.cpp SRCS+= Symbol/DeclVendor.cpp @@ -545,6 +550,7 @@ SRCS+= Symbol/UnwindTable.cpp SRCS+= Symbol/Variable.cpp SRCS+= Symbol/VariableList.cpp SRCS+= Target/ABI.cpp +SRCS+= Target/AssertFrameRecognizer.cpp SRCS+= Target/ExecutionContext.cpp SRCS+= Target/InstrumentationRuntime.cpp SRCS+= Target/InstrumentationRuntimeStopInfo.cpp @@ -564,6 +570,7 @@ SRCS+= Target/Queue.cpp SRCS+= Target/QueueItem.cpp SRCS+= Target/QueueList.cpp SRCS+= Target/RegisterContext.cpp +SRCS+= Target/RegisterContextUnwind.cpp SRCS+= Target/RegisterNumber.cpp SRCS+= Target/RemoteAwarePlatform.cpp SRCS+= Target/SectionLoadHistory.cpp @@ -587,6 +594,7 @@ SRCS+= Target/ThreadPlanCallUserExpression.cpp SRCS+= Target/ThreadPlanPython.cpp SRCS+= Target/ThreadPlanRunToAddress.cpp SRCS+= Target/ThreadPlanShouldStopHere.cpp +SRCS+= Target/ThreadPlanStack.cpp SRCS+= Target/ThreadPlanStepInRange.cpp SRCS+= Target/ThreadPlanStepInstruction.cpp SRCS+= Target/ThreadPlanStepOut.cpp @@ -599,6 +607,7 @@ SRCS+= Target/ThreadPlanTracer.cpp SRCS+= Target/ThreadSpec.cpp SRCS+= Target/UnixSignals.cpp SRCS+= Target/UnwindAssembly.cpp +SRCS+= Target/UnwindLLDB.cpp SRCS+= Utility/ArchSpec.cpp SRCS+= Utility/Args.cpp SRCS+= Utility/Baton.cpp @@ -627,7 +636,6 @@ SRCS+= Utility/Reproducer.cpp SRCS+= Utility/ReproducerInstrumentation.cpp SRCS+= Utility/Scalar.cpp SRCS+= Utility/SelectHelper.cpp -SRCS+= Utility/SharingPtr.cpp SRCS+= Utility/State.cpp SRCS+= Utility/Status.cpp SRCS+= Utility/Stream.cpp @@ -687,13 +695,13 @@ INTERNALLIB= # Building lldb's bindings requires swig, but we do not want to include it in # the FreeBSD base system (as a build tool) because it has non-trivial # dependencies. As a workaround we commit the generated file. Requires the -# swig30 package. +# swig package. # # After importing an updated llvm/lldb into FreeBSD run `make run-swig` in # this directory to generate generate LLDBWrapLua.cpp, and commit the result. .PHONY: run-swig run-swig: - swig3.0 -I${LLDB_SRCS}/include \ + swig -I${LLDB_SRCS}/include \ -c++ -features autodoc -lua -w503 \ -o ${.CURDIR}/LLDBWrapLua.cpp ${LLDB_SRCS}/bindings/lua.swig diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 219c1dab0067..17f92f7cd586 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -42,6 +42,7 @@ SRCS_MIN+= Analysis/AliasAnalysisEvaluator.cpp SRCS_MIN+= Analysis/AliasAnalysisSummary.cpp SRCS_MIN+= Analysis/AliasSetTracker.cpp SRCS_EXT+= Analysis/Analysis.cpp +SRCS_MIN+= Analysis/AssumeBundleQueries.cpp SRCS_MIN+= Analysis/AssumptionCache.cpp SRCS_MIN+= Analysis/BasicAliasAnalysis.cpp SRCS_MIN+= Analysis/BlockFrequencyInfo.cpp @@ -72,10 +73,14 @@ SRCS_MIN+= Analysis/DominanceFrontier.cpp SRCS_MIN+= Analysis/EHPersonalities.cpp SRCS_MIN+= Analysis/GlobalsModRef.cpp SRCS_MIN+= Analysis/GuardUtils.cpp +SRCS_MIN+= Analysis/HeatUtils.cpp SRCS_MIN+= Analysis/IVDescriptors.cpp SRCS_MIN+= Analysis/IVUsers.cpp SRCS_MIN+= Analysis/IndirectCallPromotionAnalysis.cpp +SRCS_MIN+= Analysis/InlineAdvisor.cpp SRCS_MIN+= Analysis/InlineCost.cpp +SRCS_MIN+= Analysis/InlineFeaturesAnalysis.cpp +SRCS_MIN+= Analysis/InlineSizeEstimatorAnalysis.cpp SRCS_MIN+= Analysis/InstCount.cpp SRCS_MIN+= Analysis/InstructionPrecedenceTracking.cpp SRCS_MIN+= Analysis/InstructionSimplify.cpp @@ -92,6 +97,7 @@ SRCS_MIN+= Analysis/LoopAccessAnalysis.cpp SRCS_MIN+= Analysis/LoopAnalysisManager.cpp SRCS_MIN+= Analysis/LoopCacheAnalysis.cpp SRCS_MIN+= Analysis/LoopInfo.cpp +SRCS_MIN+= Analysis/LoopNestAnalysis.cpp SRCS_MIN+= Analysis/LoopPass.cpp SRCS_MIN+= Analysis/LoopUnrollAnalyzer.cpp SRCS_MIN+= Analysis/MemDepPrinter.cpp @@ -108,8 +114,6 @@ SRCS_MIN+= Analysis/ObjCARCAliasAnalysis.cpp SRCS_MIN+= Analysis/ObjCARCAnalysisUtils.cpp SRCS_MIN+= Analysis/ObjCARCInstKind.cpp SRCS_MIN+= Analysis/OptimizationRemarkEmitter.cpp -SRCS_MIN+= Analysis/OrderedBasicBlock.cpp -SRCS_MIN+= Analysis/OrderedInstructions.cpp SRCS_MIN+= Analysis/PHITransAddr.cpp SRCS_MIN+= Analysis/PhiValues.cpp SRCS_MIN+= Analysis/PostDominators.cpp @@ -119,10 +123,12 @@ SRCS_MIN+= Analysis/RegionInfo.cpp SRCS_MIN+= Analysis/RegionPass.cpp SRCS_MIN+= Analysis/RegionPrinter.cpp SRCS_MIN+= Analysis/ScalarEvolution.cpp +SRCS_MIN+= Analysis/ScalarEvolution.cpp SRCS_MIN+= Analysis/ScalarEvolutionAliasAnalysis.cpp -SRCS_MIN+= Analysis/ScalarEvolutionExpander.cpp +SRCS_MIN+= Analysis/ScalarEvolutionDivision.cpp SRCS_MIN+= Analysis/ScalarEvolutionNormalization.cpp SRCS_MIN+= Analysis/ScopedNoAliasAA.cpp +SRCS_MIN+= Analysis/StackLifetime.cpp SRCS_MIN+= Analysis/StackSafetyAnalysis.cpp SRCS_MIN+= Analysis/SyncDependenceAnalysis.cpp SRCS_MIN+= Analysis/SyntheticCountsUtils.cpp @@ -140,6 +146,7 @@ SRCS_MIN+= AsmParser/LLParser.cpp SRCS_MIN+= AsmParser/Parser.cpp SRCS_MIN+= BinaryFormat/Dwarf.cpp SRCS_MIN+= BinaryFormat/Magic.cpp +SRCS_MIN+= BinaryFormat/MachO.cpp SRCS_MIN+= BinaryFormat/Wasm.cpp SRCS_MIN+= BinaryFormat/XCOFF.cpp SRCS_MIN+= Bitcode/Reader/BitReader.cpp @@ -180,6 +187,7 @@ SRCS_MIN+= CodeGen/AsmPrinter/WasmException.cpp SRCS_MIN+= CodeGen/AsmPrinter/WinCFGuard.cpp SRCS_MIN+= CodeGen/AsmPrinter/WinException.cpp SRCS_MIN+= CodeGen/AtomicExpandPass.cpp +SRCS_MIN+= CodeGen/BBSectionsPrepare.cpp SRCS_MIN+= CodeGen/BasicTargetTransformInfo.cpp SRCS_MIN+= CodeGen/BranchFolding.cpp SRCS_MIN+= CodeGen/BranchRelaxation.cpp @@ -191,6 +199,7 @@ SRCS_MIN+= CodeGen/CalcSpillWeights.cpp SRCS_MIN+= CodeGen/CallingConvLower.cpp SRCS_MIN+= CodeGen/CodeGen.cpp SRCS_MIN+= CodeGen/CodeGenPrepare.cpp +SRCS_EXL+= CodeGen/CommandFlags.cpp SRCS_MIN+= CodeGen/CriticalAntiDepBreaker.cpp SRCS_MIN+= CodeGen/DFAPacketizer.cpp SRCS_MIN+= CodeGen/DeadMachineInstructionElim.cpp @@ -205,6 +214,7 @@ SRCS_MIN+= CodeGen/ExpandReductions.cpp SRCS_MIN+= CodeGen/FEntryInserter.cpp SRCS_MIN+= CodeGen/FaultMaps.cpp SRCS_MIN+= CodeGen/FinalizeISel.cpp +SRCS_MIN+= CodeGen/FixupStatepointCallerSaved.cpp SRCS_MIN+= CodeGen/FuncletLayout.cpp SRCS_MIN+= CodeGen/GCMetadata.cpp SRCS_MIN+= CodeGen/GCMetadataPrinter.cpp @@ -219,6 +229,7 @@ SRCS_MIN+= CodeGen/GlobalISel/GISelChangeObserver.cpp SRCS_MIN+= CodeGen/GlobalISel/GISelKnownBits.cpp SRCS_MIN+= CodeGen/GlobalISel/GlobalISel.cpp SRCS_MIN+= CodeGen/GlobalISel/IRTranslator.cpp +SRCS_MIN+= CodeGen/GlobalISel/InlineAsmLowering.cpp SRCS_MIN+= CodeGen/GlobalISel/InstructionSelect.cpp SRCS_MIN+= CodeGen/GlobalISel/InstructionSelector.cpp SRCS_MIN+= CodeGen/GlobalISel/LegalityPredicates.cpp @@ -227,6 +238,7 @@ SRCS_MIN+= CodeGen/GlobalISel/Legalizer.cpp SRCS_MIN+= CodeGen/GlobalISel/LegalizerHelper.cpp SRCS_MIN+= CodeGen/GlobalISel/LegalizerInfo.cpp SRCS_MIN+= CodeGen/GlobalISel/Localizer.cpp +SRCS_MIN+= CodeGen/GlobalISel/LostDebugLocObserver.cpp SRCS_MIN+= CodeGen/GlobalISel/MachineIRBuilder.cpp SRCS_MIN+= CodeGen/GlobalISel/RegBankSelect.cpp SRCS_MIN+= CodeGen/GlobalISel/RegisterBank.cpp @@ -249,6 +261,7 @@ SRCS_MIN+= CodeGen/LexicalScopes.cpp SRCS_MIN+= CodeGen/LiveDebugValues.cpp SRCS_MIN+= CodeGen/LiveDebugVariables.cpp SRCS_MIN+= CodeGen/LiveInterval.cpp +SRCS_MIN+= CodeGen/LiveIntervalCalc.cpp SRCS_MIN+= CodeGen/LiveIntervalUnion.cpp SRCS_MIN+= CodeGen/LiveIntervals.cpp SRCS_MIN+= CodeGen/LivePhysRegs.cpp @@ -263,6 +276,7 @@ SRCS_MIN+= CodeGen/LocalStackSlotAllocation.cpp SRCS_MIN+= CodeGen/LoopTraversal.cpp SRCS_MIN+= CodeGen/LowLevelType.cpp SRCS_MIN+= CodeGen/LowerEmuTLS.cpp +SRCS_MIN+= CodeGen/MBFIWrapper.cpp SRCS_MIN+= CodeGen/MIRCanonicalizerPass.cpp SRCS_MIN+= CodeGen/MIRNamerPass.cpp SRCS_EXT+= CodeGen/MIRParser/MILexer.cpp @@ -278,6 +292,7 @@ SRCS_MIN+= CodeGen/MachineBranchProbabilityInfo.cpp SRCS_MIN+= CodeGen/MachineCSE.cpp SRCS_MIN+= CodeGen/MachineCombiner.cpp SRCS_MIN+= CodeGen/MachineCopyPropagation.cpp +SRCS_MIN+= CodeGen/MachineDebugify.cpp SRCS_MIN+= CodeGen/MachineDominanceFrontier.cpp SRCS_MIN+= CodeGen/MachineDominators.cpp SRCS_MIN+= CodeGen/MachineFrameInfo.cpp @@ -302,6 +317,7 @@ SRCS_MIN+= CodeGen/MachineSSAUpdater.cpp SRCS_MIN+= CodeGen/MachineScheduler.cpp SRCS_MIN+= CodeGen/MachineSink.cpp SRCS_MIN+= CodeGen/MachineSizeOpts.cpp +SRCS_MIN+= CodeGen/MachineStripDebug.cpp SRCS_MIN+= CodeGen/MachineTraceMetrics.cpp SRCS_MIN+= CodeGen/MachineVerifier.cpp SRCS_MIN+= CodeGen/MacroFusion.cpp @@ -337,7 +353,6 @@ SRCS_MIN+= CodeGen/RegisterUsageInfo.cpp SRCS_MIN+= CodeGen/RenameIndependentSubregs.cpp SRCS_MIN+= CodeGen/ResetMachineFunctionPass.cpp SRCS_MIN+= CodeGen/SafeStack.cpp -SRCS_MIN+= CodeGen/SafeStackColoring.cpp SRCS_MIN+= CodeGen/SafeStackLayout.cpp SRCS_MIN+= CodeGen/ScalarizeMaskedMemIntrin.cpp SRCS_MIN+= CodeGen/ScheduleDAG.cpp @@ -491,11 +506,16 @@ SRCS_EXT+= DebugInfo/PDB/Native/NamedStreamMap.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeCompilandSymbol.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumGlobals.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumInjectedSources.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumLineNumbers.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumModules.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumTypes.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeExeSymbol.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeFunctionSymbol.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeLineNumber.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativePublicSymbol.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeRawSymbol.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeSession.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeSourceFile.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeSymbolEnumerator.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeArray.cpp SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeBuiltin.cpp @@ -568,6 +588,8 @@ SRCS_XDB+= ExecutionEngine/Interpreter/Execution.cpp SRCS_XDB+= ExecutionEngine/Interpreter/ExternalFunctions.cpp SRCS_XDB+= ExecutionEngine/Interpreter/Interpreter.cpp SRCS_EXT+= ExecutionEngine/JITLink/EHFrameSupport.cpp +SRCS_EXT+= ExecutionEngine/JITLink/ELF.cpp +SRCS_EXT+= ExecutionEngine/JITLink/ELF_x86_64.cpp SRCS_EXT+= ExecutionEngine/JITLink/JITLink.cpp SRCS_EXT+= ExecutionEngine/JITLink/JITLinkGeneric.cpp SRCS_EXT+= ExecutionEngine/JITLink/JITLinkMemoryManager.cpp @@ -579,6 +601,7 @@ SRCS_XDB+= ExecutionEngine/MCJIT/MCJIT.cpp SRCS_EXT+= ExecutionEngine/Orc/CompileOnDemandLayer.cpp SRCS_EXT+= ExecutionEngine/Orc/CompileUtils.cpp SRCS_EXT+= ExecutionEngine/Orc/Core.cpp +SRCS_EXT+= ExecutionEngine/Orc/DebugUtils.cpp SRCS_EXT+= ExecutionEngine/Orc/ExecutionUtils.cpp SRCS_EXT+= ExecutionEngine/Orc/IRCompileLayer.cpp SRCS_EXT+= ExecutionEngine/Orc/IRTransformLayer.cpp @@ -588,6 +611,8 @@ SRCS_EXT+= ExecutionEngine/Orc/LLJIT.cpp SRCS_EXT+= ExecutionEngine/Orc/Layer.cpp SRCS_EXT+= ExecutionEngine/Orc/LazyReexports.cpp SRCS_EXT+= ExecutionEngine/Orc/Legacy.cpp +SRCS_EXT+= ExecutionEngine/Orc/MachOPlatform.cpp +SRCS_EXT+= ExecutionEngine/Orc/Mangling.cpp SRCS_EXT+= ExecutionEngine/Orc/NullResolver.cpp SRCS_EXT+= ExecutionEngine/Orc/ObjectLinkingLayer.cpp SRCS_EXT+= ExecutionEngine/Orc/ObjectTransformLayer.cpp @@ -609,7 +634,7 @@ SRCS_XDB+= ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp SRCS_XDB+= ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldELFMips.cpp SRCS_XDB+= ExecutionEngine/SectionMemoryManager.cpp SRCS_XDB+= ExecutionEngine/TargetSelect.cpp -SRCS_MIN+= Frontend/OpenMP/OMPConstants.cpp +SRCS_MIN+= Frontend/OpenMP/OMPContext.cpp SRCS_MIN+= Frontend/OpenMP/OMPIRBuilder.cpp SRCS_MIN+= IR/AbstractCallSite.cpp SRCS_MIN+= IR/AsmWriter.cpp @@ -642,6 +667,7 @@ SRCS_MIN+= IR/Instructions.cpp SRCS_MIN+= IR/IntrinsicInst.cpp SRCS_MIN+= IR/LLVMContext.cpp SRCS_MIN+= IR/LLVMContextImpl.cpp +SRCS_MIN+= IR/LLVMRemarkStreamer.cpp SRCS_MIN+= IR/LegacyPassManager.cpp SRCS_MIN+= IR/MDBuilder.cpp SRCS_MIN+= IR/Mangler.cpp @@ -656,7 +682,6 @@ SRCS_MIN+= IR/PassManager.cpp SRCS_MIN+= IR/PassRegistry.cpp SRCS_MIN+= IR/PassTimingInfo.cpp SRCS_MIN+= IR/ProfileSummary.cpp -SRCS_MIN+= IR/RemarkStreamer.cpp SRCS_MIN+= IR/SafepointIRVerifier.cpp SRCS_MIN+= IR/Statepoint.cpp SRCS_MIN+= IR/Type.cpp @@ -706,6 +731,7 @@ SRCS_MIN+= MC/MCInst.cpp SRCS_MIN+= MC/MCInstPrinter.cpp SRCS_MIN+= MC/MCInstrAnalysis.cpp SRCS_MIN+= MC/MCInstrDesc.cpp +SRCS_MIN+= MC/MCInstrInfo.cpp SRCS_MIN+= MC/MCLinkerOptimizationHint.cpp SRCS_MIN+= MC/MCMachOStreamer.cpp SRCS_MIN+= MC/MCMachObjectTargetWriter.cpp @@ -735,7 +761,9 @@ SRCS_MIN+= MC/MCStreamer.cpp SRCS_MIN+= MC/MCSubtargetInfo.cpp SRCS_MIN+= MC/MCSymbol.cpp SRCS_MIN+= MC/MCSymbolELF.cpp +SRCS_MIN+= MC/MCSymbolXCOFF.cpp SRCS_MIN+= MC/MCTargetOptions.cpp +SRCS_MIN+= MC/MCTargetOptionsCommandFlags.cpp SRCS_MIN+= MC/MCValue.cpp SRCS_MIN+= MC/MCWasmStreamer.cpp SRCS_MIN+= MC/MCWin64EH.cpp @@ -791,6 +819,7 @@ SRCS_MIN+= Object/RecordStreamer.cpp SRCS_MIW+= Object/RelocationResolver.cpp SRCS_MIW+= Object/SymbolSize.cpp SRCS_MIN+= Object/SymbolicFile.cpp +SRCS_MIW+= Object/TapiFile.cpp SRCS_MIW+= Object/TapiUniversal.cpp SRCS_MIN+= Object/WasmObjectFile.cpp SRCS_MIW+= Object/WindowsMachineFlag.cpp @@ -825,6 +854,7 @@ SRCS_MIN+= ProfileData/SampleProfWriter.cpp SRCS_MIN+= Remarks/BitstreamRemarkSerializer.cpp SRCS_MIN+= Remarks/RemarkFormat.cpp SRCS_MIN+= Remarks/RemarkSerializer.cpp +SRCS_MIN+= Remarks/RemarkStreamer.cpp SRCS_MIN+= Remarks/RemarkStringTable.cpp SRCS_MIN+= Remarks/YAMLRemarkSerializer.cpp SRCS_MIN+= Support/AArch64TargetParser.cpp @@ -860,6 +890,8 @@ SRCS_MIN+= Support/Debug.cpp SRCS_MIN+= Support/DebugCounter.cpp SRCS_MIN+= Support/DeltaAlgorithm.cpp SRCS_MIN+= Support/DynamicLibrary.cpp +SRCS_MIN+= Support/ELFAttributeParser.cpp +SRCS_MIN+= Support/ELFAttributes.cpp SRCS_MIN+= Support/Errno.cpp SRCS_MIN+= Support/Error.cpp SRCS_MIN+= Support/ErrorHandling.cpp @@ -887,9 +919,11 @@ SRCS_MIN+= Support/LowLevelType.cpp SRCS_MIN+= Support/MD5.cpp SRCS_MIN+= Support/ManagedStatic.cpp SRCS_MIN+= Support/MathExtras.cpp +SRCS_MIN+= Support/MemAlloc.cpp SRCS_XDL+= Support/Memory.cpp SRCS_MIN+= Support/MemoryBuffer.cpp SRCS_MIN+= Support/NativeFormatting.cpp +SRCS_MIN+= Support/OptimizedStructLayout.cpp SRCS_MIN+= Support/Optional.cpp SRCS_LLD+= Support/Parallel.cpp SRCS_MIN+= Support/Path.cpp @@ -897,6 +931,8 @@ SRCS_MIN+= Support/PluginLoader.cpp SRCS_MIN+= Support/PrettyStackTrace.cpp SRCS_MIN+= Support/Process.cpp SRCS_MIN+= Support/Program.cpp +SRCS_MIN+= Support/RISCVAttributeParser.cpp +SRCS_MIN+= Support/RISCVAttributes.cpp SRCS_MIN+= Support/RWMutex.cpp SRCS_MIN+= Support/RandomNumberGenerator.cpp SRCS_MIN+= Support/Regex.cpp @@ -914,6 +950,7 @@ SRCS_MIN+= Support/StringExtras.cpp SRCS_MIN+= Support/StringMap.cpp SRCS_MIN+= Support/StringRef.cpp SRCS_MIN+= Support/StringSaver.cpp +SRCS_MIN+= Support/SuffixTree.cpp SRCS_MIN+= Support/SymbolRemappingReader.cpp SRCS_EXT+= Support/SystemUtils.cpp SRCS_LLD+= Support/TarWriter.cpp @@ -935,6 +972,7 @@ SRCS_MIN+= Support/VirtualFileSystem.cpp SRCS_MIN+= Support/VersionTuple.cpp SRCS_MIN+= Support/Watchdog.cpp SRCS_MIN+= Support/WithColor.cpp +SRCS_MIN+= Support/X86TargetParser.cpp SRCS_MIN+= Support/YAMLParser.cpp SRCS_MIN+= Support/YAMLTraits.cpp SRCS_FUL+= Support/Z3Solver.cpp @@ -962,7 +1000,6 @@ SRCS_MIN+= Target/AArch64/AArch64A57FPLoadBalancing.cpp SRCS_MIN+= Target/AArch64/AArch64AdvSIMDScalarPass.cpp SRCS_MIN+= Target/AArch64/AArch64AsmPrinter.cpp SRCS_MIN+= Target/AArch64/AArch64BranchTargets.cpp -SRCS_MIN+= Target/AArch64/AArch64CallLowering.cpp SRCS_MIN+= Target/AArch64/AArch64CallingConvention.cpp SRCS_MIN+= Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp SRCS_MIN+= Target/AArch64/AArch64CollectLOH.cpp @@ -979,18 +1016,16 @@ SRCS_MIN+= Target/AArch64/AArch64FrameLowering.cpp SRCS_MIN+= Target/AArch64/AArch64ISelDAGToDAG.cpp SRCS_MIN+= Target/AArch64/AArch64ISelLowering.cpp SRCS_MIN+= Target/AArch64/AArch64InstrInfo.cpp -SRCS_MIN+= Target/AArch64/AArch64InstructionSelector.cpp -SRCS_MIN+= Target/AArch64/AArch64LegalizerInfo.cpp SRCS_MIN+= Target/AArch64/AArch64LoadStoreOptimizer.cpp SRCS_MIN+= Target/AArch64/AArch64MCInstLower.cpp +SRCS_MIN+= Target/AArch64/AArch64MachineFunctionInfo.cpp SRCS_MIN+= Target/AArch64/AArch64MacroFusion.cpp SRCS_MIN+= Target/AArch64/AArch64PBQPRegAlloc.cpp -SRCS_MIN+= Target/AArch64/AArch64PreLegalizerCombiner.cpp SRCS_MIN+= Target/AArch64/AArch64PromoteConstant.cpp SRCS_MIN+= Target/AArch64/AArch64RedundantCopyElimination.cpp -SRCS_MIN+= Target/AArch64/AArch64RegisterBankInfo.cpp SRCS_MIN+= Target/AArch64/AArch64RegisterInfo.cpp SRCS_MIN+= Target/AArch64/AArch64SIMDInstrOpt.cpp +SRCS_MIN+= Target/AArch64/AArch64SLSHardening.cpp SRCS_MIN+= Target/AArch64/AArch64SelectionDAGInfo.cpp SRCS_MIN+= Target/AArch64/AArch64SpeculationHardening.cpp SRCS_MIN+= Target/AArch64/AArch64StackTagging.cpp @@ -1003,6 +1038,12 @@ SRCS_MIN+= Target/AArch64/AArch64TargetTransformInfo.cpp SRCS_MIN+= Target/AArch64/AsmParser/AArch64AsmParser.cpp SRCS_XDW+= Target/AArch64/Disassembler/AArch64Disassembler.cpp SRCS_XDW+= Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp +SRCS_MIN+= Target/AArch64/GISel/AArch64CallLowering.cpp +SRCS_MIN+= Target/AArch64/GISel/AArch64InstructionSelector.cpp +SRCS_MIN+= Target/AArch64/GISel/AArch64LegalizerInfo.cpp +SRCS_MIN+= Target/AArch64/GISel/AArch64PreLegalizerCombiner.cpp +SRCS_MIN+= Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp +SRCS_MIN+= Target/AArch64/GISel/AArch64RegisterBankInfo.cpp SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp @@ -1015,6 +1056,7 @@ SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64WinCOFFObjectWriter.cpp SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64WinCOFFStreamer.cpp +SRCS_MIN+= Target/AArch64/SVEIntrinsicOpts.cpp SRCS_MIN+= Target/AArch64/TargetInfo/AArch64TargetInfo.cpp SRCS_MIN+= Target/AArch64/Utils/AArch64BaseInfo.cpp .endif # MK_LLVM_TARGET_AARCH64 @@ -1071,6 +1113,7 @@ SRCS_MIN+= Target/ARM/MLxExpansionPass.cpp SRCS_MIN+= Target/ARM/MVEGatherScatterLowering.cpp SRCS_MIN+= Target/ARM/MVETailPredication.cpp SRCS_MIN+= Target/ARM/MVEVPTBlockPass.cpp *** 335 LINES SKIPPED ***