- Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that

  ctypes isn't considered as requiring executable stacks.
Will backport to 2.5.

diff --git a/Misc/NEWS b/Misc/NEWS
index e311bad80cb36d0888d26689854e27b4fbf2282e..f78ddb03056d3038548cb33c5e872cc936021a6a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,9 @@ Core and builtins
 Library
 -------
 
+- Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that
+  ctypes isn't considered as requiring executable stacks.
+
 - ctypes callback functions only support 'fundamental' data types as
   result type.  Raise an error when something else is used.  This is a
   partial fix for Bug #1574584.

diff --git a/Modules/_ctypes/libffi/src/x86/sysv.S b/Modules/_ctypes/libffi/src/x86/sysv.S
index 46759f43498583642745ecb0dd34c71e3a968264..9542fba1a2908369cd2114b1d203ac42509aea4b 100644 (file)
--- 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