diff -ruN src-orig/nt/mingw-cfg.site src/nt/mingw-cfg.site
--- src-orig/nt/mingw-cfg.site	2020-12-22 15:36:18.429108443 +0000
+++ src/nt/mingw-cfg.site	2020-12-22 15:37:18.099953457 +0000
@@ -156,3 +156,5 @@
 # We don't want to build Emacs so it depends on bcrypt.dll, since then
 # it will refuse to start on systems where that DLL is absent.
 gl_cv_lib_assume_bcrypt=no
+# force strsignal from gnulib to be used (cf https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45303#83)
+ac_cv_func_strsignal=no
diff -ruN src-orig/src/comp.c src/src/comp.c
--- src-orig/src/comp.c	2020-12-22 15:36:18.437108289 +0000
+++ src/src/comp.c	2020-12-22 15:37:59.411152358 +0000
@@ -4534,7 +4534,7 @@
 				   concat2 (XCAR (dir_tail),
 					    Vcomp_native_version_dir),
 				   Qt, build_string ("\\.eln\\.old\\'"), Qnil,
-				   Qt, Qnil, return_nil);
+				   Qnil, Qt, return_nil);
       FOR_EACH_TAIL (files_in_dir)
 	Fdelete_file (XCAR (files_in_dir), Qnil);
     }