summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatrick <patrick@openbsd.org>2020-08-09 15:56:39 +0000
committerpatrick <patrick@openbsd.org>2020-08-09 15:56:39 +0000
commit3e6fb70872a6c58e53bdb3871d501fb6dd0488aa (patch)
tree2dce350e79161c12394449d01f1377c1357b01bf
parentMerge LLVM 10.0.1. (diff)
downloadwireguard-openbsd-3e6fb70872a6c58e53bdb3871d501fb6dd0488aa.tar.xz
wireguard-openbsd-3e6fb70872a6c58e53bdb3871d501fb6dd0488aa.zip
Update build infrastructure for LLVM 10.0.1.
-rw-r--r--gnu/usr.bin/clang/include/clang/Basic/Version.inc8
-rw-r--r--gnu/usr.bin/clang/include/clang/Config/config.h2
-rw-r--r--gnu/usr.bin/clang/include/clang/intrin/Makefile4
-rw-r--r--gnu/usr.bin/clang/include/lld/Common/Version.inc6
-rw-r--r--gnu/usr.bin/clang/include/llvm/Config/config.h4
-rw-r--r--gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in4
-rw-r--r--gnu/usr.bin/clang/include/llvm/Support/Extension.def2
-rw-r--r--gnu/usr.bin/clang/libLLVM/shlib_version2
-rw-r--r--gnu/usr.bin/clang/libLLVMCodeGen/Makefile5
-rw-r--r--gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile6
-rw-r--r--gnu/usr.bin/clang/llvm-config/ExtensionDependencies.inc7
-rw-r--r--gnu/usr.bin/clang/llvm-config/Makefile8
12 files changed, 37 insertions, 21 deletions
diff --git a/gnu/usr.bin/clang/include/clang/Basic/Version.inc b/gnu/usr.bin/clang/include/clang/Basic/Version.inc
index 9cf9d6901e9..789054c1ba4 100644
--- a/gnu/usr.bin/clang/include/clang/Basic/Version.inc
+++ b/gnu/usr.bin/clang/include/clang/Basic/Version.inc
@@ -1,9 +1,9 @@
-/* $OpenBSD: Version.inc,v 1.10 2020/08/03 14:45:22 patrick Exp $ */
+/* $OpenBSD: Version.inc,v 1.11 2020/08/09 15:56:39 patrick Exp $ */
-#define CLANG_VERSION 10.0.0
-#define CLANG_VERSION_STRING "10.0.0"
+#define CLANG_VERSION 10.0.1
+#define CLANG_VERSION_STRING "10.0.1"
#define CLANG_VERSION_MAJOR 10
#define CLANG_VERSION_MINOR 0
-#define CLANG_VERSION_PATCHLEVEL 0
+#define CLANG_VERSION_PATCHLEVEL 1
#define CLANG_VENDOR "OpenBSD "
diff --git a/gnu/usr.bin/clang/include/clang/Config/config.h b/gnu/usr.bin/clang/include/clang/Config/config.h
index 97b2fca62d1..aa6abf6069a 100644
--- a/gnu/usr.bin/clang/include/clang/Config/config.h
+++ b/gnu/usr.bin/clang/include/clang/Config/config.h
@@ -61,7 +61,7 @@
#define CLANG_HAVE_RLIMITS 1
/* The LLVM product name and version */
-#define BACKEND_PACKAGE_STRING "LLVM 10.0.0"
+#define BACKEND_PACKAGE_STRING "LLVM 10.0.1"
/* Linker version detected at compile time. */
/* #undef HOST_LINK_VERSION */
diff --git a/gnu/usr.bin/clang/include/clang/intrin/Makefile b/gnu/usr.bin/clang/include/clang/intrin/Makefile
index aa842233c51..cb3476ec171 100644
--- a/gnu/usr.bin/clang/include/clang/intrin/Makefile
+++ b/gnu/usr.bin/clang/include/clang/intrin/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.22 2020/08/03 14:45:22 patrick Exp $
+# $OpenBSD: Makefile,v 1.23 2020/08/09 15:56:39 patrick Exp $
.include <bsd.own.mk>
-LLVM_V= 10.0.0
+LLVM_V= 10.0.1
CLANG_INTR_INCDIR= /usr/lib/clang/${LLVM_V}/include
TBLGEN= ${.OBJDIR}/../../../clang-tblgen/clang-tblgen
diff --git a/gnu/usr.bin/clang/include/lld/Common/Version.inc b/gnu/usr.bin/clang/include/lld/Common/Version.inc
index b88cfde339c..7d42482f324 100644
--- a/gnu/usr.bin/clang/include/lld/Common/Version.inc
+++ b/gnu/usr.bin/clang/include/lld/Common/Version.inc
@@ -1,7 +1,7 @@
-/* $OpenBSD: Version.inc,v 1.5 2020/08/03 14:45:22 patrick Exp $ */
+/* $OpenBSD: Version.inc,v 1.6 2020/08/09 15:56:40 patrick Exp $ */
-#define LLD_VERSION 10.0.0
-#define LLD_VERSION_STRING "10.0.0"
+#define LLD_VERSION 10.0.1
+#define LLD_VERSION_STRING "10.0.1"
#define LLD_VERSION_MAJOR 10
#define LLD_VERSION_MINOR 0
#define LLD_REVISION_STRING ""
diff --git a/gnu/usr.bin/clang/include/llvm/Config/config.h b/gnu/usr.bin/clang/include/llvm/Config/config.h
index 244103f052a..61ce8f5e6de 100644
--- a/gnu/usr.bin/clang/include/llvm/Config/config.h
+++ b/gnu/usr.bin/clang/include/llvm/Config/config.h
@@ -323,10 +323,10 @@
#define PACKAGE_NAME "LLVM"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 10.0.0"
+#define PACKAGE_STRING "LLVM 10.0.1"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "10.0.0"
+#define PACKAGE_VERSION "10.0.1"
/* Define to the vendor of this package. */
/* #undef PACKAGE_VENDOR */
diff --git a/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in b/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in
index e585f8e16aa..8e88b15a074 100644
--- a/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in
+++ b/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in
@@ -54,10 +54,10 @@
#define LLVM_VERSION_MINOR 0
/* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 0
+#define LLVM_VERSION_PATCH 1
/* LLVM version string */
-#define LLVM_VERSION_STRING "10.0.0"
+#define LLVM_VERSION_STRING "10.0.1"
/* Whether LLVM records statistics for use with GetStatistics(),
* PrintStatistics() or PrintStatisticsJSON()
diff --git a/gnu/usr.bin/clang/include/llvm/Support/Extension.def b/gnu/usr.bin/clang/include/llvm/Support/Extension.def
index 8b137891791..b503cab45b9 100644
--- a/gnu/usr.bin/clang/include/llvm/Support/Extension.def
+++ b/gnu/usr.bin/clang/include/llvm/Support/Extension.def
@@ -1 +1 @@
-
+#undef HANDLE_EXTENSION
diff --git a/gnu/usr.bin/clang/libLLVM/shlib_version b/gnu/usr.bin/clang/libLLVM/shlib_version
index 012c14171d3..d9961ea9fef 100644
--- a/gnu/usr.bin/clang/libLLVM/shlib_version
+++ b/gnu/usr.bin/clang/libLLVM/shlib_version
@@ -1,2 +1,2 @@
-major=3
+major=4
minor=0
diff --git a/gnu/usr.bin/clang/libLLVMCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
index 2dfda537104..195957012bb 100644
--- a/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2020/08/03 14:45:25 patrick Exp $
+# $OpenBSD: Makefile,v 1.14 2020/08/09 15:56:40 patrick Exp $
LIB= LLVMCodeGen
NOPROFILE=
@@ -123,6 +123,9 @@ SRCS+= AggressiveAntiDepBreaker.cpp \
ProcessImplicitDefs.cpp \
PrologEpilogInserter.cpp \
PseudoSourceValue.cpp \
+ RDFGraph.cpp \
+ RDFLiveness.cpp \
+ RDFRegisters.cpp \
ReachingDefAnalysis.cpp \
RegAllocBase.cpp \
RegAllocBasic.cpp \
diff --git a/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile b/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile
index 19c906b909f..925c21c80af 100644
--- a/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2020/08/03 14:45:28 patrick Exp $
+# $OpenBSD: Makefile,v 1.15 2020/08/09 15:56:40 patrick Exp $
LIB= LLVMX86CodeGen
NOPROFILE=
@@ -28,6 +28,7 @@ SRCS+= X86AsmPrinter.cpp \
X86ISelDAGToDAG.cpp \
X86ISelLowering.cpp \
X86IndirectBranchTracking.cpp \
+ X86IndirectThunks.cpp \
X86InstrFMA3Info.cpp \
X86InstrFoldTables.cpp \
X86InstrInfo.cpp \
@@ -35,13 +36,14 @@ SRCS+= X86AsmPrinter.cpp \
X86InterleavedAccess.cpp \
X86InsertPrefetch.cpp \
X86LegalizerInfo.cpp \
+ X86LoadValueInjectionLoadHardening.cpp \
+ X86LoadValueInjectionRetHardening.cpp \
X86MCInstLower.cpp \
X86MachineFunctionInfo.cpp \
X86MacroFusion.cpp \
X86PadShortFunction.cpp \
X86RegisterBankInfo.cpp \
X86RegisterInfo.cpp \
- X86RetpolineThunks.cpp \
X86ReturnProtectorLowering.cpp \
X86SelectionDAGInfo.cpp \
X86ShuffleDecodeConstantPool.cpp \
diff --git a/gnu/usr.bin/clang/llvm-config/ExtensionDependencies.inc b/gnu/usr.bin/clang/llvm-config/ExtensionDependencies.inc
new file mode 100644
index 00000000000..445b9b48760
--- /dev/null
+++ b/gnu/usr.bin/clang/llvm-config/ExtensionDependencies.inc
@@ -0,0 +1,7 @@
+#include <array>
+struct ExtensionDescriptor {
+ const char* Name;
+ const char* RequiredLibraries[1 + 1 + 0];
+};
+std::array<ExtensionDescriptor, 0> AvailableExtensions{
+};
diff --git a/gnu/usr.bin/clang/llvm-config/Makefile b/gnu/usr.bin/clang/llvm-config/Makefile
index 0c5d04e6cad..a558482af82 100644
--- a/gnu/usr.bin/clang/llvm-config/Makefile
+++ b/gnu/usr.bin/clang/llvm-config/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:31 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/09 15:56:40 patrick Exp $
PROG= llvm-config
BINDIR= /usr/bin
@@ -13,13 +13,17 @@ SRCS= llvm-config.cpp
CPPFLAGS+= -I${.CURDIR}
-llvm-config.o: BuildVariables.inc LibraryDependencies.inc
+llvm-config.o: BuildVariables.inc ExtensionDependencies.inc LibraryDependencies.inc
BuildVariables.inc: ${.CURDIR}/BuildVariables.inc.def
cp ${.CURDIR}/BuildVariables.inc.def ${.OBJDIR}/BuildVariables.inc
echo "#define LLVM_TARGETS_BUILT \"${LLVM_ARCH} AMDGPU\"" >> \
${.OBJDIR}/BuildVariables.inc
+ExtensionDependencies.inc:
+ cp ${.CURDIR}/ExtensionDependencies.inc \
+ ${.OBJDIR}/ExtensionDependencies.inc
+
LibraryDependencies.inc:
cp ${.CURDIR}/LibraryDependencies.inc.${LLVM_ARCH} \
${.OBJDIR}/LibraryDependencies.inc