Work around a problem somewhere with binutils (?) on arm, hopefully without

breaking any other arch this time.

libexec/rtld-elf/Makefile

@@ -1,9 +1,12 @@
 # $FreeBSD$
 
 PROG?=		ld-elf.so.1
+# XXX: Hopefully this won't be needed after the next binutils import.
+.if ${MACHINE_ARCH} != "arm"
 SRCS=		rtld_start.S \
 		reloc.c rtld.c rtld_lock.c map_object.c \
 		malloc.c xmalloc.c debug.c libmap.c
+.endif
 MAN=		rtld.1
 CSTD?=		gnu99
 CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD

libexec/rtld-elf/arm/Makefile.inc

@@ -1 +1,3 @@
 # $FreeBSD$
+SRCS=	reloc.c rtld.c rtld_start.S rtld_lock.c map_object.c \
+	malloc.c xmalloc.c debug.c libmap.c