From: Graham Inggs <ginggs@debian.org>
Date: Wed, 1 Nov 2023 19:59:53 +0000 (+0100)
Subject: [PATCH] Add support of the next Ubuntu (Ubuntu 24.04 - Noble Numbat)
X-Git-Tag: archive/raspbian/1%19.1.3-1+rpi1~1^2^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f5dbc68310ab5b3907b6d9df9ebbd903de4db055;p=llvm-toolchain-19.git

[PATCH] Add support of the next Ubuntu (Ubuntu 24.04 - Noble Numbat)

Co-authored-by: Sylvestre Ledru <sylvestre@debian.org>

Gbp-Pq: Name ubuntu-releases.patch
---

diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
index 8291f6575a..1404e16868 100644
--- a/clang/include/clang/Driver/Distro.h
+++ b/clang/include/clang/Driver/Distro.h
@@ -78,6 +78,8 @@ public:
     UbuntuKinetic,
     UbuntuLunar,
     UbuntuMantic,
+    UbuntuNoble,
+    UbuntuOracular,
     UnknownDistro
   };
 
@@ -129,7 +131,7 @@ public:
   }
 
   bool IsUbuntu() const {
-    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;
+    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuOracular;
   }
 
   bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
index 6e00875659..690bf5f5b3 100644
--- a/clang/lib/Driver/Distro.cpp
+++ b/clang/lib/Driver/Distro.cpp
@@ -94,6 +94,8 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) {
                     .Case("kinetic", Distro::UbuntuKinetic)
                     .Case("lunar", Distro::UbuntuLunar)
                     .Case("mantic", Distro::UbuntuMantic)
+                    .Case("noble", Distro::UbuntuNoble)
+                    .Case("oracular", Distro::UbuntuOracular)
                     .Default(Distro::UnknownDistro);
   return Version;
 }