svn commit: r361531 - in releng/11.4/lib/clang/include: clang/Config llvm/Config

[Dimitry Andric]

Author: dim
Date: Tue May 26 16:14:21 2020
New Revision: 361531
URL: https://svnweb.freebsd.org/changeset/base/361531

Log:
  MF11 r361465:
  
  Regenerate llvm config headers to correctly enable zlib support
  
  During the initial upgrade to 10.0.0 in r357120, I generated these
  headers once, but they were missing zlib-related settings at that time.
  These should have been regenerated again during the merge of the final
  10.0.0 release.
  
  Direct commit to stable/{11,12}, since head has gotten 10.0.1 in the
  mean time, with up-to-date generated headers.
  
  Approved by:	re (gjb)
  Reported by:	hyama99 at gmail.com
  PR:		246244

Modified:
  releng/11.4/lib/clang/include/clang/Config/config.h
  releng/11.4/lib/clang/include/llvm/Config/config.h
  releng/11.4/lib/clang/include/llvm/Config/llvm-config.h
Directory Properties:
  releng/11.4/   (props changed)

Modified: releng/11.4/lib/clang/include/clang/Config/config.h
==============================================================================
--- releng/11.4/lib/clang/include/clang/Config/config.h	Tue May 26 16:11:46 2020	(r361530)
+++ releng/11.4/lib/clang/include/clang/Config/config.h	Tue May 26 16:14:21 2020	(r361531)
@@ -62,7 +62,7 @@
 #define CLANG_HAVE_RLIMITS 1
 
 /* The LLVM product name and version */
-#define BACKEND_PACKAGE_STRING "LLVM 10.0.0git"
+#define BACKEND_PACKAGE_STRING "LLVM 10.0.0"
 
 /* Linker version detected at compile time. */
 /* #undef HOST_LINK_VERSION */

Modified: releng/11.4/lib/clang/include/llvm/Config/config.h
==============================================================================
--- releng/11.4/lib/clang/include/llvm/Config/config.h	Tue May 26 16:11:46 2020	(r361530)
+++ releng/11.4/lib/clang/include/llvm/Config/config.h	Tue May 26 16:14:21 2020	(r361531)
@@ -110,6 +110,9 @@
 /* Define to 1 if you have the `pthread_setname_np' function. */
 /* #undef HAVE_PTHREAD_SETNAME_NP */
 
+/* Define to 1 if you have the `z' library (-lz). */
+#define HAVE_LIBZ 1
+
 /* Define to 1 if you have the <link.h> header file. */
 #define HAVE_LINK_H 1
 
@@ -224,6 +227,9 @@
 /* Define to 1 if you have the <valgrind/valgrind.h> header file. */
 /* #undef HAVE_VALGRIND_VALGRIND_H */
 
+/* Define to 1 if you have the <zlib.h> header file. */
+#define HAVE_ZLIB_H 1
+
 /* Have host's _alloca */
 /* #undef HAVE__ALLOCA */
 
@@ -316,10 +322,10 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 10.0.0git"
+#define PACKAGE_STRING "LLVM 10.0.0"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "10.0.0git"
+#define PACKAGE_VERSION "10.0.0"
 
 /* Define to the vendor of this package. */
 /* #undef PACKAGE_VENDOR */

Modified: releng/11.4/lib/clang/include/llvm/Config/llvm-config.h
==============================================================================
--- releng/11.4/lib/clang/include/llvm/Config/llvm-config.h	Tue May 26 16:11:46 2020	(r361530)
+++ releng/11.4/lib/clang/include/llvm/Config/llvm-config.h	Tue May 26 16:14:21 2020	(r361531)
@@ -73,7 +73,7 @@
 #define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "10.0.0git"
+#define LLVM_VERSION_STRING "10.0.0"
 
 /* Whether LLVM records statistics for use with GetStatistics(),
  * PrintStatistics() or PrintStatisticsJSON()