flambda-backend: Merge ocaml-jst

Author: mshinwell

.depend

@@ -42,21 +42,27 @@
 # the lines involved in the conflict, which is arguably worse
 #/Changes                 merge=union
 
-# No header for text files (would be too obtrusive).
+# No header for text and META files (would be too obtrusive).
 *.md                     typo.missing-header
 README*                  typo.missing-header
 VERSION                  typo.missing-header
 *.adoc                   typo.missing-header
 api_docgen/*.mld                typo.missing-header
 api_docgen/alldoc.tex           typo.missing-header
 tools/mantis2gh_stripped.csv typo.missing-header
+META.in                  typo.missing-header
 
-*.adoc                   typo.long-line=may
+# Hyperlinks and other markup features cause long lines
+*.adoc                   typo.long-line=may typo.very-long-line=may
+*.md                     typo.long-line=may typo.very-long-line=may
 
 # Github templates and scripts lack headers, have long lines
 /.github/**              typo.missing-header typo.long-line=may typo.very-long-line=may
 
 /.mailmap                typo.long-line typo.missing-header typo.non-ascii
+/CONTRIBUTING.md         typo.non-ascii=may
+/README.adoc             typo.non-ascii=may
+/README.win32.adoc       typo.non-ascii=may
 /.merlin                 typo.missing-header
 /Changes                 typo.utf8 typo.missing-header
 /release-info/News       typo.utf8 typo.missing-header
@@ -72,6 +78,9 @@ tools/mantis2gh_stripped.csv typo.missing-header
 .depend                  typo.prune
 /.depend.menhir          typo.prune
 
+# These can be fixed at some point
+/tools/*.py              typo.long-line
+
 # Makefiles may contain tabs
 Makefile*                typo.makefile-whitespace=may
 
@@ -98,12 +107,11 @@ ocamldoc/Changes.txt     typo.missing-header
 ocamldoc/ocamldoc.sty    typo.missing-header
 ocamldoc/odoc_index.html typo.missing-header
 
-otherlibs/win32unix/readlink.c    typo.long-line
-otherlibs/win32unix/stat.c        typo.long-line
-otherlibs/win32unix/symlink.c     typo.long-line
+otherlibs/unix/readlink_win32.c    typo.long-line
+otherlibs/unix/stat_win32.c        typo.long-line
+otherlibs/unix/symlink_win32.c     typo.long-line
 
 runtime/sak.c            typo.non-ascii
-runtime/caml/compatibility.h    typo.very-long-line
 
 stdlib/hashbang     typo.white-at-eol typo.missing-lf
 
@@ -126,6 +134,9 @@ testsuite/tests/**/*.reference               typo.prune
 # Expect tests with overly long lines of expected output
 testsuite/tests/parsing/docstrings.ml        typo.very-long-line
 
+# Generated test with overly long ocamltest description
+testsuite/tests/lib-dynlink-domains/main.ml  typo.very-long-line
+
 # The normalisation tests have very specific line endings which mustn't be
 # corrupted by git.
 testsuite/tests/tool-ocamltest/norm*.reference binary
@@ -182,15 +193,7 @@ tools/ocaml-objcopy-macosx text eol=lf
 tools/ocamlsize text eol=lf
 tools/pre-commit-githook text eol=lf
 tools/markdown-add-pr-links.sh text eol=lf
-runtime/caml/compatibility.h typo.long-line=may
-
-# These are all Perl scripts, so may not actually require this
-manual/tools/caml-tex text eol=lf
-manual/tools/format-intf text eol=lf
-manual/tools/htmlcut text eol=lf
-manual/tools/htmltbl text eol=lf
-manual/tools/htmlthread text eol=lf
-manual/tools/texexpand text eol=lf
+runtime/caml/sizeclasses.h typo.missing-header typo.white-at-eol
 
 # Tests which include references spanning multiple lines fail with \r\n
 # endings, so use \n endings only, even on Windows.