From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 22 Oct 2006 10:55:25 +0000 (+0000)
Subject: - Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that
X-Git-Tag: v2.5.1c1~307
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63a9b8b0679903ca1cfc17daf0a881c74a6ef1a0;p=thirdparty%2FPython%2Fcpython.git

- Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that
  ctypes isn't considered as requiring executable stacks.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 7313802399a2..0b7fdc376e59 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,9 @@ Core and builtins
 Extension Modules
 -----------------
 
+- Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that
+  ctypes isn't considered as requiring executable stacks.
+
 - Bug #1567666: Emulate GetFileAttributesExA for Win95.
 
 - Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode
diff --git a/Modules/_ctypes/libffi/src/x86/sysv.S b/Modules/_ctypes/libffi/src/x86/sysv.S
index 46759f434985..9542fba1a290 100644
--- a/Modules/_ctypes/libffi/src/x86/sysv.S
+++ b/Modules/_ctypes/libffi/src/x86/sysv.S
@@ -376,3 +376,7 @@ ffi_closure_raw_SYSV:
 #endif
 
 #endif /* ifndef __x86_64__ */
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif