From 5f24ef21bee1ae1335796004829d750252582ca5 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 6 Aug 2020 19:27:03 +0000 Subject: [PATCH] Update generated llvm-project related version headers, config.h files and add a newly generated lldb Plugins.def file too. --- lib/clang/include/Plugins/Plugins.def | 77 ++++++++++++++++++++ lib/clang/include/VCSVersion.inc | 8 +- lib/clang/include/clang/Basic/Version.inc | 8 +- lib/clang/include/clang/Config/config.h | 5 +- lib/clang/include/lld/Common/Version.inc | 5 +- lib/clang/include/lldb/Host/Config.h | 2 + lib/clang/include/llvm/Config/config.h | 20 ++--- lib/clang/include/llvm/Config/llvm-config.h | 12 ++- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 9 files changed, 109 insertions(+), 30 deletions(-) create mode 100644 lib/clang/include/Plugins/Plugins.def diff --git a/lib/clang/include/Plugins/Plugins.def b/lib/clang/include/Plugins/Plugins.def new file mode 100644 index 000000000000..168eaf77ced8 --- /dev/null +++ b/lib/clang/include/Plugins/Plugins.def @@ -0,0 +1,77 @@ +// $FreeBSD$ +/*===- lldb/source/Plugin/Plugins.def ---------------------------*- C++ -*-===*\ +|* *| +|* Part of the LLVM Project, under the Apache License v2.0 with LLVM *| +|* Exceptions. *| +|* See https://llvm.org/LICENSE.txt for license information. *| +|* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception *| +|* *| +|*===----------------------------------------------------------------------===*| +|* *| +|* This file enumerates all of the plugins supported by this build of LLDB. *| +|* Clients of this file should define the LLDB_PLUGIN macro to be a *| +|* function-like macro with a single parameter (the name of the plugin) *| +|* including this file will then enumerate all of the plugins. Script *| +|* interpreter plugins can be enumerated separately by defining *| +|* LLDB_SCRIPT_PLUGIN in which case they are not part of LLDB_PLUGIN. *| +|* *| +|* *| +|* The set of plugins supported by LLDB is generated at configuration *| +|* time, at which point this header is generated. Do not modify this *| +|* header directly. *| +|* *| +\*===----------------------------------------------------------------------===*/ + +#ifndef LLDB_PLUGIN +# error Please define the macro LLDB_PLUGIN(PluginName) +#endif + +#ifndef LLDB_SCRIPT_PLUGIN +#define LLDB_SCRIPT_PLUGIN(p) LLDB_PLUGIN(p) +#endif + +LLDB_PLUGIN(ABIAArch64) +LLDB_PLUGIN(ABIARM) +LLDB_PLUGIN(ABIMips) +LLDB_PLUGIN(ABIPowerPC) +LLDB_PLUGIN(ABIX86) +LLDB_PLUGIN(ArchitectureArm) +LLDB_PLUGIN(ArchitectureMips) +LLDB_PLUGIN(ArchitecturePPC64) +LLDB_PLUGIN(DisassemblerLLVMC) +LLDB_PLUGIN(DynamicLoaderPosixDYLD) +LLDB_PLUGIN(DynamicLoaderStatic) +LLDB_PLUGIN(InstructionARM) +LLDB_PLUGIN(InstructionARM64) +LLDB_PLUGIN(InstructionMIPS) +LLDB_PLUGIN(InstructionMIPS64) +LLDB_PLUGIN(InstructionPPC64) +LLDB_PLUGIN(InstrumentationRuntimeASan) +LLDB_PLUGIN(InstrumentationRuntimeMainThreadChecker) +LLDB_PLUGIN(InstrumentationRuntimeTSan) +LLDB_PLUGIN(InstrumentationRuntimeUBSan) +LLDB_PLUGIN(JITLoaderGDB) +LLDB_PLUGIN(CPlusPlusLanguage) +LLDB_PLUGIN(CXXItaniumABI) +LLDB_PLUGIN(MemoryHistoryASan) +LLDB_PLUGIN(ObjectContainerBSDArchive) +LLDB_PLUGIN(ObjectFileBreakpad) +LLDB_PLUGIN(ObjectFileELF) +LLDB_PLUGIN(ObjectFileJIT) +LLDB_PLUGIN(PlatformFreeBSD) +LLDB_PLUGIN(PlatformGDB) +LLDB_PLUGIN(ProcessFreeBSD) +LLDB_PLUGIN(ProcessElfCore) +LLDB_SCRIPT_PLUGIN(ScriptInterpreterNone) +LLDB_SCRIPT_PLUGIN(ScriptInterpreterLua) +LLDB_PLUGIN(SymbolFileBreakpad) +LLDB_PLUGIN(SymbolFileDWARF) +LLDB_PLUGIN(SymbolFileSymtab) +LLDB_PLUGIN(SymbolVendorELF) +LLDB_PLUGIN(TypeSystemClang) +LLDB_PLUGIN(UnwindAssemblyInstEmulation) +LLDB_PLUGIN(UnwindAssemblyX86) +LLDB_PLUGIN(ProcessGDBRemote) + +#undef LLDB_PLUGIN +#undef LLDB_SCRIPT_PLUGIN diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 6f12d9f1d668..55e05d8f3e24 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,14 +1,14 @@ // $FreeBSD$ -#define LLVM_REVISION "llvmorg-10.0.1-0-gef32c611aa2" +#define LLVM_REVISION "llvmorg-11.0.0-rc1-25-g903c872b169" #define LLVM_REPOSITORY "git@github.com:llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-10.0.1-0-gef32c611aa2" +#define CLANG_REVISION "llvmorg-11.0.0-rc1-25-g903c872b169" #define CLANG_REPOSITORY "git@github.com:llvm/llvm-project.git" // - -#define LLD_REVISION "llvmorg-10.0.1-0-gef32c611aa2-1300007" +#define LLD_REVISION "llvmorg-11.0.0-rc1-25-g903c872b169-1300007" #define LLD_REPOSITORY "FreeBSD" -#define LLDB_REVISION "llvmorg-10.0.1-0-gef32c611aa2" +#define LLDB_REVISION "llvmorg-11.0.0-rc1-25-g903c872b169" #define LLDB_REPOSITORY "git@github.com:llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 7114bbf5fd6e..71c51398dad8 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,9 +1,9 @@ /* $FreeBSD$ */ -#define CLANG_VERSION 10.0.1 -#define CLANG_VERSION_STRING "10.0.1" -#define CLANG_VERSION_MAJOR 10 +#define CLANG_VERSION 11.0.0 +#define CLANG_VERSION_STRING "11.0.0" +#define CLANG_VERSION_MAJOR 11 #define CLANG_VERSION_MINOR 0 -#define CLANG_VERSION_PATCHLEVEL 1 +#define CLANG_VERSION_PATCHLEVEL 0 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h index b16df1ac0e85..cb283f476bcf 100644 --- a/lib/clang/include/clang/Config/config.h +++ b/lib/clang/include/clang/Config/config.h @@ -36,6 +36,9 @@ /* Default architecture for OpenMP offloading to Nvidia GPUs. */ #define CLANG_OPENMP_NVPTX_DEFAULT_ARCH "sm_35" +/* Default architecture for SystemZ. */ +#define CLANG_SYSTEMZ_DEFAULT_ARCH "z10" + /* Multilib suffix for libdir. */ #define CLANG_LIBDIR_SUFFIX "" @@ -62,7 +65,7 @@ #define CLANG_HAVE_RLIMITS 1 /* The LLVM product name and version */ -#define BACKEND_PACKAGE_STRING "LLVM 10.0.1" +#define BACKEND_PACKAGE_STRING "LLVM 11.0.0" /* Linker version detected at compile time. */ /* #undef HOST_LINK_VERSION */ diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 317afe138aaa..e92693b3f7b5 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,6 +1,3 @@ // $FreeBSD$ -#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_VERSION_STRING "11.0.0" diff --git a/lib/clang/include/lldb/Host/Config.h b/lib/clang/include/lldb/Host/Config.h index c7792742107d..1201fbd7faca 100644 --- a/lib/clang/include/lldb/Host/Config.h +++ b/lib/clang/include/lldb/Host/Config.h @@ -47,6 +47,8 @@ #define LLDB_ENABLE_PYTHON 0 +#define LLDB_EMBED_PYTHON_HOME 0 + /* #undef LLDB_PYTHON_HOME */ #define LLDB_LIBDIR_SUFFIX "" diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 5a961c9ddc33..d7297ac50af3 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -2,6 +2,9 @@ #ifndef CONFIG_H #define CONFIG_H +// Include this header only under the llvm source tree. +// This is a private header. + /* Exported configuration */ #include "llvm/Config/llvm-config.h" @@ -105,10 +108,10 @@ #define HAVE_LIBPTHREAD 1 /* Define to 1 if you have the `pthread_getname_np' function. */ -/* #undef HAVE_PTHREAD_GETNAME_NP */ +#define HAVE_PTHREAD_GETNAME_NP 1 /* Define to 1 if you have the `pthread_setname_np' function. */ -/* #undef HAVE_PTHREAD_SETNAME_NP */ +#define HAVE_PTHREAD_SETNAME_NP 1 /* Define to 1 if you have the `z' library (-lz). */ #define HAVE_LIBZ 1 @@ -161,12 +164,6 @@ /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 -/* Define to 1 if you have the `sched_getaffinity' function. */ -/* #undef HAVE_SCHED_GETAFFINITY */ - -/* Define to 1 if you have the `CPU_COUNT' macro. */ -/* #undef HAVE_CPU_COUNT */ - /* Define to 1 if you have the `setrlimit' function. */ #define HAVE_SETRLIMIT 1 @@ -322,10 +319,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 10.0.1" +#define PACKAGE_STRING "LLVM 11.0.0" /* Define to the version of this package. */ -#define PACKAGE_VERSION "10.0.1" +#define PACKAGE_VERSION "11.0.0" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ @@ -345,9 +342,6 @@ /* Whether GlobalISel rule coverage is being collected */ #define LLVM_GISEL_COV_ENABLED 0 -/* Define if we have z3 and want to build it */ -/* #undef LLVM_WITH_Z3 */ - /* Define to the default GlobalISel coverage file prefix */ /* #undef LLVM_GISEL_COV_PREFIX */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 580d5420479c..ec4cf9e0d5a3 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -64,20 +64,26 @@ #define LLVM_USE_PERF 0 /* Major version of the LLVM API */ -#define LLVM_VERSION_MAJOR 10 +#define LLVM_VERSION_MAJOR 11 /* Minor version of the LLVM API */ #define LLVM_VERSION_MINOR 0 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 1 +#define LLVM_VERSION_PATCH 0 /* LLVM version string */ -#define LLVM_VERSION_STRING "10.0.1" +#define LLVM_VERSION_STRING "11.0.0" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() */ #define LLVM_FORCE_ENABLE_STATS 0 +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if LLVM was built with a dependency to the libtensorflow dynamic library */ +/* #undef LLVM_HAVE_TF_API */ + #endif diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index e4549103209b..2dcb3becba66 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-10.0.1-0-gef32c611aa2" +#define LLVM_REVISION "llvmorg-11.0.0-rc1-25-g903c872b169" #define LLVM_REPOSITORY "git@github.com:llvm/llvm-project.git"