Resolve conflicts in runtime/ #2794
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@stedolan I think this is ready for you to look at. There are some Changes for |
|
Runtime changes that are specific to flambda‐backend should be useful when reviewing too. |
|
How much testing has this had? |
|
This compiles |
stedolan
requested changes
Aug 12, 2024
stedolan
reviewed
Aug 12, 2024
stedolan
requested changes
Aug 12, 2024
stedolan
approved these changes
Aug 13, 2024
lukemaurer
pushed a commit
to lukemaurer/flambda-backend
that referenced
this pull request
Oct 23, 2024
* Initial state where runtime builds * Review (cherry picked from commit e41be34) * Review of conflicts * Remove XXX in memprof files (cherry picked from commit 58e7b16) * ptrdiff_t (cherry picked from commit e4b4388) * domain.c:778 to stay deleted (cherry picked from commit f05df07) * Fix memprof bit in domain.c:domain_create (cherry picked from commit 34925f4) * Revert to upstream compaction behaviour in gc_ctrl.c (cherry picked from commit 7740dc4) * Fix for gettimeofday (cherry picked from commit d2f2330) * Typo fix (cherry picked from commit 2db34fd) * Remove XXX in caml_enter_blocking_section * Remove message in caml_enter_blocking_section for async exn raise * Remove XXX in caml_ba_alloc * adopt_orphaned_work * caml_alloc_custom_mem * Try to fix DEBUG code in platform.c * Resurrect CHECK_STACK_ALIGNMENT macro * Dune build fixes for the runtime - may need a bit more tidying * git rm s390x.S win32.c power.S riscv.S
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is not yet ready for review.
List of upstream changes involved:
https://github.com/ocaml-flambda/flambda-backend/wiki/List-of-upstream-changes-from-5.1.1-to-5.2.0-split-by-area#runtime