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 | 18 |
1 files changed, 4 insertions, 14 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 a6fbcdd3f..9f2612440 100644 --- a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch +++ b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch @@ -24,7 +24,7 @@ index 7b34a09256..7a3774a4f1 100644 AlpineLinux, ArchLinux, DebianLenny, -@@ -130,3 +130,5 @@ public: +@@ -134,3 +135,5 @@ public: } + bool IsAdelieLinux() const { return DistroVal == AdelieLinux; } @@ -36,7 +36,7 @@ index 2c4d44faf8..7ef35ab379 100644 +++ b/lib/Driver/Distro.cpp @@ -36,6 +36,7 @@ for (StringRef Line : Lines) - if (Version == Distro::UnknownDistro && Line.startswith("ID=")) + if (Version == Distro::UnknownDistro && Line.starts_with("ID=")) Version = llvm::StringSwitch<Distro::DistroType>(Line.substr(3)) + .Case("adelie", Distro::AdelieLinux) .Case("alpine", Distro::AlpineLinux) @@ -44,9 +44,9 @@ index 2c4d44faf8..7ef35ab379 100644 .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 -@@ -188,13 +188,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()) { @@ -60,13 +60,3 @@ index 2c4d44faf8..7ef35ab379 100644 ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); } -@@ -234,7 +234,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() || |