Index: sys/boot/i386/boot0/Makefile
===================================================================
--- sys/boot/i386/boot0/Makefile
+++ sys/boot/i386/boot0/Makefile
@@ -78,6 +78,3 @@
 LDFLAGS=${LDFLAGS_BIN}
 
 .include <bsd.prog.mk>
-
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.boot0.S=		${CLANG_NO_IAS}
Index: sys/boot/i386/boot2/Makefile
===================================================================
--- sys/boot/i386/boot2/Makefile
+++ sys/boot/i386/boot2/Makefile
@@ -103,6 +103,3 @@
 .endif
 
 .include <bsd.prog.mk>
-
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.boot1.S=		${CLANG_NO_IAS}
Index: sys/boot/i386/btx/btx/Makefile
===================================================================
--- sys/boot/i386/btx/btx/Makefile
+++ sys/boot/i386/btx/btx/Makefile
@@ -28,6 +28,3 @@
 LDFLAGS=${LDFLAGS_BIN}
 
 .include <bsd.prog.mk>
-
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.btx.S=		${CLANG_NO_IAS}
Index: sys/boot/i386/btx/btxldr/Makefile
===================================================================
--- sys/boot/i386/btx/btxldr/Makefile
+++ sys/boot/i386/btx/btxldr/Makefile
@@ -16,6 +16,3 @@
 LDFLAGS=${LDFLAGS_BIN}
 
 .include <bsd.prog.mk>
-
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.btxldr.S=	${CLANG_NO_IAS}
Index: sys/boot/i386/cdboot/Makefile
===================================================================
--- sys/boot/i386/cdboot/Makefile
+++ sys/boot/i386/cdboot/Makefile
@@ -13,6 +13,3 @@
 LDFLAGS=${LDFLAGS_BIN}
 
 .include <bsd.prog.mk>
-
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.cdboot.S=	${CLANG_NO_IAS}
Index: sys/boot/i386/gptboot/Makefile
===================================================================
--- sys/boot/i386/gptboot/Makefile
+++ sys/boot/i386/gptboot/Makefile
@@ -88,6 +88,3 @@
 .endif
 
 .include <bsd.prog.mk>
-
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.gptldr.S=	${CLANG_NO_IAS}
Index: sys/boot/i386/gptzfsboot/Makefile
===================================================================
--- sys/boot/i386/gptzfsboot/Makefile
+++ sys/boot/i386/gptzfsboot/Makefile
@@ -99,6 +99,3 @@
 .endif
 
 .include <bsd.prog.mk>
-
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.gptldr.S=	${CLANG_NO_IAS}
Index: sys/boot/i386/libi386/Makefile
===================================================================
--- sys/boot/i386/libi386/Makefile
+++ sys/boot/i386/libi386/Makefile
@@ -73,10 +73,6 @@
 
 .include <bsd.lib.mk>
 
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.amd64_tramp.S=	${CLANG_NO_IAS}
-CFLAGS.multiboot_tramp.S=	${CLANG_NO_IAS}
-
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend ${OBJS}: machine
 .endif
Index: sys/boot/i386/pxeldr/Makefile
===================================================================
--- sys/boot/i386/pxeldr/Makefile
+++ sys/boot/i386/pxeldr/Makefile
@@ -43,6 +43,3 @@
 	    -b ${BTXKERN} ${LOADERBIN}
 
 .include <bsd.prog.mk>
-
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.pxeldr.S=	${CLANG_NO_IAS}
Index: sys/boot/i386/zfsboot/Makefile
===================================================================
--- sys/boot/i386/zfsboot/Makefile
+++ sys/boot/i386/zfsboot/Makefile
@@ -95,6 +95,3 @@
 .endif
 
 .include <bsd.prog.mk>
-
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.zfsldr.S=	${CLANG_NO_IAS}