Misc: promote to 5.2

ocsigen · Apr 27, 2024 · 812a3e7 · 812a3e7
1 parent 1705f0c
commit 812a3e7
Show file tree

Hide file tree

Showing 7 changed files with 5,464 additions and 4,160 deletions.
diff --git a/compiler/tests-check-prim/main.output5 b/compiler/tests-check-prim/main.output5
@@ -10,15 +10,6 @@ caml_dynlink_close_lib
 caml_dynlink_get_current_libs
 caml_dynlink_lookup_symbol
 caml_dynlink_open_lib
-caml_int64_add_native
-caml_int64_and_native
-caml_int64_div_native
-caml_int64_mod_native
-caml_int64_mul_native
-caml_int64_neg_native
-caml_int64_or_native
-caml_int64_sub_native
-caml_int64_xor_native
 caml_int_as_pointer
 caml_reset_afl_instrumentation
 caml_signbit
@@ -44,7 +35,6 @@ caml_bigstring_memcmp
 caml_hash_mix_bigstring
 
 From +domain.js:
-caml_atomic_make_contended
 caml_ml_domain_set_name
 
 From +effect.js:
@@ -63,7 +53,6 @@ caml_eventlog_resume
 caml_gc_huge_fallback_count
 caml_get_major_bucket
 caml_get_major_credit
-caml_memprof_discard
 caml_memprof_set
 
 From +graphics.js:
@@ -119,10 +108,6 @@ From +ints.js:
 caml_div
 caml_mod
 
-From +io.js:
-caml_ml_input_bigarray
-caml_ml_output_bigarray
-
 From +jslib.js:
 caml_is_js
 caml_trampoline
@@ -155,12 +140,10 @@ 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
+caml_runtime_events_user_resolve
 
 From +stdlib.js:
 caml_build_symbols
@@ -188,7 +171,7 @@ caml_spacetime_only_works_for_native_code
 caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
-caml_dynlink_get_bytecode_sections
+caml_get_section_table
 caml_static_alloc
 caml_static_free
 caml_terminfo_backup

diff --git a/compiler/tests-check-prim/unix-unix.output5 b/compiler/tests-check-prim/unix-unix.output5
@@ -10,15 +10,6 @@ caml_dynlink_close_lib
 caml_dynlink_get_current_libs
 caml_dynlink_lookup_symbol
 caml_dynlink_open_lib
-caml_int64_add_native
-caml_int64_and_native
-caml_int64_div_native
-caml_int64_mod_native
-caml_int64_mul_native
-caml_int64_neg_native
-caml_int64_or_native
-caml_int64_sub_native
-caml_int64_xor_native
 caml_int_as_pointer
 caml_reset_afl_instrumentation
 caml_signbit
@@ -92,6 +83,7 @@ caml_unix_outchannel_of_filedescr
 caml_unix_pipe
 caml_unix_putenv
 caml_unix_read
+caml_unix_read_bigarray
 caml_unix_realpath
 caml_unix_recv
 caml_unix_recvfrom
@@ -131,6 +123,7 @@ caml_unix_utimes
 caml_unix_wait
 caml_unix_waitpid
 caml_unix_write
+caml_unix_write_bigarray
 debugger
 is_digit_normalized
 
@@ -153,7 +146,6 @@ caml_bigstring_memcmp
 caml_hash_mix_bigstring
 
 From +domain.js:
-caml_atomic_make_contended
 caml_ml_domain_set_name
 
 From +effect.js:
@@ -172,7 +164,6 @@ caml_eventlog_resume
 caml_gc_huge_fallback_count
 caml_get_major_bucket
 caml_get_major_credit
-caml_memprof_discard
 caml_memprof_set
 
 From +graphics.js:
@@ -228,10 +219,6 @@ From +ints.js:
 caml_div
 caml_mod
 
-From +io.js:
-caml_ml_input_bigarray
-caml_ml_output_bigarray
-
 From +jslib.js:
 caml_is_js
 caml_trampoline
@@ -264,12 +251,10 @@ 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
+caml_runtime_events_user_resolve
 
 From +stdlib.js:
 caml_build_symbols
@@ -297,7 +282,7 @@ caml_spacetime_only_works_for_native_code
 caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
-caml_dynlink_get_bytecode_sections
+caml_get_section_table
 caml_static_alloc
 caml_static_free
 caml_terminfo_backup

diff --git a/compiler/tests-full/dune b/compiler/tests-full/dune
@@ -1,7 +1,7 @@
 (rule
  (targets stdlib.cma.js)
  (enabled_if
-  (= %{ocaml_version} "5.1.1"))
+  (>= %{ocaml_version} "5.1.1"))
  (action
   (run
    %{bin:js_of_ocaml}
@@ -14,7 +14,7 @@
 (rule
  (targets stdlib.cma.output.js)
  (enabled_if
-  (= %{ocaml_version} "5.1.1"))
+  (>= %{ocaml_version} "5.1.1"))
  (action
   (with-stdout-to
    %{targets}
@@ -23,6 +23,6 @@
 (rule
  (alias runtest)
  (enabled_if
-  (= %{ocaml_version} "5.1.1"))
+  (>= %{ocaml_version} "5.1.1"))
  (action
   (diff stdlib.cma.expected.js stdlib.cma.output.js)))