aboutsummaryrefslogtreecommitdiffstats
path: root/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch')
-rw-r--r--main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
index b8bd2e15fd..674486cbe0 100644
--- a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+++ b/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -1,13 +1,14 @@
Based on original patchset from Jakub Jirutka <jakub@jirutka.cz>
Updated by Eric Molitor <eric@molitor.org>
Updated by Natanael Copa <ncopa@alpinelinux.org>
+Updated by omni <omni+alpine@hack.org>
diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
index f8f3623..9c8c748 100644
--- a/lib/Driver/ToolChains/Linux.cpp
+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -907,6 +907,13 @@ bool Linux::isPIEDefault() const {
- getTriple().isMusl() || getSanitizerArgs().requiresPIE();
+@@ -833,6 +833,13 @@ bool Linux::isPIEDefault() const {
+ return Generic_ELF::IsMathErrnoDefault();
}
+unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
@@ -24,7 +25,7 @@ diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h
index 22dbbec..ba0d558 100644
--- a/lib/Driver/ToolChains/Linux.h
+++ b/lib/Driver/ToolChains/Linux.h
-@@ -39,6 +39,7 @@
+@@ -38,6 +38,7 @@
CXXStdlibType GetDefaultCXXStdlibType() const override;
bool isPIEDefault() const override;
bool isNoExecStackDefault() const override;
@@ -36,7 +37,7 @@ diff --git a/test/Driver/fsanitize.c b/test/Driver/fsanitize.c
index 304e759..29ead22 100644
--- a/test/Driver/fsanitize.c
+++ b/test/Driver/fsanitize.c
-@@ -585,18 +585,17 @@
+@@ -662,18 +662,17 @@
// RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
// NOSP-NOT: "-fsanitize=safe-stack"