Index: kernel/arch/amd64/Makefile.inc
===================================================================
--- kernel/arch/amd64/Makefile.inc	(revision 92d349c80662def05860f28f084b4090967b8361)
+++ kernel/arch/amd64/Makefile.inc	(revision 4a8635b414c360bd57bb45bd9718cbff2211cad1)
@@ -36,5 +36,7 @@
 TOOLCHAIN_DIR = /usr/local/amd64
 
-CFLAGS += -fno-unwind-tables -m64 -mcmodel=kernel -mno-red-zone
+GCC_CFLAGS += -fno-unwind-tables -m64 -mcmodel=kernel -mno-red-zone
+SUNCC_CFLAGS += -m64 -xmodel=kernel
+
 DEFS += -DMACHINE=$(MACHINE) -D__64_BITS__
 
@@ -43,5 +45,5 @@
 
 ifeq ($(MACHINE),opteron)
-	CFLAGS += -march=opteron
+	GCC_CFLAGS += -march=opteron	
 	DEFS += -DFENCES=p4
 endif