--- gcc/cross-make	2018/04/24 18:03:07	1.1.1.3
+++ gcc/cross-make	2018/04/24 18:13:03	1.1.1.5
@@ -1,9 +1,7 @@
-# This variable gets added to GCC_CFLAGS.
-CROSS_GCC_CFLAGS = -B$(tooldir)/bin/
-
-# Expect user to provide libgcc1.a,
-# and give up immediately if the user has not done so.
-LIBGCC1 = libgcc1.cross
+# Build libgcc1.a for a cross-compiler.
+# By default this expects the user to provide libgcc1.a,
+# and gives up immediately if the user has not done so.
+LIBGCC1 = $(CROSS_LIBGCC1)
 
 # Specify tools and options for manipulating libraries for the target machine.
 AR = $(AR_FOR_TARGET)
@@ -13,18 +11,17 @@ OLDAR_FLAGS = $(AR_FOR_TARGET_FLAGS)
 RANLIB = $(RANLIB_FOR_TARGET)
 RANLIB_TEST = $(RANLIB_TEST_FOR_TARGET)
 
-# Cause installation of the cross-compilation tools
-# before we try to build libgcc.a.
-CROSS_TOOLS = install-cross-tools
-
 # Dir to search for system headers.  Normally /usr/include.
-SYSTEM_HEADER_DIR = $(libsubdir)/sys-include
-
-# Cause installation using install-cross.
-INSTALL_TARGET = install-cross
+SYSTEM_HEADER_DIR = $(tooldir)/include
 
 # Don't try to compile the things we can't compile.
 ALL = all.cross
 
+# Use cross-compiler version of float.h.
+FLOAT_H = $(CROSS_FLOAT_H)
+
 # Don't install assert.h in /usr/local/include.
 assertdir = $(tooldir)/include
+
+# Don't run fixproto
+STMP_FIXPROTO =