Attachment #101059 for bug #153382

Lines 334-340 Link Here

(-)ocaml-3.09.3/Makefile.old (-1 / +1 lines)
334	-e 's\|%%MODEL%%\|$(MODEL)\|' \	334	-e 's\|%%MODEL%%\|$(MODEL)\|' \
335	-e 's\|%%SYSTEM%%\|$(SYSTEM)\|' \	335	-e 's\|%%SYSTEM%%\|$(SYSTEM)\|' \
336	-e 's\|%%EXT_OBJ%%\|.o\|' \	336	-e 's\|%%EXT_OBJ%%\|.o\|' \
337	-e 's\|%%EXT_ASM%%\|.s\|' \	337	-e 's\|%%EXT_ASM%%\|.S\|' \
338	-e 's\|%%EXT_LIB%%\|.a\|' \	338	-e 's\|%%EXT_LIB%%\|.a\|' \
339	-e 's\|%%EXT_DLL%%\|.so\|' \	339	-e 's\|%%EXT_DLL%%\|.so\|' \
340	-e 's\|%%SYSTHREAD_SUPPORT%%\|$(SYSTHREAD_SUPPORT)\|' \	340	-e 's\|%%SYSTHREAD_SUPPORT%%\|$(SYSTHREAD_SUPPORT)\|' \

Lines 914-919 Link Here

(-)ocaml-3.09.3/asmcomp/i386/emit.mlp.old (+7 lines)
914	` .data\n`;	914	` .data\n`;
915	List.iter emit_item l	915	List.iter emit_item l
916		916
		917	(* Set the stack as non-executable *)
		918	let nx_stack() =
		919	`#ifdef __ELF__\n`;
		920	`.section .note.GNU-stack,\"\",%progbits\n`;
		921	`#endif\n`
		922
917	(* Beginning / end of an assembly file *)	923	(* Beginning / end of an assembly file *)
918		924
919	let begin_assembly() =	925	let begin_assembly() =
Lines 942-945 Link Here
942	` .long {emit_int (List.length !frame_descriptors)}\n`;	948	` .long {emit_int (List.length !frame_descriptors)}\n`;
943	List.iter emit_frame !frame_descriptors;	949	List.iter emit_frame !frame_descriptors;
944	frame_descriptors := [];	950	frame_descriptors := [];
		951	nx_stack();
945	if macosx then emit_external_symbols ()	952	if macosx then emit_external_symbols ()

Lines 368-370 Link Here

(-)ocaml-3.09.3/asmrun/i386.S.old (+3 lines)
368	#else	368	#else
369	.zero 64	369	.zero 64
370	#endif	370	#endif
		371	#ifdef __ELF__
		372	.section .note.GNU-stack,"",%progbits
		373	#endif

Return to bug 153382