aboutsummaryrefslogtreecommitdiffstats
path: root/main/clang/clang-0005-Enable-PIE-by-default-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-0005-Enable-PIE-by-default-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-0005-Enable-PIE-by-default-for-alpine-linux.patch')
-rw-r--r--main/clang/clang-0005-Enable-PIE-by-default-for-alpine-linux.patch28
1 files changed, 7 insertions, 21 deletions
diff --git a/main/clang/clang-0005-Enable-PIE-by-default-for-alpine-linux.patch b/main/clang/clang-0005-Enable-PIE-by-default-for-alpine-linux.patch
index a1d49eeb82..7cd79addcc 100644
--- a/main/clang/clang-0005-Enable-PIE-by-default-for-alpine-linux.patch
+++ b/main/clang/clang-0005-Enable-PIE-by-default-for-alpine-linux.patch
@@ -1,20 +1,13 @@
-From efbdf70c883a356106fc1bcb1c2917ec6c0a6157 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 23 Feb 2016 09:35:26 +0100
-Subject: [PATCH 5/7] Enable PIE by default for alpine linux
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 16 Apr 2017 16:49:00 +0100
+Subject: [PATCH] Enable PIE by default for Alpine Linux
Alpine Linux uses PIE by default.
----
- lib/Driver/ToolChains.cpp | 5 ++++-
- lib/Driver/Tools.cpp | 4 +++-
- test/Driver/pic.c | 12 ++++++++++++
- 3 files changed, 19 insertions(+), 2 deletions(-)
-diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
-index 0db9644..82449bf 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
-@@ -4143,7 +4143,10 @@ void Linux::AddCudaIncludeArgs(const ArgList &DriverArgs,
+@@ -4721,7 +4721,10 @@
}
}
@@ -26,11 +19,9 @@ index 0db9644..82449bf 100644
SanitizerMask Linux::getSupportedSanitizers() const {
const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;
-diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
-index ea1ce6f..8fd3649 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
-@@ -7919,7 +7919,9 @@ void freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+@@ -9258,7 +9258,9 @@
if (!D.SysRoot.empty())
CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot));
@@ -40,12 +31,10 @@ index ea1ce6f..8fd3649 100644
+ else if (IsPIE)
CmdArgs.push_back("-pie");
- if (Args.hasArg(options::OPT_static)) {
-diff --git a/test/Driver/pic.c b/test/Driver/pic.c
-index aeb2ee3..9b8e0f6 100644
+ CmdArgs.push_back("--eh-frame-hdr");
--- a/test/Driver/pic.c
+++ b/test/Driver/pic.c
-@@ -243,6 +243,18 @@
+@@ -244,6 +244,18 @@
// RUN: %clang %s -target i386-pc-openbsd -nopie -### 2>&1 \
// RUN: | FileCheck %s --check-prefix=CHECK-NOPIE-LD
//
@@ -64,6 +53,3 @@ index aeb2ee3..9b8e0f6 100644
// On Android PIC is enabled by default
// RUN: %clang -c %s -target i686-linux-android -### 2>&1 \
// RUN: | FileCheck %s --check-prefix=CHECK-PIC2
---
-2.7.3
-