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 | 46 |
1 files changed, 25 insertions, 21 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 f12adf513..6fdb58542 100644 --- a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch +++ b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch @@ -24,8 +24,8 @@ index 7b34a09256..7a3774a4f1 100644 AlpineLinux, ArchLinux, DebianLenny, -@@ -118,6 +119,10 @@ public: - return DistroVal >= UbuntuHardy && DistroVal <= UbuntuCosmic; +@@ -120,6 +121,10 @@ public: + return DistroVal >= UbuntuHardy && DistroVal <= UbuntuDisco; } + bool IsAdelieLinux() const { @@ -39,7 +39,7 @@ 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 -@@ -130,6 +130,9 @@ static Distro::DistroType DetectDistro(vfs::FileSystem &VFS) { +@@ -132,6 +132,9 @@ static Distro::DistroType DetectDistro(vfs::FileSystem &VFS) { if (VFS.exists("/etc/exherbo-release")) return Distro::Exherbo; @@ -49,30 +49,34 @@ index 2c4d44faf8..7ef35ab379 100644 if (VFS.exists("/etc/alpine-release")) return Distro::AlpineLinux; -diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp -index 2a87cb077c..85bcd8ed47 100644 ---- a/lib/Driver/ToolChains/Linux.cpp -+++ b/lib/Driver/ToolChains/Linux.cpp -@@ -234,7 +234,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) +-- +2.18.0 + +--- 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 +@@ -236,13 +236,13 @@ + + Distro Distro(D.getVFS()); + +- if (Distro.IsAlpineLinux() || Triple.isAndroid()) { ++ if (Distro.IsAdelieLinux() || Distro.IsAlpineLinux() || Triple.isAndroid()) { + ExtraOpts.push_back("-z"); ExtraOpts.push_back("now"); } -- if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux()) { -+ if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || -+ Distro.IsAdelieLinux()) { + if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || +- Triple.isAndroid()) { ++ Distro.IsAdelieLinux() || Triple.isAndroid()) { ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); } -@@ -268,7 +269,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) - // Hexagon linker/loader does not support .gnu.hash - if (!IsMips && !IsAndroid && !IsHexagon) { +@@ -285,7 +285,8 @@ + if (!IsMips && !IsHexagon) { if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || -- (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick)) -+ Distro.IsAdelieLinux() || -+ (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick)) + (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() || Distro == Distro::UbuntuLucid || --- -2.18.0 - + if (Distro.IsDebian() || Distro.IsOpenSUSE() || |