From owner-svn-src-all@FreeBSD.ORG  Wed Oct 19 06:24:54 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 4AD1E106564A;
	Wed, 19 Oct 2011 06:24:54 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A6368FC14;
	Wed, 19 Oct 2011 06:24:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9J6Osh3007697;
	Wed, 19 Oct 2011 06:24:54 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9J6Osnv007695;
	Wed, 19 Oct 2011 06:24:54 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201110190624.p9J6Osnv007695@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 19 Oct 2011 06:24:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226525 - 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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Oct 2011 06:24:54 -0000

Author: dim
Date: Wed Oct 19 06:24:53 2011
New Revision: 226525
URL: http://svn.freebsd.org/changeset/base/226525

Log:
  Fix breakage introduced by r226518.
  
  Spotted by:	tinderbox, yanefbsd at gmail.com
  Pointy hat to:	dim

Modified:
  head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp

Modified: head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Wed Oct 19 01:23:13 2011	(r226524)
+++ head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Wed Oct 19 06:24:53 2011	(r226525)
@@ -242,8 +242,9 @@ protected:
     if (Release == 0U)
       Release = 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__");