From owner-svn-src-stable@FreeBSD.ORG  Sat Jul  6 22:39:17 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BE962E87;
 Sat,  6 Jul 2013 22:39:17 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B0287184E;
 Sat,  6 Jul 2013 22:39:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r66MdHtr035600;
 Sat, 6 Jul 2013 22:39:17 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r66MdHaO035599;
 Sat, 6 Jul 2013 22:39:17 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201307062239.r66MdHaO035599@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 6 Jul 2013 22:39:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252900 - stable/9/contrib/llvm/tools/clang/lib/Basic
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jul 2013 22:39:17 -0000

Author: dim
Date: Sat Jul  6 22:39:17 2013
New Revision: 252900
URL: http://svnweb.freebsd.org/changeset/base/252900

Log:
  Fix minor mis-merge in contrib/llvm/tools/clang/lib/Basic/Targets.cpp,
  reducing the diff against the file in head.

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

Modified: stable/9/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
==============================================================================
--- stable/9/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Sat Jul  6 22:34:42 2013	(r252899)
+++ stable/9/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Sat Jul  6 22:39:17 2013	(r252900)
@@ -249,11 +249,10 @@ protected:
 
     unsigned Release = Triple.getOSMajorVersion();
     if (Release == 0U)
-      Release = 8U;
+      Release = 8;
 
-    Builder.defineMacro("__FreeBSD__", llvm::Twine(Release));
-    Builder.defineMacro("__FreeBSD_cc_version",
-                        llvm::Twine(Release * 100000U + 1U));
+    Builder.defineMacro("__FreeBSD__", Twine(Release));
+    Builder.defineMacro("__FreeBSD_cc_version", Twine(Release * 100000U + 1U));
     Builder.defineMacro("__KPRINTF_ATTRIBUTE__");
     DefineStd(Builder, "unix", Opts);
     Builder.defineMacro("__ELF__");