API tools faq
paste
Guest User

Untitled

a guest
Feb 16th, 2019
89
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 10.97 KB | None | 0 0
raw download clone embed print report
  1. Index: asmcomp/alpha/emit.mlp
  2. ===================================================================
  3. RCS file: /caml/ocaml/asmcomp/alpha/emit.mlp,v
  4. retrieving revision 1.42
  5. diff -u -r1.42 emit.mlp
  6. --- asmcomp/alpha/emit.mlp 16 Apr 2006 23:28:14 -0000 1.42
  7. +++ asmcomp/alpha/emit.mlp 9 Jun 2008 20:51:19 -0000
  8. @@ -858,4 +858,6 @@
  9. `{emit_symbol lbl_frame}:\n`;
  10. ` .quad {emit_int (List.length !frame_descriptors)}\n`;
  11. List.iter emit_frame !frame_descriptors;
  12. - frame_descriptors := []
  13. + frame_descriptors := [];
  14. + (* Mark stack as non-executable for GNU tools. *)
  15. + ` .section .note.GNU-stack,\"\",%progbits; .previous\n`
  16. Index: asmcomp/amd64/emit.mlp
  17. ===================================================================
  18. RCS file: /caml/ocaml/asmcomp/amd64/emit.mlp,v
  19. retrieving revision 1.15
  20. diff -u -r1.15 emit.mlp
  21. --- asmcomp/amd64/emit.mlp 11 Jan 2008 16:13:11 -0000 1.15
  22. +++ asmcomp/amd64/emit.mlp 9 Jun 2008 20:51:20 -0000
  23. @@ -752,4 +752,6 @@
  24. efa_label_rel = (fun lbl ofs ->
  25. ` .long ({emit_label lbl} - .) + {emit_int32 ofs}\n`);
  26. efa_def_label = (fun l -> `{emit_label l}:\n`);
  27. - efa_string = (fun s -> emit_string_directive " .asciz " s) }
  28. + efa_string = (fun s -> emit_string_directive " .asciz " s) };
  29. + (* Mark stack as non-executable for GNU tools. *)
  30. + ` .section .note.GNU-stack,\"\",%progbits; .previous\n`
  31. Index: asmcomp/arm/emit.mlp
  32. ===================================================================
  33. RCS file: /caml/ocaml/asmcomp/arm/emit.mlp,v
  34. retrieving revision 1.19
  35. diff -u -r1.19 emit.mlp
  36. --- asmcomp/arm/emit.mlp 11 Jan 2008 16:13:11 -0000 1.19
  37. +++ asmcomp/arm/emit.mlp 9 Jun 2008 20:51:21 -0000
  38. @@ -673,4 +673,6 @@
  39. `{emit_symbol lbl}:\n`;
  40. ` .word {emit_int (List.length !frame_descriptors)}\n`;
  41. List.iter emit_frame !frame_descriptors;
  42. - frame_descriptors := []
  43. + frame_descriptors := [];
  44. + (* Mark stack as non-executable for GNU tools. *)
  45. + ` .section .note.GNU-stack,\"\",%progbits; .previous\n`
  46. Index: asmcomp/hppa/emit.mlp
  47. ===================================================================
  48. RCS file: /caml/ocaml/asmcomp/hppa/emit.mlp,v
  49. retrieving revision 1.20
  50. diff -u -r1.20 emit.mlp
  51. --- asmcomp/hppa/emit.mlp 16 Apr 2006 23:28:14 -0000 1.20
  52. +++ asmcomp/hppa/emit.mlp 9 Jun 2008 20:51:21 -0000
  53. @@ -1037,4 +1037,6 @@
  54. ` .long {emit_int (List.length !frame_descriptors)}\n`;
  55. List.iter emit_frame !frame_descriptors;
  56. frame_descriptors := [];
  57. - emit_imports()
  58. + emit_imports();
  59. + (* Mark stack as non-executable for GNU tools. *)
  60. + ` .section .note.GNU-stack,\"\",%progbits; .previous\n`
  61. Index: asmcomp/i386/emit.mlp
  62. ===================================================================
  63. RCS file: /caml/ocaml/asmcomp/i386/emit.mlp,v
  64. retrieving revision 1.40
  65. diff -u -r1.40 emit.mlp
  66. --- asmcomp/i386/emit.mlp 11 Jan 2008 16:13:11 -0000 1.40
  67. +++ asmcomp/i386/emit.mlp 9 Jun 2008 20:51:22 -0000
  68. @@ -987,3 +987,6 @@
  69. then emit_string_directive " .ascii " s
  70. else emit_bytes_directive " .byte " s) };
  71. if macosx then emit_external_symbols ()
  72. + else
  73. + (* Mark stack as non-executable for GNU tools. *)
  74. + ` .section .note.GNU-stack,\"\",%progbits; .previous\n`
  75. Index: asmcomp/ia64/emit.mlp
  76. ===================================================================
  77. RCS file: /caml/ocaml/asmcomp/ia64/emit.mlp,v
  78. retrieving revision 1.17
  79. diff -u -r1.17 emit.mlp
  80. --- asmcomp/ia64/emit.mlp 13 Jul 2004 12:18:53 -0000 1.17
  81. +++ asmcomp/ia64/emit.mlp 9 Jun 2008 20:51:23 -0000
  82. @@ -1324,4 +1324,6 @@
  83. emit_define_symbol (Compilenv.make_symbol (Some "frametable"));
  84. ` data8 {emit_int (List.length !frame_descriptors)}\n`;
  85. List.iter emit_frame !frame_descriptors;
  86. - frame_descriptors := []
  87. + frame_descriptors := [];
  88. + (* Mark stack as non-executable for GNU tools. *)
  89. + ` .section .note.GNU-stack,\"\",%progbits; .previous\n`
  90. Index: asmcomp/mips/emit.mlp
  91. ===================================================================
  92. RCS file: /caml/ocaml/asmcomp/mips/emit.mlp,v
  93. retrieving revision 1.18
  94. diff -u -r1.18 emit.mlp
  95. --- asmcomp/mips/emit.mlp 5 Jan 2004 20:25:56 -0000 1.18
  96. +++ asmcomp/mips/emit.mlp 9 Jun 2008 20:51:24 -0000
  97. @@ -591,4 +591,6 @@
  98. `{emit_symbol lbl}:\n`;
  99. ` .word {emit_int (List.length !frame_descriptors)}\n`;
  100. List.iter emit_frame !frame_descriptors;
  101. - frame_descriptors := []
  102. + frame_descriptors := [];
  103. + (* Mark stack as non-executable for GNU tools. *)
  104. + ` .section .note.GNU-stack,\"\",%progbits; .previous\n`
  105. Index: asmcomp/power/emit.mlp
  106. ===================================================================
  107. RCS file: /caml/ocaml/asmcomp/power/emit.mlp,v
  108. retrieving revision 1.26
  109. diff -u -r1.26 emit.mlp
  110. --- asmcomp/power/emit.mlp 9 Nov 2007 15:06:57 -0000 1.26
  111. +++ asmcomp/power/emit.mlp 9 Jun 2008 20:51:24 -0000
  112. @@ -961,4 +961,6 @@
  113. ` .long ({emit_label lbl} - .) + {emit_int32 ofs}\n`);
  114. efa_def_label = (fun l -> `{emit_label l}:\n`);
  115. efa_string = (fun s -> emit_bytes_directive " .byte " (s ^ "\000"))
  116. - }
  117. + };
  118. + (* Mark stack as non-executable for GNU tools. *)
  119. + ` .section .note.GNU-stack,\"\",%progbits; .previous\n`
  120. Index: asmcomp/sparc/emit.mlp
  121. ===================================================================
  122. RCS file: /caml/ocaml/asmcomp/sparc/emit.mlp,v
  123. retrieving revision 1.24
  124. diff -u -r1.24 emit.mlp
  125. --- asmcomp/sparc/emit.mlp 16 Apr 2006 23:28:15 -0000 1.24
  126. +++ asmcomp/sparc/emit.mlp 9 Jun 2008 20:51:25 -0000
  127. @@ -772,4 +772,6 @@
  128. ` .word {emit_int (List.length !frame_descriptors)}\n`;
  129. List.iter emit_frame !frame_descriptors;
  130. emit_size lbl;
  131. - frame_descriptors := []
  132. + frame_descriptors := [];
  133. + (* Mark stack as non-executable for GNU tools. *)
  134. + ` .section .note.GNU-stack,\"\",%progbits; .previous\n`
  135. Index: asmrun/alpha.S
  136. ===================================================================
  137. RCS file: /caml/ocaml/asmrun/alpha.S,v
  138. retrieving revision 1.29
  139. diff -u -r1.29 alpha.S
  140. --- asmrun/alpha.S 3 Jan 2004 12:51:18 -0000 1.29
  141. +++ asmrun/alpha.S 9 Jun 2008 20:51:25 -0000
  142. @@ -438,3 +438,7 @@
  143. .word -1 /* negative frame size => use callback link */
  144. .word 0 /* no roots here */
  145. .align 3
  146. +
  147. +#if defined(__ELF__)
  148. + .section .note.GNU-stack,"",%progbits
  149. +#endif
  150. Index: asmrun/amd64.S
  151. ===================================================================
  152. RCS file: /caml/ocaml/asmrun/amd64.S,v
  153. retrieving revision 1.11
  154. diff -u -r1.11 amd64.S
  155. --- asmrun/amd64.S 29 Jan 2007 12:10:52 -0000 1.11
  156. +++ asmrun/amd64.S 9 Jun 2008 20:51:25 -0000
  157. @@ -366,3 +366,7 @@
  158. .align 16
  159. caml_absf_mask:
  160. .quad 0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF
  161. +
  162. +#if defined(__ELF__)
  163. + .section .note.GNU-stack,"",%progbits
  164. +#endif
  165. Index: asmrun/arm.S
  166. ===================================================================
  167. RCS file: /caml/ocaml/asmrun/arm.S,v
  168. retrieving revision 1.16
  169. diff -u -r1.16 arm.S
  170. --- asmrun/arm.S 29 Feb 2008 14:21:21 -0000 1.16
  171. +++ asmrun/arm.S 9 Jun 2008 20:51:26 -0000
  172. @@ -342,3 +342,7 @@
  173. .short -1 /* negative frame size => use callback link */
  174. .short 0 /* no roots */
  175. .align 2
  176. +
  177. +#if defined(__ELF__)
  178. + .section .note.GNU-stack,"",%progbits
  179. +#endif
  180. Index: asmrun/hppa.S
  181. ===================================================================
  182. RCS file: /caml/ocaml/asmrun/hppa.S,v
  183. retrieving revision 1.26
  184. diff -u -r1.26 hppa.S
  185. --- asmrun/hppa.S 16 Apr 2006 23:28:15 -0000 1.26
  186. +++ asmrun/hppa.S 9 Jun 2008 20:51:26 -0000
  187. @@ -532,3 +532,7 @@
  188. .long L104 + 3 /* return address into callback */
  189. .short -1 /* negative frame size => use callback link */
  190. .short 0 /* no roots */
  191. +
  192. +#if defined(__ELF__)
  193. + .section .note.GNU-stack,"",%progbits
  194. +#endif
  195. Index: asmrun/i386.S
  196. ===================================================================
  197. RCS file: /caml/ocaml/asmrun/i386.S,v
  198. retrieving revision 1.49
  199. diff -u -r1.49 i386.S
  200. --- asmrun/i386.S 11 Jan 2008 16:13:11 -0000 1.49
  201. +++ asmrun/i386.S 9 Jun 2008 20:51:26 -0000
  202. @@ -424,3 +424,7 @@
  203. hlt ; hlt ; hlt ; hlt ; hlt
  204. .subsections_via_symbols
  205. #endif
  206. +
  207. +#if defined(__ELF__)
  208. + .section .note.GNU-stack,"",%progbits
  209. +#endif
  210. Index: asmrun/ia64.S
  211. ===================================================================
  212. RCS file: /caml/ocaml/asmrun/ia64.S,v
  213. retrieving revision 1.13
  214. diff -u -r1.13 ia64.S
  215. --- asmrun/ia64.S 3 Jan 2004 12:51:19 -0000 1.13
  216. +++ asmrun/ia64.S 9 Jun 2008 20:51:27 -0000
  217. @@ -528,3 +528,7 @@
  218.  
  219. .common caml_saved_bsp#, 8, 8
  220. .common caml_saved_rnat#, 8, 8
  221. +
  222. +#if defined(__ELF__)
  223. + .section .note.GNU-stack,"",%progbits
  224. +#endif
  225. Index: asmrun/m68k.S
  226. ===================================================================
  227. RCS file: /caml/ocaml/asmrun/m68k.S,v
  228. retrieving revision 1.15
  229. diff -u -r1.15 m68k.S
  230. --- asmrun/m68k.S 3 Jan 2004 12:51:19 -0000 1.15
  231. +++ asmrun/m68k.S 9 Jun 2008 20:51:27 -0000
  232. @@ -242,3 +242,7 @@
  233. .long L107 | return address into callback
  234. .word -1 | negative frame size => use callback link
  235. .word 0 | no roots here
  236. +
  237. +#if defined(__ELF__)
  238. + .section .note.GNU-stack,"",%progbits
  239. +#endif
  240. Index: asmrun/power-aix.S
  241. ===================================================================
  242. RCS file: /caml/ocaml/asmrun/power-aix.S,v
  243. retrieving revision 1.15
  244. diff -u -r1.15 power-aix.S
  245. --- asmrun/power-aix.S 3 Jan 2004 12:51:19 -0000 1.15
  246. +++ asmrun/power-aix.S 9 Jun 2008 20:51:27 -0000
  247. @@ -511,3 +511,7 @@
  248. .csect caml_callback3_exn[DS]
  249. caml_callback3_exn:
  250. .long .caml_callback3_exn, TOC[tc0], 0
  251. +
  252. +#if defined(__ELF__)
  253. + .section .note.GNU-stack,"",%progbits
  254. +#endif
  255. Index: asmrun/power-elf.S
  256. ===================================================================
  257. RCS file: /caml/ocaml/asmrun/power-elf.S,v
  258. retrieving revision 1.18
  259. diff -u -r1.18 power-elf.S
  260. --- asmrun/power-elf.S 3 Jan 2004 12:51:19 -0000 1.18
  261. +++ asmrun/power-elf.S 9 Jun 2008 20:51:28 -0000
  262. @@ -419,3 +419,6 @@
  263. .short -1 /* negative size count => use callback link */
  264. .short 0 /* no roots here */
  265.  
  266. +#if defined(__ELF__)
  267. + .section .note.GNU-stack,"",%progbits
  268. +#endif
  269. Index: asmrun/power-rhapsody.S
  270. ===================================================================
  271. RCS file: /caml/ocaml/asmrun/power-rhapsody.S,v
  272. retrieving revision 1.15
  273. diff -u -r1.15 power-rhapsody.S
  274. --- asmrun/power-rhapsody.S 29 Jan 2007 12:10:52 -0000 1.15
  275. +++ asmrun/power-rhapsody.S 9 Jun 2008 20:51:28 -0000
  276. @@ -472,3 +472,7 @@
  277. .short -1 /* negative size count => use callback link */
  278. .short 0 /* no roots here */
  279. .align X(2,3)
  280. +
  281. +#if defined(__ELF__)
  282. + .section .note.GNU-stack,"",%progbits
  283. +#endif
  284. Index: asmrun/sparc.S
  285. ===================================================================
  286. RCS file: /caml/ocaml/asmrun/sparc.S,v
  287. retrieving revision 1.26
  288. diff -u -r1.26 sparc.S
  289. --- asmrun/sparc.S 6 Oct 2004 06:33:25 -0000 1.26
  290. +++ asmrun/sparc.S 9 Jun 2008 20:51:28 -0000
  291. @@ -405,3 +405,7 @@
  292. .type Caml_raise_exception, #function
  293. .type Caml_system__frametable, #object
  294. #endif
  295. +
  296. +#if defined(__ELF__)
  297. + .section .note.GNU-stack,"",%progbits
  298. +#endif
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!