Move configuration header files from the config to the byterun/caml directory

This commit moves:
  - config/m.h to byterun/caml/m.h
  - config/s.h to byterun/caml/s.h

Consequently, m.h and s.h now get installed alongside other
OCaml header files.

This commit also updates the .depend files, introducing updates in the
dependencies which are not consequences of this commit itself.

Author: shindere

.depend

@@ -205,12 +205,10 @@ typing/env.cmi : utils/warnings.cmi typing/types.cmi typing/subst.cmi \
     typing/path.cmi parsing/longident.cmi parsing/location.cmi \
     typing/ident.cmi utils/consistbl.cmi typing/cmi_format.cmi \
     parsing/asttypes.cmi
-typing/envaux.cmo : typing/types.cmi typing/subst.cmi typing/printtyp.cmi \
-    typing/path.cmi utils/misc.cmi typing/ident.cmi typing/env.cmi \
-    parsing/asttypes.cmi typing/envaux.cmi
-typing/envaux.cmx : typing/types.cmx typing/subst.cmx typing/printtyp.cmx \
-    typing/path.cmx utils/misc.cmx typing/ident.cmx typing/env.cmx \
-    parsing/asttypes.cmi typing/envaux.cmi
+typing/envaux.cmo : typing/subst.cmi typing/printtyp.cmi typing/path.cmi \
+    typing/ident.cmi typing/env.cmi parsing/asttypes.cmi typing/envaux.cmi
+typing/envaux.cmx : typing/subst.cmx typing/printtyp.cmx typing/path.cmx \
+    typing/ident.cmx typing/env.cmx parsing/asttypes.cmi typing/envaux.cmi
 typing/envaux.cmi : typing/subst.cmi typing/path.cmi typing/env.cmi
 typing/ident.cmo : utils/identifiable.cmi typing/ident.cmi
 typing/ident.cmx : utils/identifiable.cmx typing/ident.cmi

.gitignore

@@ -105,6 +105,8 @@
 /bytecomp/opcodes.ml
 
 /byterun/caml/jumptbl.h
+/byterun/caml/m.h
+/byterun/caml/s.h
 /byterun/primitives
 /byterun/prims.c
 /byterun/caml/opnames.h
