Merge branch '16' into 17

This commit is contained in:
Gianfranco Costamagna 2023-10-31 23:02:31 +01:00
commit f0fcfca366
3 changed files with 41 additions and 0 deletions

2
debian/changelog vendored
View File

@ -183,6 +183,8 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium
* Upload to sid
[ Steve Langasek ]
* Add noble as supported Ubuntu release
-- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 25 Oct 2023 08:10:35 +0200

View File

@ -148,3 +148,4 @@ force-sse2-compiler-rt.diff
bolt-disable-emit-relocs.patch
link-grpc.diff
D158066-simd-ppc64el.patch
ubuntu-releases.patch

38
debian/patches/ubuntu-releases.patch vendored Normal file
View File

@ -0,0 +1,38 @@
Description: Update the list of Ubuntu release names
Forwarded: no
Author: Graham Inggs <ginggs@debian.org>
Last-Update: 2023-04-29
Index: llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h
===================================================================
--- llvm-toolchain-17-17.0.3.orig/clang/include/clang/Driver/Distro.h
+++ llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h
@@ -78,6 +78,7 @@
UbuntuKinetic,
UbuntuLunar,
UbuntuMantic,
+ UbuntuNoble,
UnknownDistro
};
@@ -129,7 +130,7 @@
}
bool IsUbuntu() const {
- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;
+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble;
}
bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
Index: llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp
===================================================================
--- llvm-toolchain-17-17.0.3.orig/clang/lib/Driver/Distro.cpp
+++ llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp
@@ -94,6 +94,7 @@
.Case("kinetic", Distro::UbuntuKinetic)
.Case("lunar", Distro::UbuntuLunar)
.Case("mantic", Distro::UbuntuMantic)
+ .Case("noble", Distro::UbuntuNoble)
.Default(Distro::UnknownDistro);
return Version;
}