Runtime: adapt runtime for 5.2

compiler/tests-check-prim/dune

@@ -23,7 +23,7 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime %{dep:main.bc}))))
+   (run %{bin:js_of_ocaml} check-runtime +toplevel.js %{dep:main.bc}))))
 
 (rule
  (targets unix-unix.output)
@@ -36,7 +36,7 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime %{dep:unix.bc}))))
+   (run %{bin:js_of_ocaml} check-runtime +toplevel.js %{dep:unix.bc}))))
 
 (rule
  (targets unix-win32.output)
@@ -49,7 +49,7 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime %{dep:unix.bc}))))
+   (run %{bin:js_of_ocaml} check-runtime +toplevel.js %{dep:unix.bc}))))
 
 (rule
  (targets main.output5)
@@ -60,7 +60,7 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime %{dep:main.bc}))))
+   (run %{bin:js_of_ocaml} check-runtime +toplevel.js %{dep:main.bc}))))
 
 (rule
  (targets unix-unix.output5)
@@ -73,7 +73,7 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime %{dep:unix.bc}))))
+   (run %{bin:js_of_ocaml} check-runtime +toplevel.js %{dep:unix.bc}))))
 
 (rule
  (targets unix-win32.output5)
@@ -86,4 +86,4 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime %{dep:unix.bc}))))
+   (run %{bin:js_of_ocaml} check-runtime +toplevel.js %{dep:unix.bc}))))

compiler/tests-check-prim/main.output

@@ -8,8 +8,6 @@ caml_dynlink_close_lib
 caml_dynlink_get_current_libs
 caml_dynlink_lookup_symbol
 caml_dynlink_open_lib
-caml_get_current_environment
-caml_get_section_table
 caml_int64_add_native
 caml_int64_and_native
 caml_int64_div_native
@@ -20,13 +18,8 @@ caml_int64_or_native
 caml_int64_sub_native
 caml_int64_xor_native
 caml_int_as_pointer
-caml_invoke_traced_function
-caml_realloc_global
-caml_reify_bytecode
 caml_reset_afl_instrumentation
 caml_signbit
-caml_static_release_bytecode
-caml_terminfo_rows
 debugger
 is_digit_normalized
 
@@ -188,12 +181,12 @@ caml_lxm_next
 
 From +runtime_events.js:
 caml_custom_event_index
+caml_ml_runtime_events_pause
+caml_ml_runtime_events_resume
+caml_ml_runtime_events_start
 caml_runtime_events_create_cursor
 caml_runtime_events_free_cursor
-caml_runtime_events_pause
 caml_runtime_events_read_poll
-caml_runtime_events_resume
-caml_runtime_events_start
 caml_runtime_events_user_register
 caml_runtime_events_user_resolve
 caml_runtime_events_user_write
@@ -230,6 +223,15 @@ caml_spacetime_enabled
 caml_spacetime_only_works_for_native_code
 caml_sys_is_regular_file
 
+From +toplevel.js:
+caml_dynlink_get_bytecode_sections
+caml_static_alloc
+caml_static_free
+caml_terminfo_backup
+caml_terminfo_resume
+caml_terminfo_setup
+caml_terminfo_standout
+
 From +unix.js:
 caml_unix_cleanup
 caml_unix_closedir

compiler/tests-check-prim/main.output5

@@ -10,8 +10,6 @@ caml_dynlink_close_lib
 caml_dynlink_get_current_libs
 caml_dynlink_lookup_symbol
 caml_dynlink_open_lib
-caml_get_current_environment
-caml_get_section_table
 caml_int64_add_native
 caml_int64_and_native
 caml_int64_div_native
@@ -22,13 +20,8 @@ caml_int64_or_native
 caml_int64_sub_native
 caml_int64_xor_native
 caml_int_as_pointer
-caml_invoke_traced_function
-caml_realloc_global
-caml_reify_bytecode
 caml_reset_afl_instrumentation
 caml_signbit
-caml_static_release_bytecode
-caml_terminfo_rows
 debugger
 is_digit_normalized
 
@@ -161,6 +154,9 @@ caml_obj_set_tag
 caml_obj_truncate
 
 From +runtime_events.js:
+caml_ml_runtime_events_pause
+caml_ml_runtime_events_resume
+caml_ml_runtime_events_start
 caml_runtime_events_create_cursor
 caml_runtime_events_free_cursor
 caml_runtime_events_read_poll
@@ -190,6 +186,15 @@ caml_spacetime_enabled
 caml_spacetime_only_works_for_native_code
 caml_sys_const_naked_pointers_checked
 
+From +toplevel.js:
+caml_dynlink_get_bytecode_sections
+caml_static_alloc
+caml_static_free
+caml_terminfo_backup
+caml_terminfo_resume
+caml_terminfo_setup
+caml_terminfo_standout
+
 From +unix.js:
 caml_unix_cleanup
 caml_unix_closedir

