From owner-svn-src-all@FreeBSD.ORG Wed Oct 19 03:08:43 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 F0AB7106564A; Wed, 19 Oct 2011 03:08:43 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-yw0-f54.google.com (mail-yw0-f54.google.com [209.85.213.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3F91A8FC18; Wed, 19 Oct 2011 03:08:42 +0000 (UTC) Received: by ywm3 with SMTP id 3so1612054ywm.13 for ; Tue, 18 Oct 2011 20:08:42 -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=7EhOR3bOusn4ah7/Yqhxse8jIc96MGAdMHXr5cMylfY=; b=KjmmXykmzoFUilqEMA55VT9v+gdPQngPIII5SXf/rprnZfFuWgV2gWT+92jvQPoC1z IQzdrBnosCj2u3nZktGT1ns8rNyTH+wf6rUFp+jhmJwoRZZUL24UBbASYrxxVOn8gJM1 Lwzuphfjkrz4rbK4RrwUAXPoU+3Ifh552TRUY= MIME-Version: 1.0 Received: by 10.42.137.6 with SMTP id w6mr9362663ict.5.1318993722341; Tue, 18 Oct 2011 20:08:42 -0700 (PDT) Received: by 10.182.122.33 with HTTP; Tue, 18 Oct 2011 20:08:42 -0700 (PDT) In-Reply-To: <201110181737.p9IHbIvW083474@svn.freebsd.org> References: <201110181737.p9IHbIvW083474@svn.freebsd.org> Date: Tue, 18 Oct 2011 20:08:42 -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:08:44 -0000 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 builti= n > =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 &Bui= lder) 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("fr= eebsd"), 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 * 1000= 00U + 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. -Garrett