From: Graham Inggs <ginggs@debian.org>
Date: Sat, 24 Feb 2024 07:54:59 +0000 (+0100)
Subject: Update the list of Ubuntu release names
X-Git-Tag: archive/raspbian/1%16.0.6-27+rpi1~6^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=be9d7d57e0293cbfe82809e4e28d6670d5e82747;p=llvm-toolchain-16.git

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 1aaf93ddb7..19d5424a28 100644
--- 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 87a0c5a585..e3c7ceaa07 100644
--- 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;
 }