Squashed 'ocaml/' changes from 64235a3..da6ff04

da6ff04 Accept [@ocaml.local] without -extension, and move autogenerated attrs to [@extension.local] (#9)
30ce67d Improve inclusion error messages for [@local_opt] (#10)
f925a62 Remove some uneeded mode variables (#8)
dec721c Local solver speedups (#7)
e9afc49 Fix check_all_arches build
0b9b32a Fix i386 build
a515093 Merge flambda-backend changes

git-subtree-dir: ocaml
git-subtree-split: da6ff04

asmcomp/i386/proc.ml

@@ -140,9 +140,6 @@ let outgoing ofs =
   else Domainstate (ofs + size_domainstate_args)
 let not_supported _ofs = fatal_error "Proc.loc_results: cannot call"
 
-(* Six arguments in integer registers plus eight in global memory. *)
-let max_arguments_for_tailcalls = 14
-
 let loc_arguments arg =
   calling_conventions 0 5 100 99 outgoing arg
 let loc_parameters arg =

asmcomp/s390x/emit.mlp

@@ -105,7 +105,7 @@ let emit_stack r =
   | Stack (Domainstate n) ->
       let ofs = n + Domainstate.(idx_of_field Domain_extra_params) * 8 in
       `{emit_int ofs}(%r10)`
-    Stack s ->
+  | Stack s ->
       let ofs = slot_offset s (register_class r) in
       `{emit_int ofs}(%r15)`
   | _ -> fatal_error "Emit.emit_stack"