summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2020-11-25 14:26:13 +0000
committerEd Maste <emaste@FreeBSD.org>2020-11-25 14:26:13 +0000
commit3063e1e56b509373d143a3a4c67d388bd390f268 (patch)
treeb08eb9e984d3115770a4a75292f2b54846773c75 /contrib
parent78b8d3f136cb95b26f3b6f6c1ec96d46af6375cd (diff)
downloadsrc-test2-3063e1e56b509373d143a3a4c67d388bd390f268.tar.gz
src-test2-3063e1e56b509373d143a3a4c67d388bd390f268.zip
clang: allow -fstack-clash-protection on FreeBSD
-fstack-clash-protection was added in Clang commit e67cbac81211 but was enabled only on Linux. It should work fine on FreeBSD as well, so enable it. To be discussed and upstreamed with a test. The OS test should probably just be removed. Reviewed by: dim MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D27366
Notes
Notes: svn path=/head/; revision=368019
Diffstat (limited to 'contrib')
-rw-r--r--contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp
index af4bcf951e6c..01024ee3a16a 100644
--- a/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp
@@ -2967,7 +2967,7 @@ static void RenderSCPOptions(const ToolChain &TC, const ArgList &Args,
ArgStringList &CmdArgs) {
const llvm::Triple &EffectiveTriple = TC.getEffectiveTriple();
- if (!EffectiveTriple.isOSLinux())
+ if (!EffectiveTriple.isOSFreeBSD() && !EffectiveTriple.isOSLinux())
return;
if (!EffectiveTriple.isX86() && !EffectiveTriple.isSystemZ() &&