summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2018-12-05 19:48:58 +0000
committerTom Stellard <tstellar@redhat.com>2018-12-05 19:48:58 +0000
commitb1c89d22f9870e78b89910cbc176cba1db0f086e (patch)
tree34ff84bce3a73a0abf7a65f5befeabd73cd6feed /clang/lib
parentd363502dcdf5a04d562c36ec48a1a0f9f7e4f9b9 (diff)
downloadbcm5719-llvm-b1c89d22f9870e78b89910cbc176cba1db0f086e.tar.gz
bcm5719-llvm-b1c89d22f9870e78b89910cbc176cba1db0f086e.zip
Merging r345470:
------------------------------------------------------------------------ r345470 | brad | 2018-10-27 20:30:18 -0700 (Sat, 27 Oct 2018) | 2 lines Reapply Pass the nopie flag to the linker when linking with -pg. ------------------------------------------------------------------------ llvm-svn: 348405
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Driver/ToolChains/OpenBSD.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains/OpenBSD.cpp b/clang/lib/Driver/ToolChains/OpenBSD.cpp
index 7b98cd62bbf..432f6079e38 100644
--- a/clang/lib/Driver/ToolChains/OpenBSD.cpp
+++ b/clang/lib/Driver/ToolChains/OpenBSD.cpp
@@ -138,7 +138,7 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
if (Args.hasArg(options::OPT_pie))
CmdArgs.push_back("-pie");
- if (Args.hasArg(options::OPT_nopie))
+ if (Args.hasArg(options::OPT_nopie) || Args.hasArg(options::OPT_pg))
CmdArgs.push_back("-nopie");
if (Output.isFilename()) {
OpenPOWER on IntegriCloud