Attachment #101063 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 438-440 Link Here

(-)ocaml-3.09.3/asmrun/alpha.S.old (+4 lines)
438	.word -1 /* negative frame size => use callback link */	438	.word -1 /* negative frame size => use callback link */
439	.word 0 /* no roots here */	439	.word 0 /* no roots here */
440	.align 3	440	.align 3
		441	#ifdef __ELF__
		442	.section .note.GNU-stack,,%progbits
		443	#endif
		444

Lines 334-336 Link Here

(-)ocaml-3.09.3/asmrun/amd64.S.old (+4 lines)
334	.align 16	334	.align 16
335	caml_absf_mask:	335	caml_absf_mask:
336	.quad 0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF	336	.quad 0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF
		337	#ifdef __ELF__
		338	.section .note.GNU-stack,,%progbits
		339	#endif
		340

Lines 337-339 Link Here

(-)ocaml-3.09.3/asmrun/arm.S.old (+4 lines)
337	.short -1 /* negative frame size => use callback link */	337	.short -1 /* negative frame size => use callback link */
338	.short 0 /* no roots */	338	.short 0 /* no roots */
339	.align 2	339	.align 2
		340	#ifdef __ELF__
		341	.section .note.GNU-stack,,%progbits
		342	#endif
		343

Lines 532-534 Link Here

(-)ocaml-3.09.3/asmrun/hppa.S.old (+4 lines)
532	.long L104 + 3 /* return address into callback */	532	.long L104 + 3 /* return address into callback */
533	.short -1 /* negative frame size => use callback link */	533	.short -1 /* negative frame size => use callback link */
534	.short 0 /* no roots */	534	.short 0 /* no roots */
		535	#ifdef __ELF__
		536	.section .note.GNU-stack,,%progbits
		537	#endif
		538

Lines 371-373 Link Here

(-)ocaml-3.09.3/asmrun/i386.S.old (+4 lines)
371	#ifdef __ELF__	371	#ifdef __ELF__
372	.section .note.GNU-stack,"",%progbits	372	.section .note.GNU-stack,"",%progbits
373	#endif	373	#endif
		374	#ifdef __ELF__
		375	.section .note.GNU-stack,,%progbits
		376	#endif
		377

Lines 528-530 Link Here

(-)ocaml-3.09.3/asmrun/ia64.S.old (+4 lines)
528		528
529	.common caml_saved_bsp#, 8, 8	529	.common caml_saved_bsp#, 8, 8
530	.common caml_saved_rnat#, 8, 8	530	.common caml_saved_rnat#, 8, 8
		531	#ifdef __ELF__
		532	.section .note.GNU-stack,,%progbits
		533	#endif
		534

Lines 242-244 Link Here

(-)ocaml-3.09.3/asmrun/m68k.S.old (+4 lines)
242	.long L107 \| return address into callback	242	.long L107 \| return address into callback
243	.word -1 \| negative frame size => use callback link	243	.word -1 \| negative frame size => use callback link
244	.word 0 \| no roots here	244	.word 0 \| no roots here
		245	#ifdef __ELF__
		246	.section .note.GNU-stack,,%progbits
		247	#endif
		248

Lines 511-513 Link Here

(-)ocaml-3.09.3/asmrun/power-aix.S.old (+4 lines)
511	.csect caml_callback3_exn[DS]	511	.csect caml_callback3_exn[DS]
512	caml_callback3_exn:	512	caml_callback3_exn:
513	.long .caml_callback3_exn, TOC[tc0], 0	513	.long .caml_callback3_exn, TOC[tc0], 0
		514	#ifdef __ELF__
		515	.section .note.GNU-stack,,%progbits
		516	#endif
		517

Lines 419-421 Link Here

(-)ocaml-3.09.3/asmrun/power-elf.S.old (+4 lines)
419	.short -1 /* negative size count => use callback link */	419	.short -1 /* negative size count => use callback link */
420	.short 0 /* no roots here */	420	.short 0 /* no roots here */
421		421
		422	#ifdef __ELF__
		423	.section .note.GNU-stack,,%progbits
		424	#endif
		425

Lines 414-416 Link Here

(-)ocaml-3.09.3/asmrun/power-rhapsody.S.old (+4 lines)
414	.short -1 /* negative size count => use callback link */	414	.short -1 /* negative size count => use callback link */
415	.short 0 /* no roots here */	415	.short 0 /* no roots here */
416		416
		417	#ifdef __ELF__
		418	.section .note.GNU-stack,,%progbits
		419	#endif
		420

Lines 405-407 Link Here

(-)ocaml-3.09.3/asmrun/sparc.S.old (+4 lines)
405	.type Caml_raise_exception, #function	405	.type Caml_raise_exception, #function
406	.type Caml_system__frametable, #object	406	.type Caml_system__frametable, #object
407	#endif	407	#endif
		408	#ifdef __ELF__
		409	.section .note.GNU-stack,,%progbits
		410	#endif
		411

Lines 642-647 Link Here

(-)ocaml-3.09.3/asmcomp/arm/emit.mlp.old (+7 lines)
642	` .data\n`;	642	` .data\n`;
643	List.iter emit_item l	643	List.iter emit_item l
644		644
		645	(* Set the stack as non-executable *)
		646	let nx_stack() =
		647	`#ifdef __ELF__\n`;
		648	`.section .note.GNU-stack,\"\",%progbits\n`;
		649	`#endif\n`
		650
645	(* Beginning / end of an assembly file *)	651	(* Beginning / end of an assembly file *)
646		652
647	let begin_assembly() =	653	let begin_assembly() =
Lines 661-666 Link Here
661	`{emit_symbol lbl_begin}:\n`	667	`{emit_symbol lbl_begin}:\n`
662		668
663	let end_assembly () =	669	let end_assembly () =
		670	nx_stack();
664	let lbl_end = Compilenv.make_symbol (Some "code_end") in	671	let lbl_end = Compilenv.make_symbol (Some "code_end") in
665	` .text\n`;	672	` .text\n`;
666	` .global {emit_symbol lbl_end}\n`;	673	` .global {emit_symbol lbl_end}\n`;

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 927-932 Link Here
927	`{emit_symbol lbl_begin}:\n`	933	`{emit_symbol lbl_begin}:\n`
928		934
929	let end_assembly() =	935	let end_assembly() =
		936	nx_stack();
930	let lbl_end = Compilenv.make_symbol (Some "code_end") in	937	let lbl_end = Compilenv.make_symbol (Some "code_end") in
931	` .text\n`;	938	` .text\n`;
932	` .globl {emit_symbol lbl_end}\n`;	939	` .globl {emit_symbol lbl_end}\n`;

Lines 1306-1311 Link Here

(-)ocaml-3.09.3/asmcomp/ia64/emit.mlp.old (+7 lines)
1306	` .align 8\n`;	1306	` .align 8\n`;
1307	List.iter emit_item l	1307	List.iter emit_item l
1308		1308
		1309	(* Set the stack as non-executable *)
		1310	let nx_stack() =
		1311	`#ifdef __ELF__\n`;
		1312	`.section .note.GNU-stack,\"\",%progbits\n`;
		1313	`#endif\n`
		1314
1309	(* Beginning / end of an assembly file *)	1315	(* Beginning / end of an assembly file *)
1310		1316
1311	let begin_assembly() =	1317	let begin_assembly() =
Lines 1315-1320 Link Here
1315	emit_define_symbol (Compilenv.make_symbol (Some "code_begin"))	1321	emit_define_symbol (Compilenv.make_symbol (Some "code_begin"))
1316		1322
1317	let end_assembly () =	1323	let end_assembly () =
		1324	nx_stack();
1318	` .data\n`;	1325	` .data\n`;
1319	emit_define_symbol (Compilenv.make_symbol (Some "data_end"));	1326	emit_define_symbol (Compilenv.make_symbol (Some "data_end"));
1320	` .text\n`;	1327	` .text\n`;

Lines 994-999 Link Here

(-)ocaml-3.09.3/asmcomp/hppa/emit.mlp.old (+7 lines)
994	` .data\n`;	994	` .data\n`;
995	List.iter emit_item l	995	List.iter emit_item l
996		996
		997	(* Set the stack as non-executable *)
		998	let nx_stack() =
		999	`#ifdef __ELF__\n`;
		1000	`.section .note.GNU-stack,\"\",%progbits\n`;
		1001	`#endif\n`
		1002
997	(* Beginning / end of an assembly file *)	1003	(* Beginning / end of an assembly file *)
998		1004
999	let begin_assembly() =	1005	let begin_assembly() =
Lines 1022-1027 Link Here
1022		1028
1023		1029
1024	let end_assembly() =	1030	let end_assembly() =
		1031	nx_stack();
1025	` .code\n`;	1032	` .code\n`;
1026	let lbl_end = Compilenv.make_symbol (Some "code_end") in	1033	let lbl_end = Compilenv.make_symbol (Some "code_end") in
1027	declare_global lbl_end;	1034	declare_global lbl_end;

Lines 546-551 Link Here

(-)ocaml-3.09.3/asmcomp/mips/emit.mlp.old (+7 lines)
546	` .data\n`;	546	` .data\n`;
547	List.iter emit_item l	547	List.iter emit_item l
548		548
		549	(* Set the stack as non-executable *)
		550	let nx_stack() =
		551	`#ifdef __ELF__\n`;
		552	`.section .note.GNU-stack,\"\",%progbits\n`;
		553	`#endif\n`
		554
549	(* Beginning / end of an assembly file *)	555	(* Beginning / end of an assembly file *)
550		556
551	let begin_assembly() =	557	let begin_assembly() =
Lines 574-579 Link Here
574	` .end {emit_symbol lbl_begin}\n`	580	` .end {emit_symbol lbl_begin}\n`
575		581
576	let end_assembly () =	582	let end_assembly () =
		583	nx_stack();
577	let lbl_end = Compilenv.make_symbol (Some "code_end") in	584	let lbl_end = Compilenv.make_symbol (Some "code_end") in
578	` .text\n`;	585	` .text\n`;
579	` .globl {emit_symbol lbl_end}\n`;	586	` .globl {emit_symbol lbl_end}\n`;

Lines 658-663 Link Here

(-)ocaml-3.09.3/asmcomp/amd64/emit.mlp.old (+8 lines)
658	` .data\n`;	658	` .data\n`;
659	List.iter emit_item l	659	List.iter emit_item l
660		660
		661
		662	(* Set the stack as non-executable *)
		663	let nx_stack() =
		664	`#ifdef __ELF__\n`;
		665	`.section .note.GNU-stack,\"\",%progbits\n`;
		666	`#endif\n`
		667
661	(* Beginning / end of an assembly file *)	668	(* Beginning / end of an assembly file *)
662		669
663	let begin_assembly() =	670	let begin_assembly() =
Lines 671-676 Link Here
671	`{emit_symbol lbl_begin}:\n`	678	`{emit_symbol lbl_begin}:\n`
672		679
673	let end_assembly() =	680	let end_assembly() =
		681	nx_stack();
674	let lbl_end = Compilenv.make_symbol (Some "code_end") in	682	let lbl_end = Compilenv.make_symbol (Some "code_end") in
675	` .text\n`;	683	` .text\n`;
676	` .globl {emit_symbol lbl_end}\n`;	684	` .globl {emit_symbol lbl_end}\n`;

Lines 811-816 Link Here

(-)ocaml-3.09.3/asmcomp/alpha/emit.mlp.old (+8 lines)
811	` .data\n`;	811	` .data\n`;
812	List.iter emit_item l	812	List.iter emit_item l
813		813
		814
		815	(* Set the stack as non-executable *)
		816	let nx_stack() =
		817	`#ifdef __ELF__\n`;
		818	`.section .note.GNU-stack,\"\",%progbits\n`;
		819	`#endif\n`
		820
814	(* Beginning / end of an assembly file *)	821	(* Beginning / end of an assembly file *)
815		822
816	let begin_assembly() =	823	let begin_assembly() =
Lines 843-848 Link Here
843	`{emit_symbol lbl_begin}:\n`	850	`{emit_symbol lbl_begin}:\n`
844		851
845	let end_assembly () =	852	let end_assembly () =
		853	nx_stack();
846	let lbl_end = Compilenv.make_symbol (Some "code_end") in	854	let lbl_end = Compilenv.make_symbol (Some "code_end") in
847	` .text\n`;	855	` .text\n`;
848	` .globl {emit_symbol lbl_end}\n`;	856	` .globl {emit_symbol lbl_end}\n`;

Lines 879-884 Link Here

(-)ocaml-3.09.3/asmcomp/power/emit.mlp.old (+7 lines)
879	emit_string data_space;	879	emit_string data_space;
880	List.iter emit_item l	880	List.iter emit_item l
881		881
		882	(* Set the stack as non-executable *)
		883	let nx_stack() =
		884	`#ifdef __ELF__\n`;
		885	`.section .note.GNU-stack,\"\",%progbits\n`;
		886	`#endif\n`
		887
882	(* Beginning / end of an assembly file *)	888	(* Beginning / end of an assembly file *)
883		889
884	let begin_assembly() =	890	let begin_assembly() =
Lines 898-903 Link Here
898	`{emit_symbol lbl_begin}:\n`	904	`{emit_symbol lbl_begin}:\n`
899		905
900	let end_assembly() =	906	let end_assembly() =
		907	nx_stack();
901	(* Emit the jump table *)	908	(* Emit the jump table *)
902	if !num_jumptbl_entries > 0 then begin	909	if !num_jumptbl_entries > 0 then begin
903	emit_string code_space;	910	emit_string code_space;

Lines 741-749 Link Here

(-)ocaml-3.09.3/asmcomp/sparc/emit.mlp.old (+7 lines)
741	` .data\n`;	741	` .data\n`;
742	List.iter emit_item l	742	List.iter emit_item l
743		743
		744	(* Set the stack as non-executable *)
		745	let nx_stack() =
		746	`#ifdef __ELF__\n`;
		747	`.section .note.GNU-stack,\"\",%progbits\n`;
		748	`#endif\n`
		749
744	(* Beginning / end of an assembly file *)	750	(* Beginning / end of an assembly file *)
745		751
746	let begin_assembly() =	752	let begin_assembly() =
		753	nx_stack();
747	let lbl_begin = Compilenv.make_symbol (Some "data_begin") in	754	let lbl_begin = Compilenv.make_symbol (Some "data_begin") in
748	` .data\n`;	755	` .data\n`;
749	` .global {emit_symbol lbl_begin}\n`;	756	` .global {emit_symbol lbl_begin}\n`;

Return to bug 153382