Update the list of Ubuntu release names

Forwarded: no
Last-Update: 2023-04-29

Gbp-Pq: Name ubuntu-releases.patch

diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
index 1aaf93ddb7c43ba8202e53288a934f9c76a13e2b..19d5424a28b6710c05c238c3a1396e8482f72e30 100644 (file)
--- a/clang/include/clang/Driver/Distro.h
+++ b/clang/include/clang/Driver/Distro.h
@@ -77,6 +77,8 @@ public:
     UbuntuJammy,
     UbuntuKinetic,
     UbuntuLunar,
+    UbuntuMantic,
+    UbuntuNoble,
     UnknownDistro
   };
 
@@ -128,7 +130,7 @@ public:
   }
 
   bool IsUbuntu() const {
-    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuLunar;
+    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble;
   }
 
   bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }

diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
index 87a0c5a58511561a4eac9e651e313542e638d2ca..e3c7ceaa07cedc0852194b8372554493979a664a 100644 (file)
--- a/clang/lib/Driver/Distro.cpp
+++ b/clang/lib/Driver/Distro.cpp
@@ -93,6 +93,8 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) {
                     .Case("jammy", Distro::UbuntuJammy)
                     .Case("kinetic", Distro::UbuntuKinetic)
                     .Case("lunar", Distro::UbuntuLunar)
+                    .Case("mantic", Distro::UbuntuMantic)
+                    .Case("noble", Distro::UbuntuNoble)
                     .Default(Distro::UnknownDistro);
   return Version;
 }