[cfe-commits] r119137 - /cfe/trunk/lib/Driver/ToolChains.cpp

[Zhongxing Xu]

Author: zhongxingxu
Date: Mon Nov 15 03:01:52 2010
New Revision: 119137

URL: http://llvm.org/viewvc/llvm-project?rev=119137&view=rev
Log:
Add driver support for Ubuntu 9.10.

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=119137&r1=119136&r2=119137&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Mon Nov 15 03:01:52 2010
@@ -1203,6 +1203,7 @@
   Fedora14,
   OpenSuse11_3,
   UbuntuJaunty,
+  UbuntuKarmic,
   UbuntuLucid,
   UbuntuMaverick,
   UnknownDistro
@@ -1221,7 +1222,8 @@
 }
 
 static bool IsUbuntu(enum LinuxDistro Distro) {
-  return Distro == UbuntuLucid || Distro == UbuntuMaverick || Distro == UbuntuJaunty;
+  return Distro == UbuntuLucid || Distro == UbuntuMaverick || 
+         Distro == UbuntuJaunty || Distro == UbuntuKarmic;
 }
 
 static bool IsDebianBased(enum LinuxDistro Distro) {
@@ -1254,6 +1256,8 @@
         return UbuntuLucid;
       else if (Lines[i] == "DISTRIB_CODENAME=jaunty")
 	return UbuntuJaunty;
+      else if (Lines[i] == "DISTRIB_CODENAME=karmic")
+        return UbuntuKarmic;
     }
     return UnknownDistro;
   }
@@ -1342,7 +1346,7 @@
       GccTriple = "i586-suse-linux";
   }
 
-  const char* GccVersions[] = {"4.5.1", "4.5", "4.4.5", "4.4.4", "4.4.3",
+  const char* GccVersions[] = {"4.5.1", "4.5", "4.4.5", "4.4.4", "4.4.3", "4.4",
                                "4.3.3", "4.3.2"};
   std::string Base = "";
   for (unsigned i = 0; i < sizeof(GccVersions)/sizeof(char*); ++i) {
@@ -1392,14 +1396,16 @@
   if (IsFedora(Distro) || Distro == UbuntuMaverick)
     ExtraOpts.push_back("--hash-style=gnu");
 
-  if (IsDebian(Distro) || Distro == UbuntuLucid || Distro == UbuntuJaunty)
+  if (IsDebian(Distro) || Distro == UbuntuLucid || Distro == UbuntuJaunty ||
+      Distro == UbuntuKarmic)
     ExtraOpts.push_back("--hash-style=both");
 
   if (IsFedora(Distro))
     ExtraOpts.push_back("--no-add-needed");
 
   if (Distro == DebianSqueeze || IsOpenSuse(Distro) ||
-      IsFedora(Distro) || Distro == UbuntuLucid || Distro == UbuntuMaverick)
+      IsFedora(Distro) || Distro == UbuntuLucid || Distro == UbuntuMaverick ||
+      Distro == UbuntuKarmic)
     ExtraOpts.push_back("--build-id");
 
   Paths.push_back(Base + Suffix);