feat: Add support for Rocky Linux to LLVM Distro

[tbaeder]

@MaskRay Isn't this something we should be doing with config files now?

[zkkxu]

• fix wrong ut test

[zkkxu]

This comment was removed by zkkxu.

[zkkxu]

nice ping.

[MaskRay]

In D156588#4544152, @tbaeder wrote:

@MaskRay Isn't this something we should be doing with config files now?

I agree. This should use https://clang.llvm.org/docs/UsersManual.html#configuration-files .

clang/include/clang/Driver/Distro.h is not a place to enumerate every distribution. It provides some methods e.g. IsOpenSuse to be checked by driver code to add, for example, default linker options for a particular distribution.
However, this has been largely replaced with https://clang.llvm.org/docs/UsersManual.html#configuration-files and we should migrate some to use configuration files.

https://blogs.gentoo.org/mgorny/2022/10/07/clang-in-gentoo-now-sets-default-runtimes-via-config-file/ has some nice information.

clang/include/clang/Driver/Distro.h

enum DistroType {
     DebianBuster,
     DebianBullseye,
     DebianBookworm,
     DebianTrixie,
     Exherbo,
     RHEL5,
     RHEL6,
     RHEL7,
+    RHEL8,
     Fedora,
     Gentoo,
     OpenSUSE,
     UbuntuHardy,
     UbuntuIntrepid,
     UbuntuJaunty,
     UbuntuKarmic,
     UbuntuLucid,
public:
   /// @}
   /// @name Convenience Predicates
   /// @{
 
   bool IsRedhat() const {
     return DistroVal == Fedora || (DistroVal >= RHEL5 && DistroVal <= RHEL7);
   }
 
+  bool IsRocky() const { return DistroVal == RHEL8; }
+
   bool IsOpenSUSE() const { return DistroVal == OpenSUSE; }
 
   bool IsDebian() const {
     return DistroVal >= DebianLenny && DistroVal <= DebianTrixie;
   }
 
   bool IsUbuntu() const {
     return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;

clang/lib/Driver/Distro.cpp

static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) {
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
       VFS.getBufferForFile("/etc/redhat-release");
 
   if (File) {
     StringRef Data = File.get()->getBuffer();
     if (Data.startswith("Fedora release"))
       return Distro::Fedora;
     if (Data.startswith("Red Hat Enterprise Linux") ||
-        Data.startswith("CentOS") || Data.startswith("Scientific Linux")) {
-      if (Data.contains("release 7"))
+        Data.startswith("CentOS") || Data.startswith("Scientific Linux") ||
+        Data.startswith("Rocky Linux")) {
+      if (Data.contains("release 8"))
+        return Distro::RHEL8;
+      else if (Data.contains("release 7"))
         return Distro::RHEL7;
       else if (Data.contains("release 6"))
         return Distro::RHEL6;
       else if (Data.contains("release 5"))
         return Distro::RHEL5;
     }
     return Distro::UnknownDistro;
   }

clang/unittests/Driver/DistroTest.cpp

UbuntuTrustyFileSystem.addFile("/etc/os-release", 0,
                                        "HOME_URL=\"http://www.ubuntu.com/\"\n"
                                        "SUPPORT_URL=\"http://help.ubuntu.com/\"\n"
                                        "BUG_REPORT_URL=\"http://bugs.launchpad.net/ubuntu/\"\n"));
 
   Distro UbuntuTrusty{UbuntuTrustyFileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::UbuntuTrusty), UbuntuTrusty);
   ASSERT_TRUE(UbuntuTrusty.IsUbuntu());
   ASSERT_FALSE(UbuntuTrusty.IsRedhat());
+  ASSERT_FALSE(UbuntuTrusty.IsRocky());
   ASSERT_FALSE(UbuntuTrusty.IsOpenSUSE());
   ASSERT_FALSE(UbuntuTrusty.IsDebian());
   ASSERT_FALSE(UbuntuTrusty.IsGentoo());
 
   Distro UbuntuTrusty2{UbuntuTrustyFileSystem, llvm::Triple("unknown-pc-windows")};
   ASSERT_EQ(Distro(Distro::UnknownDistro), UbuntuTrusty2);
 
   llvm::vfs::InMemoryFileSystem UbuntuYakketyFileSystem;
UbuntuYakketyFileSystem.addFile("/etc/os-release", 0,
                                        "PRIVACY_POLICY_URL=\"http://www.ubuntu.com/legal/terms-and-policies/privacy-policy\"\n"
                                        "VERSION_CODENAME=yakkety\n"
                                        "UBUNTU_CODENAME=yakkety\n"));
 
   Distro UbuntuYakkety{UbuntuYakketyFileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::UbuntuYakkety), UbuntuYakkety);
   ASSERT_TRUE(UbuntuYakkety.IsUbuntu());
   ASSERT_FALSE(UbuntuYakkety.IsRedhat());
+  ASSERT_FALSE(UbuntuYakkety.IsRocky());
   ASSERT_FALSE(UbuntuYakkety.IsOpenSUSE());
   ASSERT_FALSE(UbuntuYakkety.IsDebian());
   ASSERT_FALSE(UbuntuYakkety.IsGentoo());
 }
 
 TEST(DistroTest, DetectRedhat) {
   llvm::vfs::InMemoryFileSystem Fedora25FileSystem;
   Fedora25FileSystem.addFile("/etc/system-release-cpe", 0,
Fedora25FileSystem.addFile("/etc/os-release", 0,
                                        "REDHAT_BUGZILLA_PRODUCT_VERSION=25\n"
                                        "REDHAT_SUPPORT_PRODUCT=\"Fedora\"\n"
                                        "REDHAT_SUPPORT_PRODUCT_VERSION=25\n"
                                        "PRIVACY_POLICY_URL=https://fedoraproject.org/wiki/Legal:PrivacyPolicy\n"));
   Distro Fedora25{Fedora25FileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::Fedora), Fedora25);
   ASSERT_FALSE(Fedora25.IsUbuntu());
   ASSERT_TRUE(Fedora25.IsRedhat());
+  ASSERT_FALSE(Fedora25.IsRocky());
   ASSERT_FALSE(Fedora25.IsOpenSUSE());
   ASSERT_FALSE(Fedora25.IsDebian());
   ASSERT_FALSE(Fedora25.IsGentoo());
 
   llvm::vfs::InMemoryFileSystem CentOS7FileSystem;
   CentOS7FileSystem.addFile("/etc/system-release-cpe", 0,
       llvm::MemoryBuffer::getMemBuffer("cpe:/o:centos:centos:7\n"));
   // Both files are symlinks to centos-release.
CentOS7FileSystem.addFile("/etc/os-release", 0,
                                        "CENTOS_MANTISBT_PROJECT_VERSION=\"7\"\n"
                                        "REDHAT_SUPPORT_PRODUCT=\"centos\"\n"
                                        "REDHAT_SUPPORT_PRODUCT_VERSION=\"7\"\n"));
 
   Distro CentOS7{CentOS7FileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::RHEL7), CentOS7);
   ASSERT_FALSE(CentOS7.IsUbuntu());
   ASSERT_TRUE(CentOS7.IsRedhat());
+  ASSERT_FALSE(CentOS7.IsRocky());
   ASSERT_FALSE(CentOS7.IsOpenSUSE());
   ASSERT_FALSE(CentOS7.IsDebian());
   ASSERT_FALSE(CentOS7.IsGentoo());
 }
 
