summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-10-22 10:55:15 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2006-10-22 10:55:15 (GMT)
commit1b2f627f96cdabcb4414b4785fcaf8bc309b941b (patch)
tree98890a17ed16f5e1f43a0ebc67d043b09f1e79c0
parent98f0d14bd9f0614e799a17aa44070e7b3b13402c (diff)
downloadcpython-1b2f627f96cdabcb4414b4785fcaf8bc309b941b.zip
cpython-1b2f627f96cdabcb4414b4785fcaf8bc309b941b.tar.gz
cpython-1b2f627f96cdabcb4414b4785fcaf8bc309b941b.tar.bz2
- 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.
-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 e311bad..f78ddb0 100644
--- 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 46759f4..9542fba 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