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

Fix backend conflicts #174

Merged
merged 10 commits into from
Oct 23, 2023
Merged

Fix backend conflicts #174

merged 10 commits into from
Oct 23, 2023

Conversation

xclerc
Copy link
Contributor

@xclerc xclerc commented Oct 18, 2023

Covers most conflicts under asmcomp/;
@mshinwell is working on the cmm ones.

(Very much untested.)

@xclerc xclerc force-pushed the fix-backend-conflicts branch 4 times, most recently from 25718d8 to 60d0234 Compare October 20, 2023 15:35
asmcomp/riscv/emit.mlp Show resolved Hide resolved
asmcomp/riscv/emit.mlp Outdated Show resolved Hide resolved
asmcomp/asmlink.ml Show resolved Hide resolved
asmcomp/selectgen.ml Show resolved Hide resolved
@gretay-js
Copy link
Contributor

My review is for changes under asmcomp except cmm*.

@mshinwell mshinwell force-pushed the fix-backend-conflicts branch from 628bfef to 6087e5c Compare October 23, 2023 14:38
@mshinwell
Copy link
Contributor

Rebased

@mshinwell mshinwell merged commit 1fff74e into main Oct 23, 2023
4 checks passed
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.

4 participants