+TEST(DistroTest, DetectRocky) {
+  llvm::vfs::InMemoryFileSystem RockyFileSystem;
+  RockyFileSystem.addFile(
+      "/etc/system-release-cpe", 0,
+      llvm::MemoryBuffer::getMemBuffer("cpe:/o:rocky:rocky:8:GA\n"));
+  // Both files are symlinks to rocky-release.
+  RockyFileSystem.addFile("/etc/system-release", 0,
+                          llvm::MemoryBuffer::getMemBuffer(
+                              "Rocky Linux release 8.6 (Green Obsidian) \n"));
+  RockyFileSystem.addFile("/etc/redhat-release", 0,
+                          llvm::MemoryBuffer::getMemBuffer(
+                              "Rocky Linux release 8.6 (Green Obsidian) \n"));
+  RockyFileSystem.addFile("/etc/centos-release", 0,
+                          llvm::MemoryBuffer::getMemBuffer(
+                              "Rocky Linux release 8.6 (Green Obsidian) \n"));
+  RockyFileSystem.addFile(
+      "/etc/os-release", 0,
+      llvm::MemoryBuffer::getMemBuffer(
+          "NAME=\"Rocky Linux\"\n"
+          "VERSION=\"8.6 (Green Obsidian)\"\n"
+          "ID=\"rocky\"\n"
+          "ID_LIKE=\"rhel centos fedora\"\n"
+          "VERSION_ID=\"8.6\"\n"
+          "PLATFORM_ID=\"platform:el8\"\n"
+          "PRETTY_NAME=\"Rocky Linux 8.6 (Green Obsidian)\"\n"
+          "ANSI_COLOR=\"0;32\"\n"
+          "CPE_NAME=\"cpe:/o:rocky:rocky:8:GA\"\n"
+          "HOME_URL=\"https://rockylinux.org\"\n"
+          "BUG_REPORT_URL=\"https://bugs.rockylinux.org/\"\n"
+          "ROCKY_SUPPORT_PRODUCT=\"Rocky Linux\"\n"
+          "ROCKY_SUPPORT_PRODUCT_VERSION=\"8\"\n"
+          "REDHAT_SUPPORT_PRODUCT=\"Rocky Linux\"\n"
+          "REDHAT_SUPPORT_PRODUCT_VERSION=\"8\"\n"));
+
+  Distro Rocky{RockyFileSystem, llvm::Triple("unknown-pc-linux")};
+  ASSERT_EQ(Distro(Distro::RHEL8), Rocky);
+  ASSERT_FALSE(Rocky.IsUbuntu());
+  ASSERT_FALSE(Rocky.IsRedhat());
+  ASSERT_TRUE(Rocky.IsRocky());
+  ASSERT_FALSE(Rocky.IsOpenSUSE());
+  ASSERT_FALSE(Rocky.IsDebian());
+  ASSERT_FALSE(Rocky.IsGentoo());
+}
+
 TEST(DistroTest, DetectOpenSUSE) {
   llvm::vfs::InMemoryFileSystem OpenSUSELeap421FileSystem;
   OpenSUSELeap421FileSystem.addFile("/etc/SuSE-release", 0,
       llvm::MemoryBuffer::getMemBuffer("openSUSE 42.1 (x86_64)\n"
                                        "VERSION = 42.1\n"
                                        "CODENAME = Malachite\n"
                                        "# /etc/SuSE-release is deprecated and will be removed in the future, use /etc/os-release instead\n"));
   OpenSUSELeap421FileSystem.addFile("/etc/os-release", 0,
       llvm::MemoryBuffer::getMemBuffer("NAME=\"openSUSE Leap\"\n"
                                        "VERSION=\"42.1\"\n"
                                        "VERSION_ID=\"42.1\"\n"
                                        "PRETTY_NAME=\"openSUSE Leap 42.1 (x86_64)\"\n"
                                        "ID=opensuse\n"
                                        "ANSI_COLOR=\"0;32\"\n"
                                        "CPE_NAME=\"cpe:/o:opensuse:opensuse:42.1\"\n"
                                        "BUG_REPORT_URL=\"https://bugs.opensuse.org\"\n"
                                        "HOME_URL=\"https://opensuse.org/\"\n"
                                        "ID_LIKE=\"suse\"\n"));
 
   Distro OpenSUSELeap421{OpenSUSELeap421FileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::OpenSUSE), OpenSUSELeap421);
   ASSERT_FALSE(OpenSUSELeap421.IsUbuntu());
   ASSERT_FALSE(OpenSUSELeap421.IsRedhat());
+  ASSERT_FALSE(OpenSUSELeap421.IsRocky());
   ASSERT_TRUE(OpenSUSELeap421.IsOpenSUSE());
   ASSERT_FALSE(OpenSUSELeap421.IsDebian());
   ASSERT_FALSE(OpenSUSELeap421.IsGentoo());
 
   llvm::vfs::InMemoryFileSystem OpenSUSE132FileSystem;
   OpenSUSE132FileSystem.addFile("/etc/SuSE-release", 0,
       llvm::MemoryBuffer::getMemBuffer("openSUSE 13.2 (x86_64)\n"
                                        "VERSION = 13.2\n"
OpenSUSE132FileSystem.addFile("/etc/os-release", 0,
                                        "BUG_REPORT_URL=\"https://bugs.opensuse.org\"\n"
                                        "HOME_URL=\"https://opensuse.org/\"\n"
                                        "ID_LIKE=\"suse\"\n"));
 
   Distro OpenSUSE132{OpenSUSE132FileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::OpenSUSE), OpenSUSE132);
   ASSERT_FALSE(OpenSUSE132.IsUbuntu());
   ASSERT_FALSE(OpenSUSE132.IsRedhat());
