Date: Friday, July 7, 2017 @ 08:01:44 Author: foutrelis Revision: 299798
upgpkg: llvm 4.0.1-3 Make -nopie work now that PIE is the default. Modified: llvm/trunk/0002-Enable-SSP-and-PIE-by-default.patch llvm/trunk/PKGBUILD ------------------------------------------+ 0002-Enable-SSP-and-PIE-by-default.patch | 17 +++++++++++++++-- PKGBUILD | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) Modified: 0002-Enable-SSP-and-PIE-by-default.patch =================================================================== --- 0002-Enable-SSP-and-PIE-by-default.patch 2017-07-07 07:50:58 UTC (rev 299797) +++ 0002-Enable-SSP-and-PIE-by-default.patch 2017-07-07 08:01:44 UTC (rev 299798) @@ -1,4 +1,4 @@ -From c54346074ca027a03a0277f75e73c38ea959dc61 Mon Sep 17 00:00:00 2001 +From d0104750cdbd92f1870428c95c7a8a3956bff2f7 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras <[email protected]> Date: Thu, 6 Jul 2017 18:15:43 +0300 Subject: [PATCH 2/2] Enable SSP and PIE by default @@ -19,6 +19,7 @@ --- lib/Driver/ToolChains.cpp | 21 ++++++++++++++++++++- lib/Driver/ToolChains.h | 1 + + lib/Driver/Tools.cpp | 1 + test/Driver/cross-linux.c | 16 ++++++++-------- test/Driver/env.c | 2 +- test/Driver/fsanitize.c | 14 ++++++++------ @@ -25,7 +26,7 @@ test/Driver/gcc-toolchain.cpp | 2 +- test/Driver/linux-ld.c | 2 ++ test/Driver/stack-protector.c | 4 ++-- - 8 files changed, 43 insertions(+), 19 deletions(-) + 9 files changed, 44 insertions(+), 19 deletions(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 9bc9ae4f6a..66faa59930 100644 @@ -71,6 +72,18 @@ SanitizerMask getSupportedSanitizers() const override; void addProfileRTLibs(const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const override; +diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp +index 4d4a8c2428..5b8e082797 100644 +--- a/lib/Driver/Tools.cpp ++++ b/lib/Driver/Tools.cpp +@@ -10068,6 +10068,7 @@ void gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + const bool IsIAMCU = ToolChain.getTriple().isOSIAMCU(); + const bool IsPIE = + !Args.hasArg(options::OPT_shared) && !Args.hasArg(options::OPT_static) && ++ !Args.hasArg(options::OPT_nopie) && + (Args.hasArg(options::OPT_pie) || ToolChain.isPIEDefault()); + const bool HasCRTBeginEndFiles = + ToolChain.getTriple().hasEnvironment() || diff --git a/test/Driver/cross-linux.c b/test/Driver/cross-linux.c index a5ea832e77..1949c05a60 100644 --- a/test/Driver/cross-linux.c Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-07-07 07:50:58 UTC (rev 299797) +++ PKGBUILD 2017-07-07 08:01:44 UTC (rev 299798) @@ -11,7 +11,7 @@ pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lld' 'lldb' 'clang' 'clang-tools-extra') pkgver=4.0.1 -pkgrel=2 +pkgrel=3 _ocaml_ver=4.04.1 arch=('i686' 'x86_64') url="http://llvm.org/"; @@ -46,7 +46,7 @@ '8432d2dfd86044a0fc21713e0b5c1d98e1d8aad863cf67562879f47f841ac47b' 'SKIP' 'b0448af29759f5f61567ce41d9b3d583a8ca57289515736ddeef6d1096b0ab42' - 'f97b4ffc1ab4121f7072c15f1847977e224e40aee386a301e8b508206883dec8' + 'f393716a0241a96eeab728908c88594a57d86aa8ce29785765ba1990530d98f2' '6fff47ab5ede79d45fe64bb4903b7dfc27212a38e6cd5d01e60ebd24b7557359' '10cca2f593c711b1b547f479f9f783ab88f9a64b356519d9aa1367e0ff6da73a' 'b80bda6dc26792e499b3150e13c3017be4a65280b4b9f5c9f4c07b55a46d93b6'
