diff --git a/contrib/gcc-4.1/gcc/toplev.h b/contrib/gcc-4.1/gcc/toplev.h
index 35d53eb..beab8fa 100644
--- a/contrib/gcc-4.1/gcc/toplev.h
+++ b/contrib/gcc-4.1/gcc/toplev.h
@@ -171,6 +171,7 @@ extern int floor_log2                  (unsigned HOST_WIDE_INT);
 #  define CTZ_HWI __builtin_ctz
 # endif
 
+#if 0
 extern inline int
 floor_log2 (unsigned HOST_WIDE_INT x)
 {
@@ -182,6 +183,7 @@ exact_log2 (unsigned HOST_WIDE_INT x)
 {
   return x == (x & -x) && x ? (int) CTZ_HWI (x) : -1;
 }
+#endif
 #endif /* GCC_VERSION >= 3004 */
 
 /* Functions used to get and set GCC's notion of in what directory
diff --git a/lib/csu/i386/Makefile.csu b/lib/csu/i386/Makefile.csu
index 6c30f68..dc8496b 100644
--- a/lib/csu/i386/Makefile.csu
+++ b/lib/csu/i386/Makefile.csu
@@ -1,6 +1,10 @@
 # $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.6.2.5 2002/11/23 17:44:29 ru Exp $
 # $DragonFly: src/lib/csu/i386/Makefile.csu,v 1.1 2007/01/15 18:01:44 corecode Exp $
 
+.if ${CCVER} == "clang"
+CCVER=	gcc41
+.endif
+
 SRCS+=		crt1.c crti.S crtn.S
 OBJS+=		gcrt1.o
 INSTALLOBJS+=	crt1.o crti.o crtn.o gcrt1.o
diff --git a/sys/boot/pc32/boot2/Makefile b/sys/boot/pc32/boot2/Makefile
index 10932b7..45d5972 100644
--- a/sys/boot/pc32/boot2/Makefile
+++ b/sys/boot/pc32/boot2/Makefile
@@ -1,6 +1,10 @@
 # $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.47 2003/06/26 03:51:57 peter Exp $
 # $DragonFly: src/sys/boot/pc32/boot2/Makefile,v 1.18 2008/09/13 11:45:45 corecode Exp $
 
+.if ${CCVER} == "clang"
+CCVER=	gcc41
+.endif
+
 BINDIR?=	/boot
 BINMODE=	444
 CLEANFILES=	boot \