+  ASSERT_FALSE(OpenSUSE132.IsRocky());
   ASSERT_TRUE(OpenSUSE132.IsOpenSUSE());
   ASSERT_FALSE(OpenSUSE132.IsDebian());
   ASSERT_FALSE(OpenSUSE132.IsGentoo());
 
   llvm::vfs::InMemoryFileSystem SLES10FileSystem;
   SLES10FileSystem.addFile("/etc/SuSE-release", 0,
       llvm::MemoryBuffer::getMemBuffer("SUSE Linux Enterprise Server 10 (x86_64)\n"
                                        "VERSION = 10\n"
                                        "PATCHLEVEL = 4\n"));
   SLES10FileSystem.addFile("/etc/lsb_release", 0,
       llvm::MemoryBuffer::getMemBuffer("LSB_VERSION=\"core-2.0-noarch:core-3.0-noarch:core-2.0-x86_64:core-3.0-x86_64\"\n"));
 
   // SLES10 is unsupported and therefore evaluates to unknown
   Distro SLES10{SLES10FileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::UnknownDistro), SLES10);
   ASSERT_FALSE(SLES10.IsUbuntu());
   ASSERT_FALSE(SLES10.IsRedhat());
+  ASSERT_FALSE(SLES10.IsRocky());
   ASSERT_FALSE(SLES10.IsOpenSUSE());
   ASSERT_FALSE(SLES10.IsDebian());
   ASSERT_FALSE(SLES10.IsGentoo());
 }
 
 TEST(DistroTest, DetectDebian) {
   llvm::vfs::InMemoryFileSystem DebianJessieFileSystem;
   DebianJessieFileSystem.addFile("/etc/debian_version", 0,
                                  llvm::MemoryBuffer::getMemBuffer("8.6\n"));
   DebianJessieFileSystem.addFile("/etc/os-release", 0,
       llvm::MemoryBuffer::getMemBuffer("PRETTY_NAME=\"Debian GNU/Linux 8 (jessie)\"\n"
                                        "NAME=\"Debian GNU/Linux\"\n"
                                        "VERSION_ID=\"8\"\n"
                                        "VERSION=\"8 (jessie)\"\n"
                                        "ID=debian\n"
                                        "HOME_URL=\"http://www.debian.org/\"\n"
                                        "SUPPORT_URL=\"http://www.debian.org/support\"\n"
                                        "BUG_REPORT_URL=\"https://bugs.debian.org/\"\n"));
 
   Distro DebianJessie{DebianJessieFileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::DebianJessie), DebianJessie);
   ASSERT_FALSE(DebianJessie.IsUbuntu());
   ASSERT_FALSE(DebianJessie.IsRedhat());
+  ASSERT_FALSE(DebianJessie.IsRocky());
   ASSERT_FALSE(DebianJessie.IsOpenSUSE());
   ASSERT_TRUE(DebianJessie.IsDebian());
   ASSERT_FALSE(DebianJessie.IsGentoo());
 
   llvm::vfs::InMemoryFileSystem DebianStretchSidFileSystem;
   DebianStretchSidFileSystem.addFile("/etc/debian_version", 0,
                                  llvm::MemoryBuffer::getMemBuffer("stretch/sid\n"));
   DebianStretchSidFileSystem.addFile("/etc/os-release", 0,
       llvm::MemoryBuffer::getMemBuffer("PRETTY_NAME=\"Debian GNU/Linux stretch/sid\"\n"
                                        "NAME=\"Debian GNU/Linux\"\n"
                                        "ID=debian\n"
                                        "HOME_URL=\"http://www.debian.org/\"\n"
                                        "SUPPORT_URL=\"http://www.debian.org/support\"\n"
                                        "BUG_REPORT_URL=\"https://bugs.debian.org/\"\n"));
 
   Distro DebianStretchSid{DebianStretchSidFileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::DebianStretch), DebianStretchSid);
   ASSERT_FALSE(DebianStretchSid.IsUbuntu());
   ASSERT_FALSE(DebianStretchSid.IsRedhat());
