diff options
Diffstat (limited to 'user/clang/0001-Add-support-for-Ad-lie-Linux.patch')
| -rw-r--r-- | user/clang/0001-Add-support-for-Ad-lie-Linux.patch | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch index 4c2ef219f..9f2612440 100644 --- a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch +++ b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch @@ -16,7 +16,7 @@ diff --git a/include/clang/Driver/Distro.h b/include/clang/Driver/Distro.h index 7b34a09256..7a3774a4f1 100644 --- a/include/clang/Driver/Distro.h +++ b/include/clang/Driver/Distro.h -@@ -26,6 +26,7 @@ public: +@@ -28,6 +28,7 @@ public: // NB: Releases of a particular Linux distro should be kept together // in this enum, because some tests are done by integer comparison against // the first and last known member in the family, e.g. IsRedHat(). @@ -24,39 +24,29 @@ index 7b34a09256..7a3774a4f1 100644 AlpineLinux, ArchLinux, DebianLenny, -@@ -120,6 +121,10 @@ public: - return DistroVal >= UbuntuHardy && DistroVal <= UbuntuDisco; +@@ -134,3 +135,5 @@ public: } -+ bool IsAdelieLinux() const { -+ return DistroVal == AdelieLinux; -+ } ++ bool IsAdelieLinux() const { return DistroVal == AdelieLinux; } + - bool IsAlpineLinux() const { - return DistroVal == AlpineLinux; - } + bool IsAlpineLinux() const { return DistroVal == AlpineLinux; } diff --git a/lib/Driver/Distro.cpp b/lib/Driver/Distro.cpp index 2c4d44faf8..7ef35ab379 100644 --- a/lib/Driver/Distro.cpp +++ b/lib/Driver/Distro.cpp -@@ -132,6 +132,9 @@ static Distro::DistroType DetectDistro(vfs::FileSystem &VFS) { - if (VFS.exists("/etc/exherbo-release")) - return Distro::Exherbo; - -+ if (VFS.exists("/etc/adelie-release")) -+ return Distro::AdelieLinux; -+ - if (VFS.exists("/etc/alpine-release")) - return Distro::AlpineLinux; - --- -2.18.0 - +@@ -36,6 +36,7 @@ + for (StringRef Line : Lines) + if (Version == Distro::UnknownDistro && Line.starts_with("ID=")) + Version = llvm::StringSwitch<Distro::DistroType>(Line.substr(3)) ++ .Case("adelie", Distro::AdelieLinux) + .Case("alpine", Distro::AlpineLinux) + .Case("fedora", Distro::Fedora) + .Case("gentoo", Distro::Gentoo) --- cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp.old 2018-11-29 18:52:22.000000000 +0000 +++ cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp 2019-04-23 23:49:37.786181838 +0000 -@@ -241,13 +241,13 @@ +@@ -226,13 +226,13 @@ - Distro Distro(D.getVFS()); + Distro Distro(D.getVFS(), Triple); - if (Distro.IsAlpineLinux() || Triple.isAndroid()) { + if (Distro.IsAdelieLinux() || Distro.IsAlpineLinux() || Triple.isAndroid()) { @@ -70,13 +60,3 @@ index 2c4d44faf8..7ef35ab379 100644 ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); } -@@ -290,7 +290,8 @@ - if (!IsMips && !IsHexagon) { - if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || - (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) || -- (IsAndroid && !Triple.isAndroidVersionLT(23))) -+ (IsAndroid && !Triple.isAndroidVersionLT(23)) || -+ Distro.IsAdelieLinux()) - ExtraOpts.push_back("--hash-style=gnu"); - - if (Distro.IsDebian() || Distro.IsOpenSUSE() || |