Index: head/lib/libgcc_s/Makefile
===================================================================
--- head/lib/libgcc_s/Makefile
+++ head/lib/libgcc_s/Makefile
@@ -28,12 +28,18 @@
 SRCS+=		s_fabsl.c
 SRCS+=		s_fmax.c
 SRCS+=		s_fmaxf.c
-SRCS+=		s_fmaxl.c
 SRCS+=		s_logb.c
 SRCS+=		s_logbf.c
-SRCS+=		s_logbl.c
 SRCS+=		s_scalbn.c
 SRCS+=		s_scalbnf.c
+
+# Don't include long double routines on architectures where long double
+# is the same size as double.
+.if ${MACHINE_CPUARCH} != "mips" && ${MACHINE_CPUARCH} != "arm" &&
+    ${MACHINE_CPUARCH} != "powerpc"
+SRCS+=		s_fmaxl.c
+SRCS+=		s_logbl.c
 SRCS+=		s_scalbnl.c
+.endif
 
 .include <bsd.lib.mk>