+  ASSERT_FALSE(DebianStretchSid.IsRocky());
   ASSERT_FALSE(DebianStretchSid.IsOpenSUSE());
   ASSERT_TRUE(DebianStretchSid.IsDebian());
   ASSERT_FALSE(DebianStretchSid.IsGentoo());
 }
 
 TEST(DistroTest, DetectExherbo) {
   llvm::vfs::InMemoryFileSystem ExherboFileSystem;
   ExherboFileSystem.addFile("/etc/os-release", 0,
       llvm::MemoryBuffer::getMemBuffer("NAME=\"Exherbo\"\n"
                                        "PRETTY_NAME=\"Exherbo Linux\"\n"
                                        "ID=exherbo\n"
                                        "ANSI_COLOR=\"0;32\"\n"
                                        "HOME_URL=\"https://www.exherbo.org/\"\n"
                                        "SUPPORT_URL=\"irc://irc.freenode.net/#exherbo\"\n"
                                        "BUG_REPORT_URL=\"https://bugs.exherbo.org/\"\n"));
 
   Distro Exherbo{ExherboFileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::Exherbo), Exherbo);
   ASSERT_FALSE(Exherbo.IsUbuntu());
   ASSERT_FALSE(Exherbo.IsRedhat());
+  ASSERT_FALSE(Exherbo.IsRocky());
   ASSERT_FALSE(Exherbo.IsOpenSUSE());
   ASSERT_FALSE(Exherbo.IsDebian());
   ASSERT_FALSE(Exherbo.IsGentoo());
 }
 
 TEST(DistroTest, DetectArchLinux) {
   llvm::vfs::InMemoryFileSystem ArchLinuxFileSystem;
   ArchLinuxFileSystem.addFile("/etc/arch-release", 0, // (empty)
                                  llvm::MemoryBuffer::getMemBuffer(""));
   ArchLinuxFileSystem.addFile("/etc/os-release", 0,
       llvm::MemoryBuffer::getMemBuffer("NAME=\"Arch Linux\"\n"
                                        "ID=arch\n"
                                        "PRETTY_NAME=\"Arch Linux\"\n"
                                        "ANSI_COLOR=\"0;36\"\n"
                                        "HOME_URL=\"https://www.archlinux.org/\"\n"
                                        "SUPPORT_URL=\"https://bbs.archlinux.org/\"\n"
                                        "BUG_REPORT_URL=\"https://bugs.archlinux.org/\"\n"));
 
   Distro ArchLinux{ArchLinuxFileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::ArchLinux), ArchLinux);
   ASSERT_FALSE(ArchLinux.IsUbuntu());
   ASSERT_FALSE(ArchLinux.IsRedhat());
+  ASSERT_FALSE(ArchLinux.IsRocky());
   ASSERT_FALSE(ArchLinux.IsOpenSUSE());
   ASSERT_FALSE(ArchLinux.IsDebian());
   ASSERT_FALSE(ArchLinux.IsGentoo());
 }
 
 TEST(DistroTest, DetectGentoo) {
   llvm::vfs::InMemoryFileSystem GentooFileSystem;
   GentooFileSystem.addFile(
GentooFileSystem.addFile(
           "HOME_URL=\"https://www.gentoo.org/\"\n"
           "SUPPORT_URL=\"https://www.gentoo.org/support/\"\n"
           "BUG_REPORT_URL=\"https://bugs.gentoo.org/\"\n"));
 
   Distro Gentoo{GentooFileSystem, llvm::Triple("unknown-pc-linux")};
   ASSERT_EQ(Distro(Distro::Gentoo), Gentoo);
   ASSERT_FALSE(Gentoo.IsUbuntu());
   ASSERT_FALSE(Gentoo.IsRedhat());
+  ASSERT_FALSE(Gentoo.IsRocky());
   ASSERT_FALSE(Gentoo.IsOpenSUSE());
   ASSERT_FALSE(Gentoo.IsDebian());
   ASSERT_TRUE(Gentoo.IsGentoo());
 }
 
 TEST(DistroTest, DetectWindowsAndCrossCompile) {
 
   class CountingFileSystem : public llvm::vfs::ProxyFileSystem {