mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-20 08:02:26 +01:00
7c6369df8c
- Fix stackprotector default patch - Use SPDX compatible format for license - Fix build by include libexecinfo-dev makedepends - Use python3
86 lines
4.6 KiB
Diff
86 lines
4.6 KiB
Diff
Based on original patchset from Jakub Jirutka <jakub@jirutka.cz>
|
|
Updated by Eric Molitor <eric@molitor.org>
|
|
Updated by Natanael Copa <ncopa@alpinelinux.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();
|
|
}
|
|
|
|
+unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
|
|
+ StringRef VendorName = Linux::getTriple().getVendorName();
|
|
+ if (VendorName.compare("alpine") == 0)
|
|
+ return 2;
|
|
+ return Generic_ELF::GetDefaultStackProtectorLevel(KernelOrKext);
|
|
+}
|
|
+
|
|
SanitizerMask Linux::getSupportedSanitizers() const {
|
|
const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;
|
|
const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;
|
|
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
|
|
@@ -38,6 +38,7 @@ public:
|
|
void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs,
|
|
llvm::opt::ArgStringList &CC1Args) const override;
|
|
bool isPIEDefault() const override;
|
|
+ unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override;
|
|
SanitizerMask getSupportedSanitizers() const override;
|
|
void addProfileRTLibs(const llvm::opt::ArgList &Args,
|
|
llvm::opt::ArgStringList &CmdArgs) const override;
|
|
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 @@
|
|
// RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
|
|
// NOSP-NOT: "-fsanitize=safe-stack"
|
|
|
|
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
|
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
|
// RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
|
|
// RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
|
// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
|
-// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
|
-// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
|
+// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
|
+// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
|
// RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
|
// NO-SP-NOT: stack-protector
|
|
// NO-SP: "-fsanitize=safe-stack"
|
|
// SP-ASAN: error: invalid argument '-fsanitize=safe-stack' not allowed with '-fsanitize=address'
|
|
// SP: "-fsanitize=safe-stack"
|
|
-// SP: -stack-protector
|
|
// NO-SP-NOT: stack-protector
|
|
|
|
// RUN: %clang -target powerpc64-unknown-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s -check-prefix=CHECK-SANM
|
|
diff --git a/test/Driver/stack-protector.c b/test/Driver/stack-protector.c
|
|
index a3e40b5..60ec2a8 100644
|
|
--- a/test/Driver/stack-protector.c
|
|
+++ b/test/Driver/stack-protector.c
|
|
@@ -24,6 +24,20 @@
|
|
// SSP-ALL: "-stack-protector" "3"
|
|
// SSP-ALL-NOT: "-stack-protector-buffer-size"
|
|
|
|
+// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
|
|
+// ALPINE: "-stack-protector" "2"
|
|
+
|
|
+// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS
|
|
+// ALPINE_SPS: "-stack-protector" "2"
|
|
+
|
|
+// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL
|
|
+// ALPINE_ALL: "-stack-protector" "3"
|
|
+// ALPINE_ALL-NOT: "-stack-protector-buffer-size"
|
|
+
|
|
+// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP
|
|
+// ALPINE_NOSSP-NOT: "-stack-protector"
|
|
+// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size"
|
|
+
|
|
// RUN: %clang -target x86_64-scei-ps4 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4
|
|
// RUN: %clang -target x86_64-scei-ps4 -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4
|
|
// SSP-PS4: "-stack-protector" "2"
|