Output native compiled preloaded files into the 'preloaded' subfolder

	* src/comp.c (fixup_eln_load_path): Account the fact that the
	file can be dumped in the 'preloaded' subfolder.
	* lisp/loadup.el: Likewise.
	* src/lread.c (maybe_swap_for_eln1): New function.
	(maybe_swap_for_eln): Handle 'preloaded' subfolder.
	* src/Makefile.in (LISP_PRELOADED): Export preloaded files.

1 files changed, 22 insertions, 7 deletions

diff --git a/src/comp.c b/src/comp.c
index 67c8e39315b..9bad9b9667f 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4091,6 +4091,7 @@ for new compilations.
 If BASE-DIR is nil use the first entry in `comp-eln-load-path'.  */)
   (Lisp_Object filename, Lisp_Object base_dir)
 {
+  Lisp_Object source_filename = filename;
   filename = Fcomp_el_to_eln_rel_filename (filename);
 
   /* If base_dir was not specified search inside Vcomp_eln_load_path
@@ -4129,9 +4130,18 @@ If BASE-DIR is nil use the first entry in `comp-eln-load-path'.  */)
   if (!file_name_absolute_p (SSDATA (base_dir)))
     base_dir = Fexpand_file_name (base_dir, Vinvocation_directory);
 
-  return Fexpand_file_name (filename,
-                            Fexpand_file_name (Vcomp_native_version_dir,
-                                               base_dir));
+  /* In case the file being compiled is found in 'LISP_PRELOADED'
+     target for output the 'preloaded' subfolder.  */
+  Lisp_Object lisp_preloaded =
+    Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil);
+  base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir);
+  if (!NILP (lisp_preloaded)
+      && !NILP (Fmember (CALL1I (file-name-base, source_filename),
+                         Fmapcar (intern_c_string ("file-name-base"),
+                                  CALL1I (split-string, lisp_preloaded)))))
+          base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir);
+
+  return Fexpand_file_name (filename, base_dir);
 }
 
 DEFUN ("comp--install-trampoline", Fcomp__install_trampoline,
@@ -4750,10 +4760,15 @@ fixup_eln_load_path (Lisp_Object directory)
   Lisp_Object eln_cache_sys =
     Ffile_name_directory (concat2 (Vinvocation_directory,
                                    directory));
-  /* One directory up...  */
-  eln_cache_sys =
-    Ffile_name_directory (Fsubstring (eln_cache_sys, Qnil,
-                                      make_fixnum (-1)));
+  bool preloaded =
+    !NILP (Fequal (Fsubstring (eln_cache_sys, make_fixnum (-10),
+                               make_fixnum (-1)),
+                   build_string ("preloaded")));
+  /* One or two directories up...  */
+  for (int i = 0; i < (preloaded ? 2 : 1); i++)
+    eln_cache_sys =
+      Ffile_name_directory (Fsubstring (eln_cache_sys, Qnil,
+                                        make_fixnum (-1)));
   Fsetcar (last_cell, eln_cache_sys);
 }