From 1aa5bfa88ec9a7eeeff47e076242b2e9eda1d538 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 5 Nov 2016 12:22:43 +0000
Subject: [PATCH] base/asm-common.h: Include `.note.GNU-stack' section on ELF
 targets.

This will ensure that Catacomb doesn't force an executable stack on
processes using it.  Oops.
---
 base/asm-common.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/base/asm-common.h b/base/asm-common.h
index 08d4b548..946f8608 100644
--- a/base/asm-common.h
+++ b/base/asm-common.h
@@ -396,4 +396,9 @@ name:
 #  define SIZE_OBJ(name)
 #endif
 
+#if __ELF__ && defined(WANT_EXECUTABLE_STACK)
+	.pushsection .note.GNU-stack, "", _SECTTY(progbits)
+	.popsection
+#endif
+
 ///----- That's all, folks --------------------------------------------------
-- 
2.11.0