aboutsummaryrefslogtreecommitdiffstats
path: root/main/llvm/clang-3.6-alpine-use-z-relro.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-05-21 11:37:40 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-05-21 11:59:24 +0000
commiteac22325a7d4cf3ca559fa4d3ee2e49f4e879ffd (patch)
treebe9d3da7650e4eeb3ba22c6d0c1cca45ccb51517 /main/llvm/clang-3.6-alpine-use-z-relro.patch
parent3681f34c0d3bd9b6d30a7817989a862e29ab4fe4 (diff)
downloadaports-eac22325a7d4cf3ca559fa4d3ee2e49f4e879ffd.tar.bz2
aports-eac22325a7d4cf3ca559fa4d3ee2e49f4e879ffd.tar.xz
main/llvm: upgrade to 3.6.0
move from testing fixes #4068
Diffstat (limited to 'main/llvm/clang-3.6-alpine-use-z-relro.patch')
-rw-r--r--main/llvm/clang-3.6-alpine-use-z-relro.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/main/llvm/clang-3.6-alpine-use-z-relro.patch b/main/llvm/clang-3.6-alpine-use-z-relro.patch
new file mode 100644
index 0000000000..bd7cea08c8
--- /dev/null
+++ b/main/llvm/clang-3.6-alpine-use-z-relro.patch
@@ -0,0 +1,19 @@
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index f789fd5..6d75b4b 100644
+--- a/lib/Driver/ToolChains.cpp
++++ b/lib/Driver/ToolChains.cpp
+@@ -2930,13 +2940,13 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+ GCCInstallation.getTriple().str() + "/bin").str());
+
+ Linker = GetLinkerPath();
+
+ Distro Distro = DetectDistro(Arch);
+
+- if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) {
++ if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || Distro == AlpineLinux) {
+ ExtraOpts.push_back("-z");
+ ExtraOpts.push_back("relro");
+ }
+
+ if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb)
+ ExtraOpts.push_back("-X");