master 2d897f7c66: Merge from origin/emacs-28

[Eli Zaretskii]

branch: master
commit 2d897f7c6691b3f72ce43ae1827307653ed9fc0b
Merge: 6548286446 c30106ce9f
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-28
    
    # Conflicts:
    #       lisp/startup.el
---
 lisp/startup.el | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lisp/startup.el b/lisp/startup.el
index 053afa104d..ad4942b7f7 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -541,6 +541,8 @@ DIRS are relative."
   (setq comp--compilable t))
 
 (defvar native-comp-eln-load-path)
+(defvar native-comp-deferred-compilation)
+(defvar comp-enable-subr-trampolines)
 
 (defvar startup--original-eln-load-path nil
   "Original value of `native-comp-eln-load-path'.")
@@ -601,6 +603,14 @@ It is the default value of the variable `top-level'."
     (setq user-emacs-directory
          (startup--xdg-or-homedot startup--xdg-config-home-emacs nil))
 
+    (unless (native-comp-available-p)
+      ;; Disable deferred async compilation and trampoline synthesis
+      ;; in this session.  This is necessary if libgccjit is not
+      ;; available on MS-Windows, but Emacs was built with
+      ;; native-compilation support.
+      (setq native-comp-deferred-compilation nil
+            comp-enable-subr-trampolines nil))
+
     (when (featurep 'native-compile)
       ;; Form the initial value of `native-comp-eln-load-path'.
       (let ((path-env (getenv "EMACSNATIVELOADPATH")))