[llvm-branch-commits] [cfe-branch] r170287 - in /cfe/branches/release_32: ./ lib/Driver/ToolChains.cpp

[Pawel Wodnicki]

Author: pawel
Date: Sun Dec 16 09:59:27 2012
New Revision: 170287

URL: http://llvm.org/viewvc/llvm-project?rev=170287&view=rev
Log:
Merging r170147: into the 3.2 release branch.

Add support for current Ubuntu Quantal and the upcoming Raring.
Patch by Martin Nowack.

Modified:
    cfe/branches/release_32/   (props changed)
    cfe/branches/release_32/lib/Driver/ToolChains.cpp

Propchange: cfe/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 16 09:59:27 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:167749,167762,167766,167780,167788,167790,167813-167814,167868,167884,167918,167920,167925,167935,168024,168063,168124,168269,168277-168278,168297,168303,168355,168379,168674,168818,169084,169688
+/cfe/trunk:167749,167762,167766,167780,167788,167790,167813-167814,167868,167884,167918,167920,167925,167935,168024,168063,168124,168269,168277-168278,168297,168303,168355,168379,168674,168818,169084,169688,170147
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_32/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/lib/Driver/ToolChains.cpp?rev=170287&r1=170286&r2=170287&view=diff
==============================================================================
--- cfe/branches/release_32/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_32/lib/Driver/ToolChains.cpp Sun Dec 16 09:59:27 2012
@@ -1855,6 +1855,8 @@
   UbuntuNatty,
   UbuntuOneiric,
   UbuntuPrecise,
+  UbuntuQuantal,
+  UbuntuRaring,
   UnknownDistro
 };
 
@@ -1872,7 +1874,7 @@
 }
 
 static bool IsUbuntu(enum LinuxDistro Distro) {
-  return Distro >= UbuntuHardy && Distro <= UbuntuPrecise;
+  return Distro >= UbuntuHardy && Distro <= UbuntuRaring;
 }
 
 static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
@@ -1894,6 +1896,8 @@
           .Case("natty", UbuntuNatty)
           .Case("oneiric", UbuntuOneiric)
           .Case("precise", UbuntuPrecise)
+          .Case("quantal", UbuntuQuantal)
+          .Case("raring", UbuntuRaring)
           .Default(UnknownDistro);
     return Version;
   }