flambda-backend: Revert "Restructure LIBDIR" (oxcaml#1093)

Revert "Restructure LIBDIR: Move Dynlink, Str and Unix to sub-directories (port PR#11198) (oxcaml#895)"

This reverts commit 56db52f.

Author: gretay-js

.depend

@@ -6257,7 +6257,6 @@ driver/compmisc.cmx : \
     utils/clflags.cmx \
     driver/compmisc.cmi
 driver/compmisc.cmi : \
-    utils/load_path.cmi \
     typing/env.cmi \
     utils/clflags.cmi
 driver/errors.cmo : \

Makefile.common-jst

@@ -202,12 +202,11 @@ install_for_test: _install
 	 done; \
 	 ln -s . lex; ln -s . yacc; \
 	 ln -s _install/lib/ocaml/compiler-libs compilerlibs; \
-	 mkdir -p otherlibs/{unix,dynlink/native,str,bigarray}; \
+	 mkdir -p otherlibs/{unix,dynlink/native,str}; \
 	 ln -s ../stdlib/threads otherlibs/systhreads; \
-         $(cpl) stdlib/unix/{lib,}unix* otherlibs/unix; \
-         $(cpl) stdlib/dynlink/dynlink* otherlibs/dynlink; \
-         $(cpl) stdlib/str/{lib,}str* otherlibs/str; \
-         ${cpl} stdlib/bigarray/bigarray* otherlibs/bigarray; \
+	 $(cpl) stdlib/{lib,}unix* otherlibs/unix; \
+	 $(cpl) stdlib/dynlink* otherlibs/dynlink; \
+	 $(cpl) stdlib/{lib,}str* otherlibs/str; \
 	 ln -s ../_build/main/$(ocamldir)/toplevel/byte/.ocamltoplevel.objs/byte toplevel; \
 	)
 
