Skip to content
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.

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

Correct 32-bit architectures for 5.1 and 5.2 #24130

Merged
merged 1 commit into from
Jul 19, 2023

Conversation

dra27
Copy link
Member

@dra27 dra27 commented Jul 19, 2023

Alas, in #24075 I correctly fixed the bytecode-only 64-bit architectures in 5.1 and 5.2 and incorrectly broke the 32-bit architectures.

32-bit architectures can be written as arch = "x86_32" | arch = "arm32" | arch = "ppc32", but I think it's better to put what @Octachron had originally put in the 5.1.0~alpha2 package and have a conjunction of the supported native architectures which is what I've done here (cf. also ocaml/opam#4633).

cc @tmcgilchrist

Copy link
Contributor

@tmcgilchrist tmcgilchrist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the right set of options to me.

EDIT The reported arch needs to change after checking on a riscv machine.

@dra27
Copy link
Member Author

dra27 commented Jul 19, 2023

Just double-checking the arch value for riscv…

@dra27
Copy link
Member Author

dra27 commented Jul 19, 2023

Oops - I took the "riscv" value from #24050, but that's OCaml's architecture value (OCaml has Config.arch = "riscv" and Config.model = "riscv64", differing from uname -m's value)

@avsm avsm merged commit 5312936 into ocaml:master Jul 19, 2023
@avsm
Copy link
Member

avsm commented Jul 19, 2023

Thanks! We do need to document the 'useful' arch values somewhere; it's a perpetual source of ambiguity.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants