From owner-svn-src-all@FreeBSD.ORG Wed Oct 19 03:13:25 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36008106564A; Wed, 19 Oct 2011 03:13:24 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-iy0-f182.google.com (mail-iy0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id 9300D8FC0A; Wed, 19 Oct 2011 03:13:24 +0000 (UTC) Received: by iaky10 with SMTP id y10so1842080iak.13 for ; Tue, 18 Oct 2011 20:13:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=7lFto0nd212WO5udDEiKroD6xn8MtZEFHLT2cOTikGI=; b=mpXcBnXxV0KwF1Kj/JOEZ47X6L6zn5O12tOI1HdQSkeBdPSmNuCOC8exgXM66q5/0o GYEi1/mXqSDMKfPKSmXlMkVqiR3G2jjMFjk7ENRVvvf3uhykx40Fs98BsFV0Lr0Isw0K Im0J3rwZ1ZHjsnMqnGe44uepMXFgwFu/bYupY= MIME-Version: 1.0 Received: by 10.231.64.78 with SMTP id d14mr2059047ibi.56.1318994003577; Tue, 18 Oct 2011 20:13:23 -0700 (PDT) Received: by 10.182.122.33 with HTTP; Tue, 18 Oct 2011 20:13:23 -0700 (PDT) In-Reply-To: References: <201110181737.p9IHbIvW083474@svn.freebsd.org> Date: Tue, 18 Oct 2011 20:13:23 -0700 Message-ID: From: Garrett Cooper To: Dimitry Andric Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226518 - head/contrib/llvm/tools/clang/lib/Basic X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 19 Oct 2011 03:13:25 -0000 On Tue, Oct 18, 2011 at 8:08 PM, Garrett Cooper wrote: > On Tue, Oct 18, 2011 at 10:37 AM, Dimitry Andric wrote: >> Author: dim >> Date: Tue Oct 18 17:37:18 2011 >> New Revision: 226518 >> URL: http://svn.freebsd.org/changeset/base/226518 >> >> Log: >> =A0Fix the way clang retrieves the major FreeBSD release number from the >> =A0target triple, so that the __FreeBSD__ and __FreeBSD_cc_version built= in >> =A0macros return the expected results. >> >> =A0Spotted by: =A0 nalitoja at gmail.com >> >> Modified: >> =A0head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp >> >> Modified: head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Tue Oct 18 16:37= :28 2011 =A0 =A0 =A0 =A0(r226517) >> +++ head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Tue Oct 18 17:37= :18 2011 =A0 =A0 =A0 =A0(r226518) >> @@ -238,11 +238,12 @@ protected: >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 MacroBuilder &Bu= ilder) const { >> =A0 =A0 // FreeBSD defines; list based off of gcc output >> >> - =A0 =A0// FIXME: Move version number handling to llvm::Triple. >> - =A0 =A0llvm::StringRef Release =3D Triple.getOSName().substr(strlen("f= reebsd"), 1); >> + =A0 =A0unsigned Release =3D Triple.getOSMajorVersion(); >> + =A0 =A0if (Release =3D=3D 0U) >> + =A0 =A0 =A0Release =3D 8U; >> >> - =A0 =A0Builder.defineMacro("__FreeBSD__", Release); >> - =A0 =A0Builder.defineMacro("__FreeBSD_cc_version", Release + "00001"); >> + =A0 =A0Builder.defineMacro("__FreeBSD__", Twine(Release)); >> + =A0 =A0Builder.defineMacro("__FreeBSD_cc_version", Twine(Release * 100= 000U + 1U)); >> =A0 =A0 Builder.defineMacro("__KPRINTF_ATTRIBUTE__"); >> =A0 =A0 DefineStd(Builder, "unix", Opts); >> =A0 =A0 Builder.defineMacro("__ELF__"); > > It looks like this commit broke tinderbox for multiple archs. Rather than just complaining, I figured I should provide a fix (note the llvm namespace scoping operators for the Twine method)... -Garrett $ svn diff contrib/llvm/tools/clang/lib/Basic/Targets.cpp Index: contrib/llvm/tools/clang/lib/Basic/Targets.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- contrib/llvm/tools/clang/lib/Basic/Targets.cpp (revision 226524) +++ contrib/llvm/tools/clang/lib/Basic/Targets.cpp (working copy) @@ -242,8 +242,9 @@ if (Release =3D=3D 0U) Release =3D 8U; - Builder.defineMacro("__FreeBSD__", Twine(Release)); - Builder.defineMacro("__FreeBSD_cc_version", Twine(Release * 100000U + = 1U)); + Builder.defineMacro("__FreeBSD__", llvm::Twine(Release)); + Builder.defineMacro("__FreeBSD_cc_version", + llvm::Twine(Release * 100000U + 1U)); Builder.defineMacro("__KPRINTF_ATTRIBUTE__"); DefineStd(Builder, "unix", Opts); Builder.defineMacro("__ELF__");