这是indexloc提供的服务，不要输入任何密码
Skip to content

Merge 5.2.0minus 2 #112

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 2 commits into from
Oct 24, 2024
Merged

Merge 5.2.0minus 2 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14ba561
Import ocaml sources for ocaml-flambda/flambda-backend@8a585cf242
liam923 Oct 24, 2024
54b3b45
Update magic numbers
liam923 Oct 24, 2024
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
1 change: 1 addition & 0 deletions src/ocaml/typing/magic_numbers.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions src/ocaml/utils/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion upstream/ocaml_flambda/base-rev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
69c04271e033a9c4420b2391b9e77427bf3c0c9a
8a585cf2429644141a48bd23db7b237b20360938
28 changes: 14 additions & 14 deletions upstream/ocaml_flambda/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
Loading