Index: kernel/arch/amd64/Makefile.inc
===================================================================
--- kernel/arch/amd64/Makefile.inc	(revision 52d30c45bd8c0361dfebda500f106036efcd7686)
+++ kernel/arch/amd64/Makefile.inc	(revision 44bec47f0eb1681725cbe7093467b13fbeda89c7)
@@ -36,5 +36,7 @@
 TOOLCHAIN_DIR = /usr/local/amd64
 
-GCC_CFLAGS += -fno-unwind-tables -m64 -mcmodel=kernel -mno-red-zone
+CMN1 = -m64 -mcmodel=kernel -mno-red-zone -fno-unwind-tables
+GCC_CFLAGS += $(CMN1)
+ICC_CFLAGS += $(CMN1)
 SUNCC_CFLAGS += -m64 -xmodel=kernel
 
@@ -45,5 +47,8 @@
 
 ifeq ($(MACHINE),opteron)
-	GCC_CFLAGS += -march=opteron	
+	CMN2 := -march=opteron
+	GCC_CFLAGS += $(CMN2)
+	ICC_CFLAGS += $(CMN2)
+	SUNCC_CFLAGS += -xtarget=opteron
 	DEFS += -DFENCES=p4
 endif