--- gcc/cross-make	2018/04/24 18:09:45	1.1.1.4
+++ gcc/cross-make	2018/04/24 18:13:03	1.1.1.5
@@ -1,6 +1,7 @@
-# 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)
@@ -21,3 +22,6 @@ FLOAT_H = $(CROSS_FLOAT_H)
 
 # Don't install assert.h in /usr/local/include.
 assertdir = $(tooldir)/include
+
+# Don't run fixproto
+STMP_FIXPROTO =