mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-12-08 23:03:46 +00:00
73 lines
3.7 KiB
Diff
73 lines
3.7 KiB
Diff
|
From 5346dc41bee9546db1fc649f39f1c44629495cc5 Mon Sep 17 00:00:00 2001
|
||
|
From: Evangelos Foutras <evangelos@foutras.com>
|
||
|
Date: Fri, 18 Aug 2023 13:31:57 +0000
|
||
|
Subject: [PATCH] Enable -fstack-protector-strong by default
|
||
|
|
||
|
---
|
||
|
clang/lib/Driver/ToolChains/Linux.h | 5 +++++
|
||
|
clang/test/Driver/fsanitize.c | 6 +++---
|
||
|
clang/test/Driver/stack-protector.c | 4 ++--
|
||
|
3 files changed, 10 insertions(+), 5 deletions(-)
|
||
|
|
||
|
diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
|
||
|
index 524391743090..0d4e1944118b 100644
|
||
|
--- a/clang/lib/Driver/ToolChains/Linux.h
|
||
|
+++ b/clang/lib/Driver/ToolChains/Linux.h
|
||
|
@@ -10,6 +10,7 @@
|
||
|
#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_LINUX_H
|
||
|
|
||
|
#include "Gnu.h"
|
||
|
+#include "clang/Basic/LangOptions.h"
|
||
|
#include "clang/Driver/ToolChain.h"
|
||
|
|
||
|
namespace clang {
|
||
|
@@ -48,6 +49,10 @@ public:
|
||
|
IsAArch64OutlineAtomicsDefault(const llvm::opt::ArgList &Args) const override;
|
||
|
bool isPIEDefault(const llvm::opt::ArgList &Args) const override;
|
||
|
bool IsMathErrnoDefault() const override;
|
||
|
+ LangOptions::StackProtectorMode
|
||
|
+ GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
|
||
|
+ return LangOptions::SSPStrong;
|
||
|
+ }
|
||
|
SanitizerMask getSupportedSanitizers() const override;
|
||
|
void addProfileRTLibs(const llvm::opt::ArgList &Args,
|
||
|
llvm::opt::ArgStringList &CmdArgs) const override;
|
||
|
diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
|
||
|
index 8ad6dc25b4d1..1619b59a40f0 100644
|
||
|
--- a/clang/test/Driver/fsanitize.c
|
||
|
+++ b/clang/test/Driver/fsanitize.c
|
||
|
@@ -695,12 +695,12 @@
|
||
|
// 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"
|
||
|
diff --git a/clang/test/Driver/stack-protector.c b/clang/test/Driver/stack-protector.c
|
||
|
index 169376919a71..2470b7f7e39e 100644
|
||
|
--- a/clang/test/Driver/stack-protector.c
|
||
|
+++ b/clang/test/Driver/stack-protector.c
|
||
|
@@ -3,11 +3,11 @@
|
||
|
// NOSSP-NOT: "-stack-protector-buffer-size"
|
||
|
|
||
|
// RUN: %clang -target i386-unknown-linux -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP
|
||
|
-// SSP: "-stack-protector" "1"
|
||
|
+// SSP: "-stack-protector" "2"
|
||
|
// SSP-NOT: "-stack-protector-buffer-size"
|
||
|
|
||
|
// RUN: %clang -target i386-unknown-linux -fstack-protector --param ssp-buffer-size=16 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-BUF
|
||
|
-// SSP-BUF: "-stack-protector" "1"
|
||
|
+// SSP-BUF: "-stack-protector" "2"
|
||
|
// SSP-BUF: "-stack-protector-buffer-size" "16"
|
||
|
|
||
|
// RUN: %clang -target i386-pc-openbsd -### %s 2>&1 | FileCheck %s -check-prefix=OPENBSD
|