From 70d08010bca3770a300b136ae55599d414230e33 Mon Sep 17 00:00:00 2001
From: Thurston Dang <thurston@google.com>
Date: Sat, 25 Jan 2025 00:18:49 +0000
Subject: [PATCH] Try adding execstack to linker options too

---
 zorg/buildbot/builders/sanitizers/buildbot_qemu.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh b/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh
index 7beb9b48..2236f00d 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh
@@ -193,8 +193,10 @@ function configure_scudo_compiler_rt {
   local c_flags="-fPIC"
   if [[ "${arch}" =~ "mips*" ]]
   then
-    linker_flags="-latomic -Wl,-z,notext -Wno-unused-command-line-argument"
+    linker_flags="-latomic -Wl,-z,notext -Wno-unused-command-line-argument -Wl,-z,execstack"
     c_flags+=" -Wl,-z,execstack"
+  else
+    c_flags+="   "
   fi
   local cxx_flags="${c_flags}"