31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 8ebc91e973af382fbb0ef837400433106e3cd825 Mon Sep 17 00:00:00 2001
|
|
From: q66 <q66@chimera-linux.org>
|
|
Date: Sat, 4 Nov 2023 09:11:37 +0100
|
|
Subject: [PATCH 18/29] 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 9a9b40a25..57056ee2c 100644
|
|
--- a/clang/lib/Driver/ToolChains/Linux.cpp
|
|
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
|
|
@@ -228,12 +228,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.49.0
|
|
|