diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2018-03-08 23:05:30 +0100 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-03-10 02:17:25 +0100 |
commit | 6cca9ba40d61313fd59d34ff6138f8884a26ef51 (patch) | |
tree | c61423dc69ad7bfbf31c7a872473ac4ea016c7d8 /community/ocaml/010_all_execstacks.patch | |
parent | 500d952707ca2e8896377b44dea15cc3388ad6d5 (diff) | |
download | aports-6cca9ba40d61313fd59d34ff6138f8884a26ef51.tar.bz2 aports-6cca9ba40d61313fd59d34ff6138f8884a26ef51.tar.xz |
community/ocaml: upgrade to 4.06.0
Diffstat (limited to 'community/ocaml/010_all_execstacks.patch')
-rw-r--r-- | community/ocaml/010_all_execstacks.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/community/ocaml/010_all_execstacks.patch b/community/ocaml/010_all_execstacks.patch deleted file mode 100644 index 30cf23ec61..0000000000 --- a/community/ocaml/010_all_execstacks.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix the EXEC_STACK in ocaml compiled binaries (#153382) - -Index: ocaml-4.03.0+beta1/asmrun/sparc.S -=================================================================== ---- ocaml-4.03.0+beta1.orig/asmrun/sparc.S -+++ ocaml-4.03.0+beta1/asmrun/sparc.S -@@ -358,3 +358,8 @@ caml_system__frametable: - .type caml_raise_exception, #function - .type caml_system__frametable, #object - #endif -+ -+#ifdef __ELF__ -+.section .note.GNU-stack,"",%progbits -+#endif -+ -Index: ocaml-4.03.0+beta1/asmcomp/sparc/emit.mlp -=================================================================== ---- ocaml-4.03.0+beta1.orig/asmcomp/sparc/emit.mlp -+++ ocaml-4.03.0+beta1/asmcomp/sparc/emit.mlp -@@ -737,6 +737,12 @@ let data l = - ` .data\n`; - List.iter emit_item l - -+(* Mark stack as non executable *) -+let nx_stack() = -+ if Config.system = "linux" then -+ ` .section .note.GNU-stack,\"\",%progbits\n` -+ -+ - (* Beginning / end of an assembly file *) - - let begin_assembly() = -@@ -750,6 +756,7 @@ let begin_assembly() = - `{emit_symbol lbl_begin}:\n` - - let end_assembly() = -+ nx_stack(); - ` .text\n`; - let lbl_end = Compilenv.make_symbol (Some "code_end") in - ` .global {emit_symbol lbl_end}\n`; |