aboutsummaryrefslogtreecommitdiffstats
path: root/main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-04-16 18:37:24 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-04-22 02:45:59 +0200
commitc0f3c8c71e90f25a912bc24f92c309f6fecac2ac (patch)
treedc4ae8366b37c12c12cde4a1c058c6a262048d09 /main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
parent4fa26deecb7919b84546187714fd3369f4b7af95 (diff)
downloadaports-c0f3c8c71e90f25a912bc24f92c309f6fecac2ac.tar.bz2
aports-c0f3c8c71e90f25a912bc24f92c309f6fecac2ac.tar.xz
main/clang: upgrade to 4.0.0
Diffstat (limited to 'main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch')
-rw-r--r--main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch25
1 files changed, 7 insertions, 18 deletions
diff --git a/main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch b/main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
index 4dc9842f00..0b66323288 100644
--- a/main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
+++ b/main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
@@ -1,27 +1,16 @@
-From b880ea7037ea3232be9ba2e96cc179da92ea4b9c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 18 Feb 2016 17:43:51 +0100
-Subject: [PATCH 3/7] Use --hash-style=gnu for Alpine Linux
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 16 Apr 2017 16:49:00 +0100
+Subject: [PATCH] Use --hash-style=gnu for Alpine Linux
----
- lib/Driver/ToolChains.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
-index 46326f0..6b0b31d 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
-@@ -3687,8 +3687,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+@@ -4132,7 +4132,7 @@
// ABI requires a mapping between the GOT and the symbol table.
// Android loader does not support .gnu.hash.
if (!IsMips && !IsAndroid) {
-- if (IsRedhat(Distro) || IsOpenSUSE(Distro) ||
-- (IsUbuntu(Distro) && Distro >= UbuntuMaverick))
-+ if (IsRedhat(Distro) || IsOpenSUSE(Distro) || Distro == AlpineLinux ||
-+ (IsUbuntu(Distro) && Distro >= UbuntuMaverick))
+- if (Distro.IsRedhat() || Distro.IsOpenSUSE() ||
++ if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() ||
+ (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick))
ExtraOpts.push_back("--hash-style=gnu");
- if (IsDebian(Distro) || IsOpenSUSE(Distro) || Distro == UbuntuLucid ||
---
-2.7.3
-