From owner-svn-src-releng@freebsd.org Tue May 26 16:14:22 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A8CC92CCB1F; Tue, 26 May 2020 16:14:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49WfDG3WYKz4SZd; Tue, 26 May 2020 16:14:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6FA6A260E3; Tue, 26 May 2020 16:14:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04QGEM6D089289; Tue, 26 May 2020 16:14:22 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04QGELTn089287; Tue, 26 May 2020 16:14:21 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202005261614.04QGELTn089287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 26 May 2020 16:14:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r361531 - in releng/11.4/lib/clang/include: clang/Config llvm/Config X-SVN-Group: releng X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in releng/11.4/lib/clang/include: clang/Config llvm/Config X-SVN-Commit-Revision: 361531 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2020 16:14:22 -0000 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@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 header file. */ #define HAVE_LINK_H 1 @@ -224,6 +227,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_VALGRIND_VALGRIND_H */ +/* Define to 1 if you have the 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()