diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2022-08-13 15:37:04 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2023-02-08 19:04:56 +0000 |
| commit | 61cfbce3347e4372143bcabf7b197577b9f3958a (patch) | |
| tree | a996b7140fcecf4ec110b2ac28983b858e5df637 /lib/clang | |
| parent | 972a253a57b6f144b0e4a3e2080a2a0076ec55a0 (diff) | |
| parent | 677727e8296a802385345db6fa65e68223f4597a (diff) | |
| download | src-61cfbce3347e4372143bcabf7b197577b9f3958a.tar.gz src-61cfbce3347e4372143bcabf7b197577b9f3958a.zip | |
Merge llvm-project release/15.x llvmorg-15.0.0-rc2-40-gfbd2950d8d0d
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-15.0.0-rc2-40-gfbd2950d8d0d.
PR: 265425
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/Support/VCSRevision.h | 2 | ||||
| -rw-r--r-- | lib/clang/libllvm/Makefile | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 571ed75d3dc9..4756d002a956 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,10 +1,10 @@ // $FreeBSD$ -#define LLVM_REVISION "llvmorg-15-init-17826-g1f8ae9d7e7e4" +#define LLVM_REVISION "llvmorg-15.0.0-rc2-40-gfbd2950d8d0d" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-15-init-17826-g1f8ae9d7e7e4" +#define CLANG_REVISION "llvmorg-15.0.0-rc2-40-gfbd2950d8d0d" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-15-init-17826-g1f8ae9d7e7e4" +#define LLDB_REVISION "llvmorg-15.0.0-rc2-40-gfbd2950d8d0d" #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 6e25b65b845e..eaf7ae8ff492 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 1400005 -#define LLD_VERSION_STRING "15.0.0 (FreeBSD llvmorg-15-init-17826-g1f8ae9d7e7e4-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "15.0.0 (FreeBSD llvmorg-15.0.0-rc2-40-gfbd2950d8d0d-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index 1405a0d08395..8fd2403121b2 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-15-init-17826-g1f8ae9d7e7e4" +#define LLVM_REVISION "llvmorg-15.0.0-rc2-40-gfbd2950d8d0d" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 9020bda31574..01fe0705d954 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -25,6 +25,8 @@ CFLAGS+= -I${LLVM_SRCS}/lib/Target/${arch} CFLAGS+= -I${LLVM_SRCS}/lib/ObjCopy +TARGET_ARCH?= ${MACHINE_ARCH} + .if ${TARGET_ARCH} != "amd64" CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ -DBLAKE3_NO_SSE2 @@ -496,7 +498,7 @@ SRCS_MIN+= DebugInfo/CodeView/RecordSerialization.cpp SRCS_MIN+= DebugInfo/CodeView/SimpleTypeSerializer.cpp SRCS_EXT+= DebugInfo/CodeView/StringsAndChecksums.cpp SRCS_MIN+= DebugInfo/CodeView/SymbolDumper.cpp -SRCS_EXT+= DebugInfo/CodeView/SymbolRecordHelpers.cpp +SRCS_MIN+= DebugInfo/CodeView/SymbolRecordHelpers.cpp SRCS_MIN+= DebugInfo/CodeView/SymbolRecordMapping.cpp SRCS_EXT+= DebugInfo/CodeView/SymbolSerializer.cpp SRCS_MIN+= DebugInfo/CodeView/TypeDumpVisitor.cpp |