--- gcc/config/i386/t-next	2018/04/24 18:10:27	1.1.1.1
+++ gcc/config/i386/t-next	2018/04/24 18:30:45	1.1.1.3
@@ -1,5 +1,9 @@
 # libgcc1.c is not needed, since the standard library has these functions.
-LIBGCC1=
+LIBGCC1=libgcc1.null
+CROSS_LIBGCC1=libgcc1.null
 
 # Specify other dirs of system header files to be fixed.
 OTHER_FIXINCLUDES_DIRS= /LocalDeveloper/Headers
+
+# <limits.h> is sometimes in /usr/include/ansi/limits.h.
+LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h -o -f $(SYSTEM_HEADER_DIR)/ansi/limits.h ]