compiler/tests-check-prim/unix-unix.output

@@ -8,8 +8,6 @@ caml_dynlink_close_lib
 caml_dynlink_get_current_libs
 caml_dynlink_lookup_symbol
 caml_dynlink_open_lib
-caml_get_current_environment
-caml_get_section_table
 caml_int64_add_native
 caml_int64_and_native
 caml_int64_div_native
@@ -20,13 +18,8 @@ caml_int64_or_native
 caml_int64_sub_native
 caml_int64_xor_native
 caml_int_as_pointer
-caml_invoke_traced_function
-caml_realloc_global
-caml_reify_bytecode
 caml_reset_afl_instrumentation
 caml_signbit
-caml_static_release_bytecode
-caml_terminfo_rows
 caml_unix_map_file_bytecode
 debugger
 is_digit_normalized
@@ -297,12 +290,12 @@ caml_lxm_next
 
 From +runtime_events.js:
 caml_custom_event_index
+caml_ml_runtime_events_pause
+caml_ml_runtime_events_resume
+caml_ml_runtime_events_start
 caml_runtime_events_create_cursor
 caml_runtime_events_free_cursor
-caml_runtime_events_pause
 caml_runtime_events_read_poll
-caml_runtime_events_resume
-caml_runtime_events_start
 caml_runtime_events_user_register
 caml_runtime_events_user_resolve
 caml_runtime_events_user_write
@@ -339,6 +332,15 @@ caml_spacetime_enabled
 caml_spacetime_only_works_for_native_code
 caml_sys_is_regular_file
 
+From +toplevel.js:
+caml_dynlink_get_bytecode_sections
+caml_static_alloc
+caml_static_free
+caml_terminfo_backup
+caml_terminfo_resume
+caml_terminfo_setup
+caml_terminfo_standout
+
 From +unix.js:
 caml_unix_cleanup
 caml_unix_closedir

compiler/tests-check-prim/unix-unix.output5

@@ -10,8 +10,6 @@ caml_dynlink_close_lib
 caml_dynlink_get_current_libs
 caml_dynlink_lookup_symbol
 caml_dynlink_open_lib
-caml_get_current_environment
-caml_get_section_table
 caml_int64_add_native
 caml_int64_and_native
 caml_int64_div_native
@@ -22,13 +20,8 @@ caml_int64_or_native
 caml_int64_sub_native
 caml_int64_xor_native
 caml_int_as_pointer
-caml_invoke_traced_function
-caml_realloc_global
-caml_reify_bytecode
 caml_reset_afl_instrumentation
 caml_signbit
-caml_static_release_bytecode
-caml_terminfo_rows
 caml_unix_accept
 caml_unix_access
 caml_unix_alarm
@@ -270,6 +263,9 @@ caml_obj_set_tag
 caml_obj_truncate
 
 From +runtime_events.js:
+caml_ml_runtime_events_pause
+caml_ml_runtime_events_resume
+caml_ml_runtime_events_start
 caml_runtime_events_create_cursor
 caml_runtime_events_free_cursor
 caml_runtime_events_read_poll
@@ -299,6 +295,15 @@ caml_spacetime_enabled
 caml_spacetime_only_works_for_native_code
 caml_sys_const_naked_pointers_checked
 
+From +toplevel.js:
+caml_dynlink_get_bytecode_sections
+caml_static_alloc
+caml_static_free
+caml_terminfo_backup
+caml_terminfo_resume
+caml_terminfo_setup
+caml_terminfo_standout
+
 From +unix.js:
 caml_unix_cleanup
 caml_unix_filedescr_of_fd

runtime/domain.js

@@ -48,6 +48,7 @@ function caml_atomic_make_contended(a) {
 }
 
 //Provides: caml_ml_domain_unique_token
+//Version: < 5.2
 var caml_ml_domain_unique_token_ = [0]
 function caml_ml_domain_unique_token(unit) {
   return caml_ml_domain_unique_token_

runtime/runtime_events.js

@@ -19,18 +19,21 @@ function caml_runtime_events_user_resolve() {
   return 0;
 }
 
-//Provides: caml_runtime_events_start
-function caml_runtime_events_start() {
+//Provides: caml_ml_runtime_events_start
+//Alias: caml_runtime_events_start
+function caml_ml_runtime_events_start() {
   return 0;
 }
 
-//Provides: caml_runtime_events_pause
-function caml_runtime_events_pause() {
+//Provides: caml_ml_runtime_events_pause
+//Alias: caml_runtime_events_pause
+function caml_ml_runtime_events_pause() {
   return 0;
 }
 
-//Provides: caml_runtime_events_resume
-function caml_runtime_events_resume() {
+//Provides: caml_ml_runtime_events_resume
+//Alias: caml_runtime_events_resume
+function caml_ml_runtime_events_resume() {
   return 0;
 }