32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
|
From 57e4d9ed0d83f2cd128699ccc693ec09854faf65 Mon Sep 17 00:00:00 2001
|
||
|
|
From: q66 <q66@chimera-linux.org>
|
||
|
|
Date: Sat, 4 Nov 2023 09:11:37 +0100
|
||
|
|
Subject: [PATCH 3/6] clang: switch on default now/relro
|
||
|
|
|
||
|
|
---
|
||
|
|
clang/lib/Driver/ToolChains/Linux.cpp | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
|
||
|
|
index 0b236de75..abf0de8af 100644
|
||
|
|
--- a/clang/lib/Driver/ToolChains/Linux.cpp
|
||
|
|
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
|
||
|
|
@@ -222,12 +222,12 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||
|
|
|
||
|
|
Distro Distro(D.getVFS(), Triple);
|
||
|
|
|
||
|
|
- if (Distro.IsAlpineLinux() || Triple.isAndroid()) {
|
||
|
|
+ if (Triple.isMusl() || Triple.isAndroid()) {
|
||
|
|
ExtraOpts.push_back("-z");
|
||
|
|
ExtraOpts.push_back("now");
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() ||
|
||
|
|
+ if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Triple.isMusl() ||
|
||
|
|
Triple.isAndroid()) {
|
||
|
|
ExtraOpts.push_back("-z");
|
||
|
|
ExtraOpts.push_back("relro");
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|