--- gcc/cross-make	2018/04/24 17:53:18	1.1.1.2
+++ gcc/cross-make	2018/04/24 18:03:07	1.1.1.3
@@ -1,5 +1,9 @@
-# Don't build or use libgcc1.
-LIBGCC1 = 
+# 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
 
 # Specify tools and options for manipulating libraries for the target machine.
 AR = $(AR_FOR_TARGET)
@@ -13,8 +17,14 @@ RANLIB_TEST = $(RANLIB_TEST_FOR_TARGET)
 # 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
 
 # Don't try to compile the things we can't compile.
 ALL = all.cross
+
+# Don't install assert.h in /usr/local/include.
+assertdir = $(tooldir)/include