@@ -119,8 +121,6 @@
 /byterun/*.d.c
 /byterun/*.pic.c
 
-/config/m.h
-/config/s.h
 /config/Makefile
 /config/auto-aux/hashbang4
 

Changes

@@ -115,6 +115,11 @@ Working version
 - GPR#1032: display the output of -dtimings as a hierarchy
   (Valentin Gatien-Baron, review by Gabriel Scherer)
 
+- GPR#1127: move config/{m,s}.h to byterun/caml and install them.
+  User code should not have to include them directly since they are
+  included by other header files
+  (Sébastien Hinderer)
+
 ### Bug fixes
 
 - PR#5927: Type equality broken for conjunctive polymorphic variant tags

INSTALL.adoc

@@ -25,8 +25,8 @@
 
         ./configure
 +
-This generates the three configuration files `Makefile`, `m.h` and `s.h`
-in the `config/` subdirectory.
+This generates the three configuration files `config/Makefile`,
+`byterun/caml/m.h` and `byterun/caml/s.h`.
 +
 The `configure` script accepts the following options:
 +
@@ -313,8 +313,9 @@ In the latter case, the destination directory defaults to the
 Read the "common problems" and "machine-specific hints" section at the end of
 this file.
 
-Check the files `m.h` and `s.h` in `config/`. Wrong endianness or alignment
-constraints in `m.h` will immediately crash the bytecode interpreter.
+Check the files `m.h` and `s.h` in `byterun/caml/`.
+Wrong endianness or alignment constraints in `machine.h` will
+immediately crash the bytecode interpreter.
 
 If you get a "segmentation violation" signal, check the limits on the stack size
 and data segment size (type `limit` under csh or `ulimit -a` under bash). Make

Makefile

@@ -1288,7 +1288,7 @@ depend: beforedepend
 distclean: clean
 	rm -f boot/ocamlrun boot/ocamlrun$(EXE) boot/camlheader \
 	      boot/ocamlyacc boot/*.cm* boot/libcamlrun.$(A)
-	rm -f config/Makefile config/m.h config/s.h
+	rm -f config/Makefile byterun/caml/m.h byterun/caml/s.h
 	rm -f tools/*.bak
 	rm -f ocaml ocamlc
 	rm -f testsuite/_log

README.win32.adoc

@@ -192,8 +192,8 @@ quickly as it will be unable to link `ocamlrun`.
 
 Now run:
 
-        cp config/m-nt.h config/m.h
-        cp config/s-nt.h config/s.h
+        cp config/m-nt.h byterun/caml/m.h
+        cp config/s-nt.h byterun/caml/s.h
 
 followed by:
 
@@ -263,8 +263,8 @@ the WinZip Options Window.)
 
 Now run:
 
-        cp config/m-nt.h config/m.h
-        cp config/s-nt.h config/s.h
+        cp config/m-nt.h byterun/caml/m.h
+        cp config/s-nt.h byterun/caml/s.h
 
 followed by:
 

appveyor_build.sh

@@ -67,8 +67,8 @@ make MSVC_DETECT=0 CHAINS=msvc64 support
 cp flexdll*_msvc64.obj "$PREFIX/bin/flexdll"
 cd ..
 
-cp config/m-nt.h config/m.h
-cp config/s-nt.h config/s.h
+cp config/m-nt.h byterun/caml/m.h
+cp config/s-nt.h byterun/caml/s.h
 
 echo "Edit config/Makefile to set PREFIX=$PREFIX"
 sed -e "s|PREFIX=.*|PREFIX=$PREFIX|" -e "/\(BYTE\|NATIVE\)CCCOMPOPTS=./s/\r\?$/ -WX\0/" config/Makefile.msvc64 > config/Makefile
@@ -81,8 +81,8 @@ run "make opt.opt" make opt.opt
 
 cd ../build-mingw32
 
-cp config/m-nt.h config/m.h
-cp config/s-nt.h config/s.h
+cp config/m-nt.h byterun/caml/m.h
+cp config/s-nt.h caml/byterun/s.h
 
 PREFIX="C:/Program Files/OCaml-mingw32"
 echo "Edit config/Makefile to set PREFIX=$PREFIX"

asmrun/.depend

@@ -58,7 +58,7 @@ endif
 IFLAGS=$(CFLAGS) -DCAML_INSTR
 PICFLAGS=$(CFLAGS) $(SHAREDCCCOMPOPTS)
 
-ASPPFLAGS = -DSYS_$(SYSTEM)
+ASPPFLAGS = -DSYS_$(SYSTEM) -I../byterun
 ifeq "$(UNIX_OR_WIN32)" "unix"
 ASPPFLAGS += -DMODEL_$(MODEL)
 endif

asmrun/Makefile

@@ -18,7 +18,7 @@
 
 /* PIC mode support based on contribution by Paul Stravers (see PR#4795) */
 
-#include "../config/m.h"
+#include "caml/m.h"
 
 #if defined(SYS_macosx)
 

asmrun/amd64.S

@@ -16,7 +16,7 @@
 /* Asm part of the runtime system, Intel 386 processor */
 /* Must be preprocessed by cpp */
 
-#include "../config/m.h"
+#include "caml/m.h"
 
 /* Linux/BSD with ELF binaries and Solaris do not prefix identifiers with _.
    Linux/BSD with a.out binaries and NextStep do. */

asmrun/i386.S

@@ -36,7 +36,7 @@
 #include "caml/sys.h"
 #include "caml/spacetime.h"
 
-#include "../config/s.h"
+#include "caml/s.h"
 
 #ifdef ARCH_SIXTYFOUR