From owner-svn-src-all@freebsd.org Fri Jun 3 19:52:07 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C6DCB69B47 for ; Fri, 3 Jun 2016 19:52:07 +0000 (UTC) (envelope-from mailing-machine@vniz.net) Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F38641E31 for ; Fri, 3 Jun 2016 19:52:06 +0000 (UTC) (envelope-from mailing-machine@vniz.net) Received: by mail-lf0-f54.google.com with SMTP id k98so61084118lfi.1 for ; Fri, 03 Jun 2016 12:52:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to; bh=82wzOX07Sm7GC65McTUpMZ5Nam1N3wphjG+y38LZcSA=; b=LU3o4sLsP3x5nQ2uhfDxhKcoC2me3tRqyfhu64RdVEwxFq612AjLb2G7Dbs8Tw6xex qv7UXaoeqgb2BgYH+s/+MpJbIhpYl/qWhbNRMMqIL3EbP5ax7Xqics3kqZiWRkmySBYK 9DYsR2mWTOagVZUfxKHwUWduxbNEQVKUBZh/VZvNu6qrPaAcVKe7/QufVkbhnts+x1Zn ix7anb+iembpz1QuVBTEG0+nQD9MkJX/O2Gfy8ZaN2Mcuj2N8qmlWpqSlY3+b9r2CuDI 5s42LKu3yv8f6SPp5R7vOzuUuZ3iLuHF6J7SL2mPVhtgVPPKuDX1R0/IyaQvTe26Ugrh hjtA== X-Gm-Message-State: ALyK8tLuu8qrmBf1+4D5LM0gUeXLtH/15F0jJOBaHqLiFD6CdwLu8PlOo/faQXJFi6mMXA== X-Received: by 10.25.150.195 with SMTP id y186mr1227646lfd.169.1464983518838; Fri, 03 Jun 2016 12:51:58 -0700 (PDT) Received: from [192.168.1.2] ([89.169.173.68]) by smtp.gmail.com with ESMTPSA id 66sm545906ljf.8.2016.06.03.12.51.57 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Jun 2016 12:51:58 -0700 (PDT) Subject: Re: svn commit: r301277 - in head: . lib/clang lib/clang/include/clang/Basic lib/clang/libclangbasic To: Bryan Drewery , Dimitry Andric , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201606031617.u53GHaEB088345@repo.freebsd.org> From: Andrey Chernov Message-ID: <0b8a3212-fec2-c041-8cb5-a1dc7b3637ef@freebsd.org> Date: Fri, 3 Jun 2016 22:51:56 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="8Mo6nKTvn1a4UrfgTt9HjIxdsK0wCNh6M" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jun 2016 19:52:07 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --8Mo6nKTvn1a4UrfgTt9HjIxdsK0wCNh6M Content-Type: multipart/mixed; boundary="B4CeiJCeJjE4xC8AMhjAM8QgBkpGdmn1U" From: Andrey Chernov To: Bryan Drewery , Dimitry Andric , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <0b8a3212-fec2-c041-8cb5-a1dc7b3637ef@freebsd.org> Subject: Re: svn commit: r301277 - in head: . lib/clang lib/clang/include/clang/Basic lib/clang/libclangbasic References: <201606031617.u53GHaEB088345@repo.freebsd.org> In-Reply-To: --B4CeiJCeJjE4xC8AMhjAM8QgBkpGdmn1U Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 03.06.2016 20:44, Bryan Drewery wrote: > Thanks! >=20 > I think this helps Andrey's recent clang rebuild issues as well since > the quite-common file was being touched often. Thanx! >=20 > On 6/3/2016 9:17 AM, Dimitry Andric wrote: >> Author: dim >> Date: Fri Jun 3 16:17:36 2016 >> New Revision: 301277 >> URL: https://svnweb.freebsd.org/changeset/base/301277 >> >> Log: >> For clang, move the definition of FREEBSD_CC_VERSION into its own he= ader >> file, lib/clang/freebsd_cc_version.h, instead of reusing Version.inc= =2E >> The header is only included from one .cpp file in the clang tree. >> =20 >> This minimizes the number of .cpp files that need to be rebuilt if t= he >> version is bumped. >> =20 >> Discussed with: bdrewery >> >> Added: >> head/lib/clang/freebsd_cc_version.h (contents, props changed) >> Modified: >> head/Makefile.inc1 >> head/lib/clang/include/clang/Basic/Version.inc >> head/lib/clang/libclangbasic/Makefile >> >> Modified: head/Makefile.inc1 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/Makefile.inc1 Fri Jun 3 15:33:21 2016 (r301276) >> +++ head/Makefile.inc1 Fri Jun 3 16:17:36 2016 (r301277) >> @@ -99,7 +99,7 @@ _expected_compiler_type=3D gcc >> .if ${_expected_compiler_type} =3D=3D "clang" >> CROSS_COMPILER_FREEBSD_VERSION!=3D \ >> awk '$$2 =3D=3D "FREEBSD_CC_VERSION" {printf("%d\n", $$3)}' \ >> - ${SRCDIR}/lib/clang/include/clang/Basic/Version.inc || echo unknown >> + ${SRCDIR}/lib/clang/freebsd_cc_version.h || echo unknown >> CROSS_COMPILER_VERSION!=3D \ >> awk '$$2 =3D=3D "CLANG_VERSION" {split($$3, a, "."); print a[1] * 10= 000 + a[2] * 100 + a[3]}' \ >> ${SRCDIR}/lib/clang/include/clang/Basic/Version.inc || echo unknown >> >> Added: head/lib/clang/freebsd_cc_version.h >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> +++ head/lib/clang/freebsd_cc_version.h Fri Jun 3 16:17:36 2016 (r301= 277) >> @@ -0,0 +1,3 @@ >> +/* $FreeBSD$ */ >> + >> +#define FREEBSD_CC_VERSION 1100004 >> >> Modified: head/lib/clang/include/clang/Basic/Version.inc >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/lib/clang/include/clang/Basic/Version.inc Fri Jun 3 15:33:21= 2016 (r301276) >> +++ head/lib/clang/include/clang/Basic/Version.inc Fri Jun 3 16:17:36= 2016 (r301277) >> @@ -8,5 +8,3 @@ >> #define CLANG_VENDOR "FreeBSD " >> =20 >> #define SVN_REVISION "262564" >> - >> -#define FREEBSD_CC_VERSION 1100004U >> >> Modified: head/lib/clang/libclangbasic/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/lib/clang/libclangbasic/Makefile Fri Jun 3 15:33:21 2016 (r3= 01276) >> +++ head/lib/clang/libclangbasic/Makefile Fri Jun 3 16:17:36 2016 (r3= 01277) >> @@ -50,3 +50,6 @@ TGHDRS=3D AttrHasAttributeImpl \ >> =20 >> # XX: work around GCC bug 67888 >> CFLAGS.gcc +=3D -fpermissive >> + >> +# Ensure FREEBSD_CC_VERSION is defined for Targets.cpp >> +CFLAGS.Targets.cpp+=3D -include ../freebsd_cc_version.h >> >=20 >=20 --B4CeiJCeJjE4xC8AMhjAM8QgBkpGdmn1U-- --8Mo6nKTvn1a4UrfgTt9HjIxdsK0wCNh6M Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBCAAGBQJXUd/dAAoJEKUckv0MjfbKpJ8IALGQ/daLaYaSRkKQCsXp+2c4 FdZO+k/K1vr0iFjUEosH7TrXZLXYiGCyD8cqgJUB0HQARkCno5ijK0FuKfj3z+wA t1PNOqd4M897ojirDNc7WFmsRDB5q98eLE2FpMbeFv76o7lx9TAO3nDhA0h5akdf fPAy5IhJHuTf/N/kA0cYuXlP16EVVv7fqN7XAtiSdIFC6SgJd6sTid4PmPYg+Xq0 TiLHD6A4VZupFRnevfebZgvqNhQ+bw4H6avTsGuIOmEXFKgaUE7boKmX1itrF6zW YQRs3cdapxMwPqRvBQiKJBu0+QxRyi7zYf7QpzKUKzwHRvKvl20Si8Irxs2efAs= =Gytg -----END PGP SIGNATURE----- --8Mo6nKTvn1a4UrfgTt9HjIxdsK0wCNh6M--