flambda-backend: Minor fixes for runtime4/

ocaml-flambda · Nov 2, 2023 · b09ffe3 · b09ffe3
1 parent 80059c6
commit b09ffe3
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -651,7 +651,6 @@ runtime_COMMON_C_SOURCES = \
   signals \
   simd \
   skiplist \
-  stacks \
   startup_aux \
   str \
   sys \
@@ -665,6 +664,7 @@ runtime_BYTECODE_ONLY_C_SOURCES = \
   interp \
   roots_byt \
   signals_byt \
+  stacks \
   startup_byt
 runtime_BYTECODE_C_SOURCES = \
   $(runtime_COMMON_C_SOURCES:%=runtime4/%.c) \

diff --git a/Makefile.build_config.in b/Makefile.build_config.in
@@ -52,7 +52,7 @@ COMPUTE_DEPS=@compute_deps@
 
 # Build-system flags to use to compile C files
 OC_CFLAGS=@oc_cflags@
-OC_CPPFLAGS=-I$(ROOTDIR)/runtime @oc_cppflags@
+OC_CPPFLAGS=-I$(ROOTDIR)/runtime4 @oc_cppflags@
 
 # The following variable defines flags to be passed to the C preprocessor
 # when compiling C files to be linked with native code. This includes
@@ -148,7 +148,7 @@ OC_NATIVE_LINKFLAGS = -g
 LN = @ln@
 
 # Platform-dependent assembler files to use to build the runtime
-runtime_ASM_OBJECTS = $(addprefix runtime/,@runtime_asm_objects@)
+runtime_ASM_OBJECTS = $(addprefix runtime4/,@runtime_asm_objects@)
 
 # Platform-dependent module for ocamlyacc
 ocamlyacc_WSTR_MODULE = @ocamlyacc_wstr_module@
diff --git a/runtime4/Makefile b/runtime4/Makefile
@@ -137,7 +137,7 @@ ifeq "$(TOOLCHAIN)" "msvc"
 ASMFLAGS=
 endif
 
-ASPPFLAGS = -DSYS_$(SYSTEM) -I$(ROOTDIR)/runtime
+ASPPFLAGS = -DSYS_$(SYSTEM) -I$(ROOTDIR)/runtime4
 ifeq "$(UNIX_OR_WIN32)" "unix"
 ASPPFLAGS += -DMODEL_$(MODEL)
 endif

diff --git a/runtime4/arm64.S b/runtime4/arm64.S
@@ -60,7 +60,7 @@
         .equ    domain_field_caml_##name, domain_curr_field ; \
         .set    domain_curr_field, domain_curr_field + 1
 #endif
-#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]

diff --git a/runtime4/i386.S b/runtime4/i386.S
@@ -86,7 +86,7 @@
 #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,reg) 8*domain_field_caml_##var(reg)

diff --git a/runtime4/power.S b/runtime4/power.S
@@ -145,7 +145,7 @@
 #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) 8*domain_field_caml_##var(DOMAIN_STATE_PTR)

diff --git a/runtime4/riscv.S b/runtime4/riscv.S
@@ -46,7 +46,7 @@
 #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) (8*domain_field_caml_##var)(DOMAIN_STATE_PTR)

diff --git a/runtime4/s390x.S b/runtime4/s390x.S
@@ -29,7 +29,7 @@
 #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) 8*domain_field_caml_##var(%r10)

diff --git a/stdlib/Makefile b/stdlib/Makefile
@@ -36,7 +36,7 @@ CAMLOPT=$(OCAMLRUN) $(OPTCOMPILER)
 CAMLDEP=$(BOOT_OCAMLC) -depend
 DEPFLAGS=-slash
 
-OC_CPPFLAGS += -I$(ROOTDIR)/runtime
+OC_CPPFLAGS += -I$(ROOTDIR)/runtime4
 
 include StdlibModules