  	    (if (equal ".." (file-name-nondirectory filename))
  		(setq filename
  		      (directory-file-name (file-name-directory (directory-file-name dir)))
+diff --git a/lisp/loadup.el b/lisp/loadup.el
+--- a/lisp/loadup.el
++++ b/lisp/loadup.el
+@@ -68,7 +68,7 @@
+     ;; Hash consing saved around 11% of pure space in my tests.
+     (setq purify-flag (make-hash-table :test 'equal :size 70000)))
+ 
+-(message "Using load-path %s" load-path)
++;; (message "Using load-path %s" load-path)
+ 
+ (if (or (member (nth 3 command-line-args) '("dump" "bootstrap"))
+ 	(member (nth 4 command-line-args) '("dump" "bootstrap")))
 diff --git a/src/Makefile.in b/src/Makefile.in
 --- a/src/Makefile.in
 +++ b/src/Makefile.in

 
   modtime = invalid_emacs_time ();
   if (visiting)
diff --git a/src/vm-limit.c b/src/vm-limit.c
--- a/src/vm-limit.c
+++ b/src/vm-limit.c

       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of pending output formalism" >&5
 $as_echo_n "checking for style of pending output formalism... " >&6; }
                   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15929,7 +15935,7 @@ if ${emacs_cv_usable_FIONREAD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $opsys in
-     aix4-2)
+     aix4-2 | nacl)
               emacs_cv_usable_FIONREAD=no
        ;;
 
@@ -24659,7 +24665,7 @@ LD_FIRSTFLAG=
 ORDINARY_LINK=
 case "$opsys" in
