Merge commit 'cadddaf255c9' from llvm.org/main into next

Author: git apple-llvm automerger

clang/include/clang/Driver/Distro.h

@@ -48,11 +48,6 @@ class Distro {
  Fedora,
  Gentoo,
  OpenSUSE,
- UbuntuHardy,
- UbuntuIntrepid,
- UbuntuJaunty,
- UbuntuKarmic,
- UbuntuLucid,
  UbuntuMaverick,
  UbuntuNatty,
  UbuntuOneiric,
@@ -135,7 +130,7 @@ class Distro {
  }
 
  bool IsUbuntu() const {
- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuQuesting;
+ return DistroVal >= UbuntuMaverick && DistroVal <= UbuntuQuesting;
  }
 
  bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }

clang/lib/Driver/Distro.cpp

@@ -61,11 +61,6 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) {
  if (Version == Distro::UnknownDistro &&
  Line.starts_with("DISTRIB_CODENAME="))
  Version = llvm::StringSwitch<Distro::DistroType>(Line.substr(17))
- .Case("hardy", Distro::UbuntuHardy)
- .Case("intrepid", Distro::UbuntuIntrepid)
- .Case("jaunty", Distro::UbuntuJaunty)
- .Case("karmic", Distro::UbuntuKarmic)
- .Case("lucid", Distro::UbuntuLucid)
  .Case("maverick", Distro::UbuntuMaverick)
  .Case("natty", Distro::UbuntuNatty)
  .Case("oneiric", Distro::UbuntuOneiric)