@@ -219,7 +218,6 @@ install_for_test: _install
 	cp $(main_build)/$(ocamldir)/.ocamlcommon.objs/byte/*.cmo _runtest/utils
 	rm -f _runtest/utils/{topdirs,opttopdirs}.cmi
 	cp _install/lib/ocaml/*.{cmi,cma,a,cmxa} _runtest/utils
-	cp _install/lib/ocaml/{unix,str,dynlink,bigarray}/*.{cmi,cma,a,cmxa} _runtest/utils
 	cp $(main_build)/$(ocamldir)/.ocamlcommon.objs/native/config.o _runtest/utils
 	# Needed for tests/warnings
 	cp $(ocamldir)/utils/warnings.ml _runtest/utils

compilerlibs/Makefile.compilerlibs

@@ -31,10 +31,10 @@ UTILS = \
   utils/identifiable.cmo \
   utils/numbers.cmo \
   utils/arg_helper.cmo \
-  utils/local_store.cmo \
-  utils/load_path.cmo \
   utils/clflags.cmo \
   utils/profile.cmo \
+  utils/local_store.cmo \
+  utils/load_path.cmo \
   utils/terminfo.cmo \
   utils/ccomp.cmo \
   utils/warnings.cmo \

debugger/.depend

@@ -72,7 +72,6 @@ command_line.cmo : \
     debugger_lexer.cmi \
     debugger_config.cmi \
     debugcom.cmi \
-    ../driver/compmisc.cmi \
     checkpoints.cmi \
     breakpoints.cmi \
     command_line.cmi
@@ -110,7 +109,6 @@ command_line.cmx : \
     debugger_lexer.cmx \
     debugger_config.cmx \
     debugcom.cmx \
-    ../driver/compmisc.cmx \
     checkpoints.cmx \
     breakpoints.cmx \
     command_line.cmi
@@ -329,7 +327,6 @@ main.cmo : \
     exec.cmi \
     debugger_config.cmi \
     ../utils/config.cmi \
-    ../driver/compmisc.cmi \
     command_line.cmi \
     ../file_formats/cmi_format.cmi \
     ../utils/clflags.cmi \
@@ -352,7 +349,6 @@ main.cmx : \
     exec.cmx \
     debugger_config.cmx \
     ../utils/config.cmx \
-    ../driver/compmisc.cmx \
     command_line.cmx \
     ../file_formats/cmi_format.cmx \
     ../utils/clflags.cmx \
@@ -480,7 +476,6 @@ program_management.cmo : \
     history.cmi \
     ../typing/envaux.cmi \
     debugger_config.cmi \
-    ../driver/compmisc.cmi \
     breakpoints.cmi \
     program_management.cmi
 program_management.cmx : \
@@ -498,7 +493,6 @@ program_management.cmx : \
     history.cmx \
     ../typing/envaux.cmx \
     debugger_config.cmx \
-    ../driver/compmisc.cmx \
     breakpoints.cmx \
     program_management.cmi
 program_management.cmi :

debugger/command_line.ml

@@ -262,7 +262,7 @@ let instr_dir ppf lexbuf =
   let new_directory = argument_list_eol argument lexbuf in
     if new_directory = [] then begin
       if yes_or_no "Reinitialize directory list" then begin
-        Load_path.init ~auto_include:Compmisc.auto_include !default_load_path;
+        Load_path.init !default_load_path;
         Envaux.reset_cache ~preserve_persistent_env:false;
         Hashtbl.clear Debugger_config.load_path_for;
         flush_buffer_list ()

debugger/main.ml

@@ -230,7 +230,7 @@ let main () =
     if !Parameters.version
     then printf "\tOCaml Debugger version %s@.@." Config.version;
     Loadprinter.init();
-    Load_path.init ~auto_include:Compmisc.auto_include !default_load_path;
+    Load_path.init !default_load_path;
     Clflags.recursive_types := true;    (* Allow recursive types. *)
     toplevel_loop ();                   (* Toplevel. *)
     kill_program ();

debugger/program_management.ml

@@ -128,8 +128,7 @@ let initialize_loading () =
   end;
   Symbols.clear_symbols ();
   Symbols.read_symbols 0 !program_name;
-  let dirs = Load_path.get_paths () @ !Symbols.program_source_dirs in
-  Load_path.init ~auto_include:Compmisc.auto_include dirs;
+  Load_path.init (Load_path.get_paths () @ !Symbols.program_source_dirs);
   Envaux.reset_cache ~preserve_persistent_env:false;
   if !debug_loading then
     prerr_endline "Opening a socket...";

driver/compenv.ml

@@ -261,7 +261,6 @@ let read_one_param ppf position name v =
   | "noassert" -> set "noassert" [ noassert ] v
   | "noautolink" -> set "noautolink" [ no_auto_link ] v
   | "nostdlib" -> set "nostdlib" [ no_std_include ] v
-  | "nocwd" -> set "nocwd" [ no_cwd ] v
   | "linkall" -> set "linkall" [ link_everything ] v
   | "nolabels" -> set "nolabels" [ classic ] v
   | "principal" -> set "principal"  [ principal ] v

driver/compmisc.ml

@@ -13,16 +13,8 @@
 (*                                                                        *)
 (**************************************************************************)
 
-let auto_include find_in_dir fn =
-  if !Clflags.no_std_include then
-    raise Not_found
-  else
-    let alert = Location.auto_include_alert in
-    Load_path.auto_include_otherlibs alert find_in_dir fn
-
 (* Initialize the search path.
-   [dir] (default: the current directory)
-   is always searched first  unless -nocwd is specified,
+   [dir] is always searched first (default: the current directory),
    then the directories specified with the -I option (in command-line order),
    then the standard library directory (unless the -nostdlib option is given).
  *)
@@ -38,13 +30,8 @@ let init_path ?(dir="") () =
     !Compenv.first_include_dirs
   in
   let exp_dirs =
-    List.map (Misc.expand_directory Config.standard_library) dirs
-  in
-  let dirs =
-    (if !Clflags.no_cwd then [] else [dir])
-    @ List.rev_append exp_dirs (Clflags.std_include_dir ())
-  in
-  Load_path.init ~auto_include dirs;
+    List.map (Misc.expand_directory Config.standard_library) dirs in
+  Load_path.init (dir :: List.rev_append exp_dirs (Clflags.std_include_dir ()));
   Env.reset_cache ~preserve_persistent_env:false
 
 (* Return the initial environment in which compilation proceeds. *)

driver/compmisc.mli

@@ -22,10 +22,3 @@ val read_clflags_from_env : unit -> unit
 
 val with_ppf_dump : ?stdout:unit ->
   file_prefix:string -> (Format.formatter -> 'a) -> 'a
-
-val auto_include :
-  (Load_path.Dir.t -> string -> string option) -> string -> string
-(** [auto_include find_in_dir fn] is a callback function to be passed to
-    {!Load_path.init} and automatically adds [-I +lib] to the load path after
-    displaying an alert. *)
-