Skip to content

Enable native code on FreeBSD/aarch64#11096

Merged
gasche merged 1 commit intoocaml:trunkfrom
kit-ty-kate:freebsd-arm64
Jul 26, 2022
Merged

Enable native code on FreeBSD/aarch64#11096
gasche merged 1 commit intoocaml:trunkfrom
kit-ty-kate:freebsd-arm64

Conversation

@kit-ty-kate
Copy link
Copy Markdown
Member

Same as #11092 but for FreeBSD

Copy link
Copy Markdown
Member

@avsm avsm left a comment

Choose a reason for hiding this comment

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

Looks good. This doesn't need a Changes entry I think, since FreeBSD/aarch64 was supported pre-multicore merge. It makes the changelog inaccurate if added since it makes it look like a new 5.0 feature.

@gasche
Copy link
Copy Markdown
Member

gasche commented Jul 26, 2022

I'm not sure while this waited so long, apologies for this (and to @VoxSciurorum who redid the work in #11459.) @kit-ty-kate, I think this is good to go, could you fix the conflicts?

@kit-ty-kate
Copy link
Copy Markdown
Member Author

I just fixed the conflict and removed the entry to the changelog per @avsm’s comment

@gasche gasche merged commit d8887f9 into ocaml:trunk Jul 26, 2022
@gasche
Copy link
Copy Markdown
Member

gasche commented Jul 26, 2022

Merged, thanks! Apologies for letting this PR slip by.

@avsm
Copy link
Copy Markdown
Member

avsm commented Jul 26, 2022

Can this be cherry picked into the 5.0 branch? Otherwise it’ll need a Changes entry for 5.1 (as 5.0 won’t have had this arch)

@kit-ty-kate kit-ty-kate deleted the freebsd-arm64 branch July 26, 2022 16:36
gasche added a commit to gasche/ocaml that referenced this pull request Jul 26, 2022
Enable native code on FreeBSD/aarch64

(cherry picked from commit d8887f9)
@gasche
Copy link
Copy Markdown
Member

gasche commented Jul 26, 2022

Sure, I cherry-picked in 5.0 at 6a95faa.

@kit-ty-kate
Copy link
Copy Markdown
Member Author

@gasche the commit you linked does not belong to any branches it seems.
Github notes:

This commit does not belong to any branch on this repository,
and may belong to a fork outside of the repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants