From owner-svn-src-head@freebsd.org Fri Jun 3 17:46:00 2016 Return-Path: Delivered-To: svn-src-head@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 1486AB68125; Fri, 3 Jun 2016 17:46:00 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id F1A491662; Fri, 3 Jun 2016 17:45:59 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id E5AAE1795; Fri, 3 Jun 2016 17:45:59 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 9E410217BC; Fri, 3 Jun 2016 17:45:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id XHdlH7ggFGBz; Fri, 3 Jun 2016 17:45:56 +0000 (UTC) Subject: Re: svn commit: r301277 - in head: . lib/clang lib/clang/include/clang/Basic lib/clang/libclangbasic DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 1E4F2217B6 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201606031617.u53GHaEB088345@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <4fb107fd-5d48-ab77-cc7d-8bf96550a30a@FreeBSD.org> Date: Fri, 3 Jun 2016 10:46:01 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 In-Reply-To: <201606031617.u53GHaEB088345@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qEhjdnDbNb3mHIk7IMdeiIsEVBEtdlGkS" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jun 2016 17:46:00 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --qEhjdnDbNb3mHIk7IMdeiIsEVBEtdlGkS Content-Type: multipart/mixed; boundary="rP4X8q6D0ADpBjwWAm7pV2JolbpkOC5Hx" From: Bryan Drewery To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <4fb107fd-5d48-ab77-cc7d-8bf96550a30a@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: <201606031617.u53GHaEB088345@repo.freebsd.org> --rP4X8q6D0ADpBjwWAm7pV2JolbpkOC5Hx Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > For clang, move the definition of FREEBSD_CC_VERSION into its own hea= der > file, lib/clang/freebsd_cc_version.h, instead of reusing Version.inc.= > 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 th= e > version is bumped. > =20 > Discussed with: bdrewery >=20 > 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 >=20 > 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] * 100= 00 + a[2] * 100 + a[3]}' \ > ${SRCDIR}/lib/clang/include/clang/Basic/Version.inc || echo unknown >=20 > 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 (r3012= 77) > @@ -0,0 +1,3 @@ > +/* $FreeBSD$ */ > + > +#define FREEBSD_CC_VERSION 1100004 >=20 > 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 >=20 > 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 (r30= 1276) > +++ head/lib/clang/libclangbasic/Makefile Fri Jun 3 16:17:36 2016 (r30= 1277) > @@ -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 We're going to want a similar fix for GCC as well since its version is currently in a common header of ./gnu/usr.bin/cc/cc_tools/freebsd-native.= h. I don't have time to address it today but can look sometime in the next few weeks if no one does it before me. --=20 Regards, Bryan Drewery --rP4X8q6D0ADpBjwWAm7pV2JolbpkOC5Hx-- --qEhjdnDbNb3mHIk7IMdeiIsEVBEtdlGkS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJXUcJZAAoJEDXXcbtuRpfPKeYIALlHnib7KG1mAMNf2h5wEUFz 12S6D7+e5pg8qvNNHA3xaJ+CZmo5NenemyWkUUOEXb5OEKwm/gKBo0wxbq26FBi2 Zd9VcS+AdNwM3c9bGR5Jfy3N3ZLN4Dtr4V7nKDlGg8bllDvPH7T+jjTEccnJL2y8 yz+HQ4KdPWlKw22vAgHJ08EK9JN4jILZzKmgZXZyites9nRTOwv78kYSCsQehYgN QkOon9D3GP6nLorR3b7e4kr1NutPKVo7Andq4kj+PWa43dbV802PvR4ZDNd1FSPt mniTxzMzL+hQm26BSIeHGf2vE4i2uwdhTrO7BBhaHVqg+Aeh+QS1QWn9GOMI0gU= =8jZN -----END PGP SIGNATURE----- --qEhjdnDbNb3mHIk7IMdeiIsEVBEtdlGkS--