OCaml 4.07 support by hannesm · Pull Request #39 · mirage/ocaml-solo5

hannesm · 2018-06-20T16:38:44Z

Relevant changes in 4.07

unix.c now #include <sys/ioctl.h> (since 852b595ff3), but an empty one is fine
(only use is in caml_nun_rows_fd in an #ifdef TIOCGWINSZ), see
Remove dependencies on curses/terminfo/termcap C library ocaml/ocaml#1431
-> provide an empty ioctl via nolibc
bigarray is now part of the stdlib
Add bigarray to the stdlib ocaml/ocaml#1685
-> libotherlibs.a is no longer needed (neither built nor linked)

this compiles, but has not been extensively tested due to ppx issues in 4.07 (and thus unable to build the mirage tool, but working on some hacks for that)

hannesm · 2018-06-20T16:40:00Z

 Description: Freestanding OCaml runtime
 Cflags: -I${includedir}
-Libs: ${libdir}/libasmrun.a ${libdir}/libotherlibs.a ${libdir}/libnolibc.a ${libdir}/libopenlibm.a @@PKG_CONFIG_EXTRA_LIBS@@
+Libs: ${libdir}/libasmrun.a ${libdir}/libnolibc.a ${libdir}/libopenlibm.a @@PKG_CONFIG_EXTRA_LIBS@@


i'm not entirely sure about this -- is the order of the .a archives relevant?

it is not, but the escaping in configure.sh needs some additional \

I'm not sure what you mean. The archives should be listed in dependency order, but your change doesn't change that.

Ah, I see now, you move libotherlibs.a into PKG_CONFIG_EXTRA_LIBS for OCaml < 4.07.0. That might break some linkers.

yes, and escaping the $ from configure.sh via Makeconf and Makefile doesn't seem to be possible for me.... we may need to introduce some other mechanism

Relevant changes in 4.07 - unix.c now #include <sys/ioctl.h> (since 852b595ff3), but an empty one is fine (only use is in caml_nun_rows_fd in an #ifdef TIOCGWINSZ), see ocaml/ocaml#1431 -> provide an empty ioctl via nolibc - bigarray is now part of the stdlib ocaml/ocaml#1685 -> libotherlibs.a is no longer needed (neither built nor linked) To support these changes, an empty sys/ioctl.h is added to nolibc. Also, `ocaml-freestanding.pc.in` now contains in `Libs`: -L${libdir} -lasmrum -lnolibc -lopenlibm (instead of ${libdir}/lib for each library). `configure.sh` adds -lotherlibs to these flags in the case that OCAML_GTE_4_07_0 is false. The `Makefile` treats libotherlibs.a as dependency only if OCAML_GTE_4_07_0 is false.

hannesm · 2018-07-14T13:17:24Z

I force-pushed this branch - now that 4.07.0 is released (and a ocaml-src.4.07.0 is available in opam-repository). I couldn't figure out the levels of escape to inject a $ from configure.sh to ocaml-freestanding.pc (4.07.0 bundles the bigarray C stubs with stdlib, no need to build otherlibs anymore), instead I added -L${libdir} to ocaml-freestanding.pc.in and refer to nolibc, asmrun and openlibm using -l, and in case <4.07.0 is used, a -lotherlibs is added (via PKG_CONFIG_EXTRA_LIBS generated by configure.sh, stored in Makeconf, included by Makefile which does the sed in ocaml-freestanding.pc.in). I tested the changes with a 4.06.1 compiler on FreeBSD (using clang lld LLD 6.0.0 (FreeBSD 326565-1200002) (compatible with GNU linkers)).

hannesm · 2018-07-18T19:08:29Z

this links and nearly works, but linking a MirageOS unikernel requires one more symbol in 4.07.0 land (which is part of otherlibs - which we avoid to compile and use in this PR): caml_ba_map_file -- when I manually add this to nolibc/stubs.c (as STUB_ABORT(caml_ba_map_file)) I get a unikernel to link and run - but I can't find a good way to include OCaml-runtime-version specific stubs, any suggestions? -- the OCaml include files do not define an API/runtime version AFAICT, we could inject such a definition at configure.sh time, but I'm not sure about that.

NOTE: please take a look at ecd2515 for the solution using configure.sh mentioned above.

mato · 2018-07-19T08:12:24Z

@hannesm IIUC this depends on a fix for mirage/mirage#911 before I can meaningfully test it?

hannesm · 2018-07-19T08:13:41Z

yes, Drup fixed mirage on 4.07.0 with mirage/functoria#153 and mirage/mirage#912 - which I plan to merge soon

mato · 2018-07-29T15:40:41Z

@hannesm I've tested this (using --dev-repo pins of mirage and functoria) and it seems fine. What is the issue you were trying to fix with shell escaping?

Regarding the change in library ordering in the .pc file, this should actually be fine as long as no libraries that depend on libotherlibs come after it in the link step. As far as I can tell, that should never happen.

Modifying nolibc/stubs.c at build time is a bit hacky, but it'll do for now.

hannesm · 2018-07-29T20:28:01Z

What is the issue you were trying to fix with shell escaping?

in current master, the pc file contains ${libdir}/otherlibs.a. 4.07.0 no longer needs otherlibs.a as mentioned above. I initially wanted to add the -l${libdir}/otherlibs.a optionally (<4.07.0) via configure.sh, but I failed to get the $ sign from configure.sh via Makeconf and ocaml-freestanding.pc rule in Makefile to the generated pc. As a workaround (or fix!?), I use -L${libdir} and don't prefix the to-be-linked libraries with ${libdir} (-lotherlibs instead of ${libdir}/libotherlibs.a).

hannesm · 2018-08-01T16:12:35Z

NB functoria 2.2.1 and mirage 3.1.1 are now released to opam-repository -- which support OCaml 4.07.

mato · 2018-08-06T09:10:48Z

I had another look at this; the fact that configure.sh modifies nolibc/stubs.c is a bit annoying when working out of a Git tree, since it a) dirties the tree and b) is not idempotent. Could you move that specific action into Makefile, under the build/nolibc/Makefile target and modify the copy in build/ instead? You should be able to use ifeq to make it conditional on 4.07.0, and make clean will clean up the change.

