Runtime: adjust runtime for 4.14

hhugo · hhugo · commit c9b00c0f65f9 · 2024-11-19T14:45:56.000+01:00
diff --git a/compiler/tests-check-prim/dune b/compiler/tests-check-prim/dune
@@ -23,7 +23,12 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js %{dep:main.bc}))))
+   (run
+    %{bin:js_of_ocaml}
+    check-runtime
+    +dynlink.js
+    +toplevel.js
+    %{dep:main.bc}))))
 
 (rule
  (targets unix-unix.output)
@@ -36,7 +41,12 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js %{dep:unix.bc}))))
+   (run
+    %{bin:js_of_ocaml}
+    check-runtime
+    +dynlink.js
+    +toplevel.js
+    %{dep:unix.bc}))))
 
 (rule
  (targets unix-win32.output)
@@ -49,7 +59,12 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js %{dep:unix.bc}))))
+   (run
+    %{bin:js_of_ocaml}
+    check-runtime
+    +dynlink.js
+    +toplevel.js
+    %{dep:unix.bc}))))
 
 (rule
  (targets main.output5)
@@ -60,7 +75,12 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js %{dep:main.bc}))))
+   (run
+    %{bin:js_of_ocaml}
+    check-runtime
+    +dynlink.js
+    +toplevel.js
+    %{dep:main.bc}))))
 
 (rule
  (targets unix-unix.output5)
@@ -73,7 +93,12 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js %{dep:unix.bc}))))
+   (run
+    %{bin:js_of_ocaml}
+    check-runtime
+    +dynlink.js
+    +toplevel.js
+    %{dep:unix.bc}))))
 
 (rule
  (targets unix-win32.output5)
@@ -86,4 +111,9 @@
  (action
   (with-stdout-to
    %{targets}
-   (run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js %{dep:unix.bc}))))
+   (run
+    %{bin:js_of_ocaml}
+    check-runtime
+    +dynlink.js
+    +toplevel.js
+    %{dep:unix.bc}))))
diff --git a/compiler/tests-check-prim/main.output b/compiler/tests-check-prim/main.output
@@ -39,7 +39,6 @@ caml_atomic_cas
 caml_atomic_exchange
 caml_atomic_fetch_add
 caml_atomic_load
-caml_atomic_make_contended
 caml_domain_dls
 caml_domain_dls_get
 caml_domain_dls_set
@@ -75,7 +74,6 @@ jsoo_create_file
 jsoo_create_file_extern
 
 From +gc.js:
-caml_memprof_discard
 caml_memprof_set
 
 From +graphics.js:
@@ -136,8 +134,6 @@ caml_mod
 
 From +io.js:
 caml_input_value_to_outside_heap
-caml_ml_input_bigarray
-caml_ml_output_bigarray
 
 From +jslib.js:
 caml_is_js
@@ -175,18 +171,6 @@ caml_obj_is_block
 caml_obj_is_shared
 caml_obj_update_tag
 
-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_read_poll
-caml_runtime_events_user_register
-caml_runtime_events_user_resolve
-caml_runtime_events_user_write
-
 From +stdlib.js:
 caml_build_symbols
 caml_is_printable
@@ -218,7 +202,6 @@ caml_register_channel_for_spacetime
 caml_set_static_env
 caml_spacetime_enabled
 caml_spacetime_only_works_for_native_code
-caml_sys_is_regular_file
 
 From +toplevel.js:
 caml_dynlink_get_bytecode_sections
diff --git a/compiler/tests-check-prim/unix-unix.output b/compiler/tests-check-prim/unix-unix.output
@@ -148,7 +148,6 @@ caml_atomic_cas
 caml_atomic_exchange
 caml_atomic_fetch_add
 caml_atomic_load
-caml_atomic_make_contended
 caml_domain_dls
 caml_domain_dls_get
 caml_domain_dls_set
@@ -184,7 +183,6 @@ jsoo_create_file
 jsoo_create_file_extern
 
 From +gc.js:
-caml_memprof_discard
 caml_memprof_set
 
 From +graphics.js:
@@ -245,8 +243,6 @@ caml_mod
 
 From +io.js:
 caml_input_value_to_outside_heap
-caml_ml_input_bigarray
-caml_ml_output_bigarray
 
 From +jslib.js:
 caml_is_js
@@ -284,18 +280,6 @@ caml_obj_is_block
 caml_obj_is_shared
 caml_obj_update_tag
 
-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_read_poll
-caml_runtime_events_user_register
-caml_runtime_events_user_resolve
-caml_runtime_events_user_write
-
 From +stdlib.js:
 caml_build_symbols
 caml_is_printable
@@ -327,7 +311,6 @@ caml_register_channel_for_spacetime
 caml_set_static_env
 caml_spacetime_enabled
 caml_spacetime_only_works_for_native_code
-caml_sys_is_regular_file
 
 From +toplevel.js:
 caml_dynlink_get_bytecode_sections
diff --git a/compiler/tests-check-prim/unix-win32.output b/compiler/tests-check-prim/unix-win32.output
@@ -149,7 +149,6 @@ jsoo_create_file
 jsoo_create_file_extern
 
 From +gc.js:
-caml_memprof_discard
 caml_memprof_set
 
 From +graphics.js:
@@ -210,8 +209,6 @@ caml_mod
 
 From +io.js:
 caml_input_value_to_outside_heap
-caml_ml_input_bigarray
-caml_ml_output_bigarray
 
 From +jslib.js:
 caml_is_js
@@ -249,18 +246,6 @@ caml_obj_is_block
 caml_obj_is_shared
 caml_obj_update_tag
 
-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_read_poll
-caml_runtime_events_user_register
-caml_runtime_events_user_resolve
-caml_runtime_events_user_write
-
 From +stdlib.js:
 caml_build_symbols
 caml_is_printable
@@ -292,7 +277,6 @@ caml_register_channel_for_spacetime
 caml_set_static_env
 caml_spacetime_enabled
 caml_spacetime_only_works_for_native_code
-caml_sys_is_regular_file
 
 From +toplevel.js:
 caml_dynlink_get_bytecode_sections
diff --git a/runtime/js/runtime_events.js b/runtime/js/runtime_events.js
@@ -17,6 +17,7 @@ function caml_runtime_events_user_write(event, event_content) {
 }
 
 //Provides: caml_runtime_events_user_resolve
+//Version: >= 5.0
 function caml_runtime_events_user_resolve() {
   return 0;
 }
@@ -28,7 +29,7 @@ function caml_ml_runtime_events_start() {
 }
 
 //Provides: caml_runtime_events_start
-//Version: < 5.2
+//Version: >= 5.0, < 5.2
 function caml_runtime_events_start() {
   return 0;
 }
@@ -40,7 +41,7 @@ function caml_ml_runtime_events_pause() {
 }
 
 //Provides: caml_runtime_events_pause
-//Version: < 5.2
+//Version: >= 5.0, < 5.2
 function caml_runtime_events_pause() {
   return 0;
 }
@@ -52,7 +53,7 @@ function caml_ml_runtime_events_are_active() {
 }
 
 //Provides: caml_runtime_events_resume
-//Version: < 5.2
+//Version: >=5.0, < 5.2
 function caml_runtime_events_resume() {
   return 0;
 }
@@ -64,16 +65,19 @@ function caml_ml_runtime_events_resume() {
 }
 
 //Provides: caml_runtime_events_create_cursor
+//Version: >= 5.0
 function caml_runtime_events_create_cursor(target) {
   return {};
 }
 
 //Provides: caml_runtime_events_free_cursor
+//Version: >= 5.0
 function caml_runtime_events_free_cursor(cursor) {
   return 0;
 }
 
 //Provides: caml_runtime_events_read_poll
+//Version: >= 5.0
 function caml_runtime_events_read_poll(cursor, callbacks, num) {
   return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ function caml_runtime_events_user_write(event, event_content) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`//Provides: caml_runtime_events_user_resolve`
	`20`	`+//Version: >= 5.0`
`20`	`21`	`function caml_runtime_events_user_resolve() {`
`21`	`22`	`return 0;`
`22`	`23`	`}`
`@@ -28,7 +29,7 @@ function caml_ml_runtime_events_start() {`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`//Provides: caml_runtime_events_start`
`31`		`-//Version: < 5.2`
	`32`	`+//Version: >= 5.0, < 5.2`
`32`	`33`	`function caml_runtime_events_start() {`
`33`	`34`	`return 0;`
`34`	`35`	`}`
`@@ -40,7 +41,7 @@ function caml_ml_runtime_events_pause() {`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`//Provides: caml_runtime_events_pause`
`43`		`-//Version: < 5.2`
	`44`	`+//Version: >= 5.0, < 5.2`
`44`	`45`	`function caml_runtime_events_pause() {`
`45`	`46`	`return 0;`
`46`	`47`	`}`
`@@ -52,7 +53,7 @@ function caml_ml_runtime_events_are_active() {`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`//Provides: caml_runtime_events_resume`
`55`		`-//Version: < 5.2`
	`56`	`+//Version: >=5.0, < 5.2`
`56`	`57`	`function caml_runtime_events_resume() {`
`57`	`58`	`return 0;`
`58`	`59`	`}`
`@@ -64,16 +65,19 @@ function caml_ml_runtime_events_resume() {`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`//Provides: caml_runtime_events_create_cursor`
	`68`	`+//Version: >= 5.0`
`67`	`69`	`function caml_runtime_events_create_cursor(target) {`
`68`	`70`	`return {};`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`//Provides: caml_runtime_events_free_cursor`
	`74`	`+//Version: >= 5.0`
`72`	`75`	`function caml_runtime_events_free_cursor(cursor) {`
`73`	`76`	`return 0;`
`74`	`77`	`}`
`75`	`78`
`76`	`79`	`//Provides: caml_runtime_events_read_poll`
	`80`	`+//Version: >= 5.0`
`77`	`81`	`function caml_runtime_events_read_poll(cursor, callbacks, num) {`
`78`	`82`	`return 0;`
`79`	`83`	`}`