Non-executable stack continued

The ".note.GNU-stack" section makes sense only in Linux and BSD, and is rejected by the MacOS assembler. MacOS has nonexecutable stacks by default since version 10.5 and need no special declarations.
ocaml · Sep 23, 2017 · 93b8911 · 93b8911
1 parent 96a8242
commit 93b8911
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,5 @@
+- On Linux and BSD, keep the stack non-executable.
+
 Release 1.5 (2017-05-26):
 - Install all .cmx files, improving performance of clients and
   avoiding a warning from OCaml 4.03 and up.

diff --git a/caml_z_i686.S b/caml_z_i686.S
@@ -21,8 +21,9 @@
 
 
         /* makes the stack non-executable. */
+#ifdef Z_ELF
         .section .note.GNU-stack,"",@progbits
-
+#endif
 
         /* helper functions */
         /* **************** */

diff --git a/caml_z_x86_64.S b/caml_z_x86_64.S
@@ -21,8 +21,9 @@
 
 
         /* makes the stack non-executable. */
+#ifdef Z_ELF
         .section .note.GNU-stack,"",@progbits
-
+#endif
 
         /* helper functions */
         /* **************** */