diff --git a/gcc/config/arm/t-linux b/gcc/config/arm/t-linux
index 194604d7ed1..c6ccfd103b2 100644
--- a/gcc/config/arm/t-linux
+++ b/gcc/config/arm/t-linux
@@ -5,12 +5,15 @@ LIBGCC2_CFLAGS=-O2 -fomit-frame-pointer $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) -g0
 # Don't build enquire
 ENQUIRE=
 
+# Since libgcc1 is an assembler file, we can build it automatically for the
+# cross-compiler.
+CROSS_LIBGCC1 = libgcc1-asm.a
 LIBGCC1 = libgcc1-asm.a
-LIB1ASMSRC = arm/lib1funcs-linux.asm
+LIB1ASMSRC = arm/lib1funcs.asm
 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls
 
-MULTILIB_OPTIONS = m2/m3/m6/m7
-MULTILIB_DIRNAMES =
+MULTILIB_OPTIONS = mapcs-32
+MULTILIB_DIRNAMES = apcs-32
 
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib