flambda-backend: more runtime/ -> runtime4/

Author: mshinwell

manual/src/Makefile

@@ -1,7 +1,7 @@
 ROOTDIR = ../..
 include $(ROOTDIR)/Makefile.common
 
-TEXQUOTE = $(ROOTDIR)/runtime/ocamlrun ../tools/texquote2
+TEXQUOTE = $(ROOTDIR)/runtime4/ocamlrun ../tools/texquote2
 
 DIRS = infoman texstuff textman
 

manual/src/library/Makefile

@@ -1,7 +1,7 @@
 ROOTDIR = ../../..
 include $(ROOTDIR)/Makefile.common
 
-TEXQUOTE = $(ROOTDIR)/runtime/ocamlrun ../../tools/texquote2
+TEXQUOTE = $(ROOTDIR)/runtime4/ocamlrun ../../tools/texquote2
 LD_PATH = $(ROOTDIR)/otherlibs/str $(ROOTDIR)/otherlibs/unix
 CAMLLATEX = $(OCAMLRUN) $(addprefix -I ,$(LD_PATH)) \
   $(ROOTDIR)/tools/ocamltex -repo-root $(ROOTDIR) -n 80 -v false

runtime4/arm.S

@@ -126,7 +126,7 @@ caml_hot__code_end:
 #define DOMAIN_STATE(c_type, name) \
         .equ    domain_field_caml_##name, domain_curr_field ; \
         .set    domain_curr_field, domain_curr_field + 1
-#include "../runtime/caml/domain_state.tbl"
+#include "../runtime4/caml/domain_state.tbl"
 #undef DOMAIN_STATE
 
 #define Caml_state(var) [domain_state_ptr, 8*domain_field_caml_##var]

testsuite/tests/lib-dynlink-csharp/main.ml

@@ -34,7 +34,7 @@ program = "main_obj.${objext}"
 all_modules = "dynlink.cma entry.c main.ml"
 ****** script
 script = "${mkdll} -maindll -o main.dll main_obj.${objext} entry.${objext} \
-                   ${ocamlsrcdir}/runtime/libcamlrun.${libext} ${bytecc_libs}"
+                   ${ocamlsrcdir}/runtime4/libcamlrun.${libext} ${bytecc_libs}"
 ******* script
 script = "${csharp_cmd}"
 ******** run
@@ -70,7 +70,7 @@ program = "main_obj.${objext}"
 all_modules = "dynlink.cmxa entry.c main.ml"
 ****** script
 script = "${mkdll} -maindll -o main.dll main_obj.${objext} entry.${objext} \
-                   ${ocamlsrcdir}/runtime/libasmrun.${libext} ${nativecc_libs}"
+                   ${ocamlsrcdir}/runtime4/libasmrun.${libext} ${nativecc_libs}"
 ******* script
 script = "${csharp_cmd}"
 ******** run

testsuite/tests/lib-unix/unix-execvpe/has-execvpe.sh

@@ -5,7 +5,7 @@
 # It makes sense to run the tests only if execvpe is nt implemented.
 # If it is implemented, the test is skipped.
 
-if grep -q "#define HAS_EXECVPE" ${ocamlsrcdir}/runtime/caml/s.h; then
+if grep -q "#define HAS_EXECVPE" ${ocamlsrcdir}/runtime4/caml/s.h; then
   exit ${TEST_SKIP};
 fi
 exit ${TEST_PASS}

testsuite/tests/output-complete-obj/github9344.ml

@@ -4,7 +4,7 @@ use_runtime = "false"
 
 * setup-ocamlc.byte-build-env
 ** ocamlc.byte
-flags = "-w -a -output-complete-exe -ccopt -I${ocamlsrcdir}/runtime"
+flags = "-w -a -output-complete-exe -ccopt -I${ocamlsrcdir}/runtime4"
 program = "github9344"
 *** run
 program = "sh ${test_source_directory}/github9344.sh"

testsuite/tests/output-complete-obj/test.ml

@@ -7,7 +7,7 @@ readonly_files = "test.ml_stub.c"
 flags = "-w -a -output-complete-obj"
 program = "test.ml.bc.${objext}"
 *** script
-script = "${mkexe} -I${ocamlsrcdir}/runtime -o test.ml_bc_stub.exe \
+script = "${mkexe} -I${ocamlsrcdir}/runtime4 -o test.ml_bc_stub.exe \
                    test.ml.bc.${objext} ${nativecc_libs} test.ml_stub.c"
 output = "${compiler_output}"
 **** run
@@ -19,7 +19,7 @@ stderr = "program-output"
 flags = "-w -a -output-complete-obj"
 program = "test.ml.exe.${objext}"
 *** script
-script = "${mkexe} -I${ocamlsrcdir}/runtime -o test.ml_stub.exe \
+script = "${mkexe} -I${ocamlsrcdir}/runtime4 -o test.ml_stub.exe \
                    test.ml.exe.${objext} ${bytecc_libs} test.ml_stub.c"
 output = "${compiler_output}"
 **** run

testsuite/tests/output-complete-obj/test2.ml

@@ -8,7 +8,7 @@ unset FOO
 include unix
 ** setup-ocamlc.byte-build-env
 *** ocamlc.byte
-flags = "-w -a -output-complete-exe puts.c -ccopt -I${ocamlsrcdir}/runtime"
+flags = "-w -a -output-complete-exe puts.c -ccopt -I${ocamlsrcdir}/runtime4"
 program = "test2"
 **** run
 program = "./test2"

testsuite/tests/runtime-naked-pointers/runtest.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if grep -q "#define NAKED_POINTERS_CHECKER" ${ocamlsrcdir}/runtime/caml/m.h \
+if grep -q "#define NAKED_POINTERS_CHECKER" ${ocamlsrcdir}/runtime4/caml/m.h \
 && (echo ${program} | grep -q '\.opt')
 then
   (${program} > ${output}) 2>&1 | grep -q '^Out-of-heap '