Merge 5.2.0minus 2 (#112)

* Import ocaml sources for oxcaml/oxcaml@8a585cf242

* Update magic numbers

Author: liam923

src/ocaml/typing/magic_numbers.ml

@@ -57,6 +57,7 @@ module Cmi = struct
     | "Caml1999I034" -> Some "5.2"
     | "Caml1999I550" -> Some "5.2.0minus-0"
     | "Caml1999I551" -> Some "5.2.0minus-1"
+    | "Caml1999I552" -> Some "5.2.0minus-2"
     | _ -> None
 
   let () = assert (to_version_opt Config.cmi_magic_number <> None)

src/ocaml/utils/config.ml

@@ -31,13 +31,13 @@
 let version = Sys.ocaml_version
 
 (* When bumping this number, be sure to also update ../typing/magic_numbers.ml *)
-let cmi_magic_number = "Caml1999I551"
+let cmi_magic_number = "Caml1999I552"
 
-let ast_impl_magic_number = "Caml1999M551"
-let ast_intf_magic_number = "Caml1999N551"
-let cmt_magic_number = "Caml1999T551"
-let cms_magic_number = "Caml1999S551"
-let index_magic_number = "Merl2023I501"
+let ast_impl_magic_number = "Caml1999M552"
+let ast_intf_magic_number = "Caml1999N552"
+let cmt_magic_number = "Caml1999T552"
+let cms_magic_number = "Caml1999S552"
+let index_magic_number = "Merl2023I552"
 
 let interface_suffix = ref ".mli"
 

upstream/ocaml_flambda/base-rev.txt

@@ -1 +1 @@
-69c04271e033a9c4420b2391b9e77427bf3c0c9a
+8a585cf2429644141a48bd23db7b237b20360938

upstream/ocaml_flambda/configure

@@ -3335,39 +3335,39 @@ OCAML_VERSION_SHORT=5.2
 
 printf "%s\n" "#define MAGIC_NUMBER_PREFIX \"Caml1999\"" >>confdefs.h
 
-printf "%s\n" "#define MAGIC_NUMBER_VERSION \"551\"" >>confdefs.h
+printf "%s\n" "#define MAGIC_NUMBER_VERSION \"552\"" >>confdefs.h
 
 MAGIC_NUMBER_LENGTH=12
 
 printf "%s\n" "#define EXEC_MAGIC_LENGTH 12" >>confdefs.h
 
 printf "%s\n" "#define EXEC_FORMAT \"X\"" >>confdefs.h
 
-EXEC_MAGIC_NUMBER=Caml1999X551
+EXEC_MAGIC_NUMBER=Caml1999X552
 
-CMI_MAGIC_NUMBER=Caml1999I551
+CMI_MAGIC_NUMBER=Caml1999I552
 
-CMO_MAGIC_NUMBER=Caml1999O551
+CMO_MAGIC_NUMBER=Caml1999O552
 
-CMA_MAGIC_NUMBER=Caml1999A551
+CMA_MAGIC_NUMBER=Caml1999A552
 
-CMX_MAGIC_NUMBER=Caml1999Y551
+CMX_MAGIC_NUMBER=Caml1999Y552
 
-CMXA_MAGIC_NUMBER=Caml1999Z551
+CMXA_MAGIC_NUMBER=Caml1999Z552
 
-AST_IMPL_MAGIC_NUMBER=Caml1999M551
+AST_IMPL_MAGIC_NUMBER=Caml1999M552
 
-AST_INTF_MAGIC_NUMBER=Caml1999N551
+AST_INTF_MAGIC_NUMBER=Caml1999N552
 
-CMXS_MAGIC_NUMBER=Caml1999D551
+CMXS_MAGIC_NUMBER=Caml1999D552
 
-CMT_MAGIC_NUMBER=Caml1999T551
+CMT_MAGIC_NUMBER=Caml1999T552
 
-CMS_MAGIC_NUMBER=Caml1999S551
+CMS_MAGIC_NUMBER=Caml1999S552
 
-CFG_MAGIC_NUMBER=Caml1999G551
+CFG_MAGIC_NUMBER=Caml1999G552
 
-LINEAR_MAGIC_NUMBER=Caml1999L551
+LINEAR_MAGIC_NUMBER=Caml1999L552