ocaml-freestanding becomes a cross-compiler: take 2 #92
Conversation
|
I've added a new commit for the mirage 3 compatibility. Currently freestanding C stubs use
|
Thanks for this update, as I said, both options are fine in the scope of the release of MirageOS 4 - even if the second one is better (because it's transparent). I hope, it's the last contentious piece between MirageOS 3 & MirageOS 4. |
* Installed as a findlib toolchain under the name `freestanding`. It can be queried using `ocamlfind -toolchain feestanding ocamlopt ...` or using dune build context features. * Installing ocaml-freestanding now installs: - compiler binaries in $PREFIX/freestanding-sysroot/bin/ - compiler libraries, runtime and headers in $PREFIX/freestanding-sysroot/lib/ocaml/ - solo5 libc/openlibm implementation in $PREFIX/freestanding-sysroot/lib/nolibc/ - solo5 libc/openlibm headers in $PREFIX/freestanding-sysroot/include/nolibc/ - freestanding toolchain definition in $PREFIX/lib/findlib.conf.d/freestanding.conf - backwards-compatible pkg-config file in $PREFIX/lib/pkgconfig/ocaml-freestanding.pc
dinosaure
force-pushed
the
cross-compiler
branch
from
044a2d9 to
d2e8965
Compare
|
Rebased with |
…d of the branch name
| echo '#define HAS_SECURE_GETENV' >> ocaml/runtime/caml/s.h | ||
| echo '#define HAS_TIMES' >> ocaml/runtime/caml/s.h | ||
| echo 'SAK_CFLAGS=' >> ocaml/Makefile.config | ||
| echo 'SAK_LINK=cc $(SAK_CFLAGS) $$(OUTPUTEXE)$$(1) $$(2)' >> ocaml/Makefile.config |
There was a problem hiding this comment.
I'm not sure why the SAK_ stuff changed here?
There was a problem hiding this comment.
Hmmhmm that's true. Do you have any clues @TheLortex?
There was a problem hiding this comment.
Hmmhm, this update comes from my commit. If I remember correctly, SAK_CC is used to compile OCaml and used by default CC if this variable is defined. About SAK_CFLAGS, it's pretty the same, it uses CFLAGS/OC_FLAGS. These flags are correctly updated before and we should not redo what the OCaml's configure does.
| if [ "${BUILD_ARCH}" = "aarch64" ]; then | ||
| PKG_CONFIG_EXTRA_LIBS="$PKG_CONFIG_EXTRA_LIBS $(gcc -print-libgcc-file-name)" || exit 1 | ||
| EXTRA_LIBS="$EXTRA_LIBS -lgcc" || exit 1 |
There was a problem hiding this comment.
I'm not sure about this change. but I assume you've tested this :)
There was a problem hiding this comment.
So we discovered with @TheLortex that on aarch64, gcc emits some functions which used some internals only available by the fake library libgcc (which does not exists).
It's a bit strange but we must link to it via -lgcc. We should however look and document more precisely that indeed.
|
Close by #104 |
This PR replaces #90. The introduction of the PR is still relevant.
Thanks to @mato's work on solo5 (Solo5/solo5#494), we finally have a good and future-proof scheme for ocaml-freestanding. What happens is that for each solo5 toolchain, we will install an ocaml compiler distribution configured with that toolchain. For now, we only have one toolchain which is
solo5-none-static.From the toolchain name is derived a compiler and a linker to use:
x86_64-solo5-none-static-ccandx86_64-solo5-none-static-ldwhich are used to build a freestanding libc/libm and a freestanding cross-compiler. The distribution is installed under the ocamlfind toolchain namefreestanding.This cross-compiler can then be used by ocaml projects to build solo5 unikernels. I've added an
example/folder to display the layout of such a project.Warning: existing projects depending on ocaml-freestanding will be broken, because they will use the host compiler instead of
ARCH-solo5-none-static-cc. These projects should be updated so that they usepkg-config --var=cc ocaml-freestandingto figure out the correct compiler to use.Because of the lack of unix functions,
libcamlrun.ais not built. So only native code compilation is supported. I've added CI to test it on4.10,4.11and4.12ubuntu, and updated the cirrus CI for freebsd testing.