Remove unused magic numbers

src/ocaml/utils/config.ml

@@ -22,38 +22,21 @@
 (**                                                                   **)
 (***********************************************************************)
 
-(* merlin-jst: All magic numbers ending in "500" should not change when we
+(* merlin-jst: All magic numbers ending in "500" (or higher) should not change when we
    upgrade the upstream Merlin version.  Otherwise, this should track
    "utils/config.mlp" from the compiler.  Also, the above warning comment about
    "config.mlbuild" is outdated and can be ignored. *)
 
 (* The main OCaml version string has moved to ../VERSION *)
 let version = Sys.ocaml_version
 
-let flambda = false
-
-let exec_magic_number = "Caml1999X551"
 let ext_obj = ".o_The boot compiler cannot process C objects"
 
-    (* exec_magic_number is duplicated in runtime/caml/exec.h *)
-and cmi_magic_number =
+let cmi_magic_number =
   (* When bumping this number, be sure to also update ../typing/magic_numbers.ml *)
   "Caml1999I551"
-and cmo_magic_number = "Caml1999O551"
-and cma_magic_number = "Caml1999A551"
-and cmx_magic_number =
-  if flambda then
-    "Caml1999y551"
-  else
-    "Caml1999Y551"
-and cmxa_magic_number =
-  if flambda then
-    "Caml1999z551"
-  else
-    "Caml1999Z551"
 and ast_impl_magic_number = "Caml1999M551"
 and ast_intf_magic_number = "Caml1999N551"
-and cmxs_magic_number = "Caml1999D551"
 and cmt_magic_number = "Caml1999T551"
 and cms_magic_number = "Caml1999S551"
 and index_magic_number = "Merl2023I501"

src/ocaml/utils/config.mli

@@ -23,24 +23,12 @@ val ext_obj : string
 val interface_suffix: string ref
         (* Suffix for interface file names *)
 
-val exec_magic_number: string
-        (* Magic number for bytecode executable files *)
 val cmi_magic_number: string
         (* Magic number for compiled interface files *)
-val cmo_magic_number: string
-        (* Magic number for object bytecode files *)
-val cma_magic_number: string
-        (* Magic number for archive files *)
-val cmx_magic_number: string
-        (* Magic number for compilation unit descriptions *)
-val cmxa_magic_number: string
-        (* Magic number for libraries of compilation unit descriptions *)
 val ast_intf_magic_number: string
         (* Magic number for file holding an interface syntax tree *)
 val ast_impl_magic_number: string
         (* Magic number for file holding an implementation syntax tree *)
-val cmxs_magic_number: string
-        (* Magic number for dynamically-loadable plugins *)
 val cmt_magic_number: string
         (* Magic number for compiled interface files *)
 val cms_magic_number: string