svn commit: r252900 - stable/9/contrib/llvm/tools/clang/lib/Basic

[Dimitry Andric]

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__");