diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2022-02-18 22:41:20 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2022-05-14 11:45:57 +0000 |
commit | d56accc7c3dcc897489b6a07834763a03b9f3d68 (patch) | |
tree | 918f41a708218122215937f4ab4e68b1a942da68 /lib/clang | |
parent | 8885dff6cec52378084211fdd9366a73833eceee (diff) | |
parent | 7eff647615f93a9aaff1997e1880b195dc3aabe6 (diff) | |
download | src-d56accc7c3dcc897489b6a07834763a03b9f3d68.tar.gz src-d56accc7c3dcc897489b6a07834763a03b9f3d68.zip |
Merge llvm-project release/14.x llvmorg-14.0.0-rc1-74-g4dc3cb8e3255
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14.0.0-rc1-74-g4dc3cb8e3255.
PR: 261742
MFC after: 2 weeks
Diffstat (limited to 'lib/clang')
-rw-r--r-- | lib/clang/include/VCSVersion.inc | 6 | ||||
-rw-r--r-- | lib/clang/include/lld/Common/Version.inc | 2 | ||||
-rw-r--r-- | lib/clang/include/llvm/Config/config.h | 5 | ||||
-rw-r--r-- | lib/clang/include/llvm/Config/llvm-config.h | 6 | ||||
-rw-r--r-- | lib/clang/include/llvm/Support/VCSRevision.h | 2 | ||||
-rw-r--r-- | lib/clang/libllvm/Makefile | 2 |
6 files changed, 13 insertions, 10 deletions
diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 90a7417a7de5..10533dfb19d6 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,10 +1,10 @@ // $FreeBSD$ -#define LLVM_REVISION "llvmorg-14-init-18315-g190be5457c90" +#define LLVM_REVISION "llvmorg-14.0.0-rc1-74-g4dc3cb8e3255" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-14-init-18315-g190be5457c90" +#define CLANG_REVISION "llvmorg-14.0.0-rc1-74-g4dc3cb8e3255" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-14-init-18315-g190be5457c90" +#define LLDB_REVISION "llvmorg-14.0.0-rc1-74-g4dc3cb8e3255" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index b4ef011bf5cd..6956f2bb2c45 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400003 -#define LLD_VERSION_STRING "14.0.0 (FreeBSD llvmorg-14-init-18315-g190be5457c90-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "14.0.0 (FreeBSD llvmorg-14.0.0-rc1-74-g4dc3cb8e3255-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index f6182e21c944..d56654aab7df 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -273,9 +273,7 @@ /* #undef HAVE__CHSIZE_S */ /* Define to 1 if you have the `_Unwind_Backtrace' function. */ -#if !defined(__FreeBSD__) #define HAVE__UNWIND_BACKTRACE 1 -#endif /* Have host's __alloca */ /* #undef HAVE___ALLOCA */ @@ -335,9 +333,6 @@ /* Doesn't use `cmakedefine` because it is allowed to be empty. */ /* #undef LLVM_DEFAULT_TARGET_TRIPLE */ -/* Define if zlib compression is available */ -#define LLVM_ENABLE_ZLIB 1 - /* Define if overriding target triple is enabled */ /* #undef LLVM_TARGET_TRIPLE_ENV */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 569a77144d9a..575787e1f9b3 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -89,6 +89,9 @@ /* Define if we have curl and want to use it */ /* #undef LLVM_ENABLE_CURL */ +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + /* Define if LLVM was built with a dependency to the libtensorflow dynamic library */ /* #undef LLVM_HAVE_TF_API */ @@ -109,4 +112,7 @@ /* Define if building LLVM with BUILD_SHARED_LIBS */ /* #undef LLVM_BUILD_SHARED_LIBS */ +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + #endif diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index cb157cf33f8e..4c259487d494 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,3 +1,3 @@ /* $FreeBSD$ */ -#define LLVM_REVISION "llvmorg-14-init-18315-g190be5457c90" +#define LLVM_REVISION "llvmorg-14.0.0-rc1-74-g4dc3cb8e3255" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 6a896c68c4a6..51c4b2d2938d 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -609,9 +609,11 @@ SRCS_EXT+= DebugInfo/PDB/PDBSymbolTypeVTableShape.cpp SRCS_EXT+= DebugInfo/PDB/PDBSymbolUnknown.cpp SRCS_EXT+= DebugInfo/PDB/PDBSymbolUsingNamespace.cpp SRCS_EXT+= DebugInfo/PDB/UDTLayout.cpp +SRCS_MIW+= DebugInfo/Symbolize/DIFetcher.cpp SRCS_MIW+= DebugInfo/Symbolize/DIPrinter.cpp SRCS_MIW+= DebugInfo/Symbolize/SymbolizableObjectFile.cpp SRCS_MIW+= DebugInfo/Symbolize/Symbolize.cpp +SRCS_MIW+= Debuginfod/DIFetcher.cpp SRCS_MIW+= Debuginfod/Debuginfod.cpp SRCS_MIW+= Debuginfod/HTTPClient.cpp SRCS_MIN+= Demangle/DLangDemangle.cpp |