hannesm · 2018-08-07T09:17:20Z

@mato done in 0d41cd9 (and tested locally with both 4.06.1 and 4.07.0)

hannesm · 2018-08-07T10:22:16Z

CI is broken due to ocaml/ocaml-ci-scripts#232 which now uses opam2 (thx to @samoht - see https://discuss.ocaml.org/t/ocaml-ci-scripts-are-now-using-opam2-by-default/2379 as well), not sure what to do here - we can tell travis to use opam1, or update the opam file to opam2. what do you think?

hannesm · 2018-08-07T10:31:46Z

given that the main opam-repository will only switch to 2.0.0 on september 17th (according to https://opam.ocaml.org/blog/opam-2-0-0-repo-upgrade-roadmap/), I guess it is wise to use opam1 until then here as well (to avoid having to downgrade opam files for potential new releases) -- I'll shortly add a commit here to stick travis to opam1

samoht · 2018-08-07T10:38:46Z

@hannesm what was the error with the CI script and opam2? I can help fixing those :-)

hannesm · 2018-08-07T10:40:13Z

@samoht from https://travis-ci.org/mirage/ocaml-freestanding/jobs/413023314

opam lint opam --warn=-21-32-48
/home/travis/build/mirage/ocaml-freestanding/opam: Errors.
    error 55: Non-normalised OS or arch string being tested: "amd64 (use x86_64
              instead)", "amd64 (use x86_64 instead)", "aarch64 (use arm64
              instead)"
'unset TESTS; OPAMYES=1 export OPAMYES; set -ue; opam lint opam --warn=-21-32-48' exited 1. Terminating with 1

it's easy enough to fix, but will break opam1..

samoht · 2018-08-07T10:41:23Z

Or we can also add -55 to the list of ignored warnings.

hannesm · 2018-08-07T10:53:20Z

I'm not a big fan about ignoring warnings in the CI scripts -- it is usually hard to get rid of once ignored warnings (similar to removing LATEST ocaml/ocaml-ci-scripts#110), since it leads to spurious issues at random PRs..

mato · 2018-08-09T14:12:46Z

@hannesm Thanks, this all looks good to me, including sticking with OPAM 1.x for now.

hannesm commented Jun 20, 2018

View reviewed changes

hannesm force-pushed the 4.07 branch from abd2483 to c132293 Compare July 14, 2018 13:12

hannesm changed the title ~~WIP: OCaml 4.07 support~~ READY: OCaml 4.07 support Jul 14, 2018

hannesm changed the title ~~READY: OCaml 4.07 support~~ READY for review: OCaml 4.07 support Jul 14, 2018

travis: add 4.07 to matrix

4138d99

hannesm force-pushed the 4.07 branch from a08f521 to 4138d99 Compare July 14, 2018 13:33

4.07.0+ needs 'caml_ba_map_file' symbol, provide a stub

0d41cd9

hannesm force-pushed the 4.07 branch from ecd2515 to 0d41cd9 Compare August 7, 2018 09:16

stick with opam1 for now

7473bb4

mato changed the title ~~READY for review: OCaml 4.07 support~~ OCaml 4.07 support Aug 9, 2018

mato merged commit 7233274 into mirage:master Aug 9, 2018

hannesm deleted the 4.07 branch August 13, 2018 17:27

hannesm mentioned this pull request Mar 16, 2019

Fix 4.08 support wrt changes beta2 mirage/mirage-platform#209

Closed

Conversation

hannesm commented Jun 20, 2018

Uh oh!

hannesm Jun 20, 2018

Choose a reason for hiding this comment

Uh oh!

hannesm Jun 20, 2018

Choose a reason for hiding this comment

Uh oh!

mato Jun 22, 2018

Choose a reason for hiding this comment

Uh oh!

mato Jun 22, 2018

Choose a reason for hiding this comment

Uh oh!

hannesm Jun 22, 2018

Choose a reason for hiding this comment

Uh oh!

hannesm commented Jul 14, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hannesm commented Jul 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mato commented Jul 19, 2018

Uh oh!

hannesm commented Jul 19, 2018

Uh oh!

mato commented Jul 29, 2018

Uh oh!

hannesm commented Jul 29, 2018

Uh oh!

hannesm commented Aug 1, 2018

Uh oh!

mato commented Aug 6, 2018

Uh oh!

hannesm commented Aug 7, 2018

Uh oh!

hannesm commented Aug 7, 2018

Uh oh!

hannesm commented Aug 7, 2018

Uh oh!

samoht commented Aug 7, 2018

Uh oh!

hannesm commented Aug 7, 2018

Uh oh!

samoht commented Aug 7, 2018

Uh oh!

hannesm commented Aug 7, 2018

Uh oh!

mato commented Aug 9, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

hannesm commented Jul 14, 2018 •

edited

Loading

hannesm commented Jul 18, 2018 •

edited

Loading