summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/_ctypes/libffi/src/x86/sysv.S4
2 files changed, 7 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 7313802399..0b7fdc376e 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 46759f4349..9542fba1a2 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