The unpac monorepo manager self-hosting as a monorepo using unpac
fix bad merge in asmcomp/amd64/emit.mlp
-6
-6
asmcomp/amd64/emit.mlp
-6
asmcomp/amd64/emit.mlp
···
82
82
83
83
(* Layout of the stack frame *)
84
84
85
-
<<<<<<< HEAD
86
85
let stack_threshold_size = Config.stack_threshold * 8 (* bytes *)
87
86
88
-
let frame_required () =
89
-
fp || !contains_calls || num_stack_slots.(0) > 0 || num_stack_slots.(1) > 0
90
-
91
-
=======
92
-
>>>>>>> 36d299b4aaf7f2d317fbfa148d7f94e720c80730
93
87
let frame_size () = (* includes return address *)
94
88
if frame_required() then begin
95
89
let sz =