Change prefix of all magic numbers to avoid clashes with upstream.

gretay-js · stedolan · commit be3627b7f038 · 2021-10-27T10:45:20.000+01:00
diff --git a/ocaml/runtime/caml/exec.h b/ocaml/runtime/caml/exec.h
@@ -60,7 +60,7 @@ struct exec_trailer {
 
 /* Magic number for this release */
 
-#define EXEC_MAGIC "Caml1999X029"
+#define EXEC_MAGIC "Caml2021X029"
 
 #endif /* CAML_INTERNALS */
 
diff --git a/ocaml/utils/config.mlp b/ocaml/utils/config.mlp
@@ -91,11 +91,11 @@ let function_sections = %%FUNCTION_SECTIONS%%
 let probes = %%PROBES%%
 let afl_instrument = %%AFL_INSTRUMENT%%
 
-let exec_magic_number = "Caml1999X029"
+let exec_magic_number = "Caml2021X029"
     (* exec_magic_number is duplicated in runtime/caml/exec.h *)
-and cmi_magic_number = "Caml1999I029"
-and cmo_magic_number = "Caml1999O029"
-and cma_magic_number = "Caml1999A029"
+and cmi_magic_number = "Caml2021I029"
+and cmo_magic_number = "Caml2021O029"
+and cma_magic_number = "Caml2021A029"
 and cmx_magic_number =
   if flambda || flambda2 then
     "Caml2021y029"
@@ -106,11 +106,11 @@ and cmxa_magic_number =
     "Caml2021z029"
   else
     "Caml2021Z029"
-and ast_impl_magic_number = "Caml1999M029"
-and ast_intf_magic_number = "Caml1999N029"
-and cmxs_magic_number = "Caml1999D029"
-and cmt_magic_number = "Caml1999T029"
-and linear_magic_number = "Caml1999L029"
+and ast_impl_magic_number = "Caml2021M029"
+and ast_intf_magic_number = "Caml2021N029"
+and cmxs_magic_number = "Caml2021D029"
+and cmt_magic_number = "Caml2021T029"
+and linear_magic_number = "Caml2021L029"
 and cfg_magic_number = "Caml2021G029"
 
 let interface_suffix = ref ".mli"
diff --git a/ocaml/utils/misc.ml b/ocaml/utils/misc.ml
@@ -982,37 +982,30 @@ module Magic_number = struct
 
   type raw_kind = string
 
+  (* We do not accept Caml1999 prefixes. *)
   let parse_kind : raw_kind -> kind option = function
-    | "Caml1999X" -> Some Exec
-    | "Caml1999I" -> Some Cmi
-    | "Caml1999O" -> Some Cmo
-    | "Caml1999A" -> Some Cma
+    | "Caml2021X" -> Some Exec
+    | "Caml2021I" -> Some Cmi
+    | "Caml2021O" -> Some Cmo
+    | "Caml2021A" -> Some Cma
     | "Caml2021y" -> Some (Cmx {flambda = true})
     | "Caml2021Y" -> Some (Cmx {flambda = false})
     | "Caml2021z" -> Some (Cmxa {flambda = true})
     | "Caml2021Z" -> Some (Cmxa {flambda = false})
-
-    (* Caml2007D and Caml2012T were used instead of the common Caml1999 prefix
-       between the introduction of those magic numbers and October 2017
-       (8ba70ff194b66c0a50ffb97d41fe9c4bdf9362d6).
-
-       We accept them here, but will always produce/show kind prefixes
-       that follow the current convention, Caml1999{D,T}. *)
-    | "Caml2007D" | "Caml1999D" -> Some Cmxs
-    | "Caml2012T" | "Caml1999T" -> Some Cmt
-
-    | "Caml1999M" -> Some Ast_impl
-    | "Caml1999N" -> Some Ast_intf
+    | "Caml2021D" -> Some Cmxs
+    | "Caml2021T" -> Some Cmt
+    | "Caml2021M" -> Some Ast_impl
+    | "Caml2021N" -> Some Ast_intf
     | _ -> None
 
   (* note: over time the magic kind number has changed for certain kinds;
      this function returns them as they are produced by the current compiler,
      but [parse_kind] accepts older formats as well. *)
   let raw_kind : kind -> raw = function
-    | Exec -> "Caml1999X"
-    | Cmi -> "Caml1999I"
-    | Cmo -> "Caml1999O"
-    | Cma -> "Caml1999A"
+    | Exec -> "Caml2021X"
+    | Cmi -> "Caml2021I"
+    | Cmo -> "Caml2021O"
+    | Cma -> "Caml2021A"
     | Cmx config ->
        if config.flambda
        then "Caml2021y"
@@ -1021,10 +1014,10 @@ module Magic_number = struct
        if config.flambda
        then "Caml2021z"
        else "Caml2021Z"
-    | Cmxs -> "Caml1999D"
-    | Cmt -> "Caml1999T"
-    | Ast_impl -> "Caml1999M"
-    | Ast_intf -> "Caml1999N"
+    | Cmxs -> "Caml2021D"
+    | Cmt -> "Caml2021T"
+    | Ast_impl -> "Caml2021M"
+    | Ast_intf -> "Caml2021N"
 
   let string_of_kind : kind -> string = function
     | Exec -> "exec"
