Skip to content

Bump magic numbers #1077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 17, 2023
Merged

Bump magic numbers #1077

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
629ceed
Bump magic numbers
mshinwell Jan 17, 2023
34e781c
Bump bytecode magic
mshinwell Jan 17, 2023
a52fca2
Update ocaml/utils/config.mlp
mshinwell Jan 17, 2023
9cd35d2
Bootstrap
mshinwell Jan 17, 2023
8424ed0
HACKING.md
mshinwell Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocaml/runtime/caml/exec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct exec_trailer {

/* Magic number for this release */

#define EXEC_MAGIC "Caml1999X031"
#define EXEC_MAGIC "Caml1999X500"

#endif /* CAML_INTERNALS */

Expand Down
24 changes: 12 additions & 12 deletions ocaml/utils/config.mlp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,27 +99,27 @@ let poll_insertion = %%POLL_INSERTION%%
(* When artifacts are incompatible with upstream OCaml, ocaml-jst uses
magic numbers ending in 5xx. (The AST and bytecode executables remain
compatible, so use upstream numbers) *)
let exec_magic_number = "Caml1999X031"
let exec_magic_number = "Caml1999X500"
(* exec_magic_number is duplicated in runtime/caml/exec.h *)
and cmi_magic_number = "Caml1999I500"
and cmo_magic_number = "Caml1999O500"
and cma_magic_number = "Caml1999A500"
and cmi_magic_number = "Caml1999I501"
and cmo_magic_number = "Caml1999O501"
and cma_magic_number = "Caml1999A501"
and cmx_magic_number =
if flambda || flambda2 then
"Caml2021y502"
"Caml2021y503"
else
"Caml2021Y502"
"Caml2021Y503"
and cmxa_magic_number =
if flambda || flambda2 then
"Caml2021z502"
"Caml2021z503"
else
"Caml2021Z502"
"Caml2021Z503"
and ast_impl_magic_number = "Caml1999M031"
and ast_intf_magic_number = "Caml1999N031"
and cmxs_magic_number = "Caml1999D501"
and cmt_magic_number = "Caml1999T500"
and linear_magic_number = "Caml1999L500"
and cfg_magic_number = "Caml2021G500"
and cmxs_magic_number = "Caml1999D502"
and cmt_magic_number = "Caml1999T501"
and linear_magic_number = "Caml1999L501"
and cfg_magic_number = "Caml2021G501"

let interface_suffix = ref ".mli"

Expand Down