Code

Resolve conflicts in runtime/#2794

Code

Merged

mshinwell merged 19 commits intoocaml-flambda:merge-5.2ocaml-flambda/flambda-backend:merge-5.2from mshinwell:5.2-runtimemshinwell/flambda-backend:5.2-runtimeCopy head branch name to clipboardAug 13, 2024

+209-9,555

Commits

Commits on Jul 18, 2024

• Initial state where runtime builds

  mshinwell

  committed
  f36e42c

  Copy full SHA for f36e42c

Commits on Jul 19, 2024

• Review

  Show description for 316a585
  mshinwell

  committed
  316a585

  Copy full SHA for 316a585

Commits on Aug 9, 2024

• Review of conflicts

  mshinwell

  committed
  4d12860

  Copy full SHA for 4d12860

Commits on Aug 12, 2024

• Remove XXX in memprof files

  Show description for 9f9eb7e
  mshinwell

  committed
  9f9eb7e

  Copy full SHA for 9f9eb7e

• ptrdiff_t

  Show description for f85fc05
  mshinwell

  committed
  f85fc05

  Copy full SHA for f85fc05

• domain.c:778 to stay deleted

  Show description for db9b57c
  mshinwell

  committed
  db9b57c

  Copy full SHA for db9b57c

• Fix memprof bit in domain.c:domain_create

  Show description for 2b3c8a9
  mshinwell

  committed
  2b3c8a9

  Copy full SHA for 2b3c8a9

• Revert to upstream compaction behaviour in gc_ctrl.c

  Show description for 925b1d5
  mshinwell

  committed
  925b1d5

  Copy full SHA for 925b1d5

• Fix for gettimeofday

  Show description for 5f03e97
  mshinwell

  committed
  5f03e97

  Copy full SHA for 5f03e97

• Typo fix

  Show description for 746bf29
  mshinwell

  committed
  746bf29

  Copy full SHA for 746bf29

• Remove XXX in caml_enter_blocking_section

  mshinwell

  committed
  8c9893c

  Copy full SHA for 8c9893c

• Remove message in caml_enter_blocking_section for async exn raise

  mshinwell

  committed
  9a33f0a

  Copy full SHA for 9a33f0a

• Remove XXX in caml_ba_alloc

  mshinwell

  committed
  a08844e

  Copy full SHA for a08844e

• adopt_orphaned_work

  mshinwell

  committed
  e553330

  Copy full SHA for e553330

• caml_alloc_custom_mem

  mshinwell

  committed
  4597a33

  Copy full SHA for 4597a33

• Try to fix DEBUG code in platform.c

  mshinwell

  committed
  262ac28

  Copy full SHA for 262ac28

• Resurrect CHECK_STACK_ALIGNMENT macro

  mshinwell

  committed
  0078f94

  Copy full SHA for 0078f94

• Dune build fixes for the runtime - may need a bit more tidying

  mshinwell

  committed
  760fa44

  Copy full SHA for 760fa44

Commits on Aug 13, 2024

• git rm s390x.S win32.c power.S riscv.S

  mshinwell

  committed
  0fb508a

  Copy full SHA for 0fb508a