Index: kernel/Makefile
===================================================================
--- kernel/Makefile	(revision 92d349c80662def05860f28f084b4090967b8361)
+++ kernel/Makefile	(revision 52d30c45bd8c0361dfebda500f106036efcd7686)
@@ -37,10 +37,14 @@
 #
 
-DEFS = -D$(ARCH) -DARCH=\"$(ARCH)\" -DRELEASE=\"$(RELEASE)\" "-DNAME=\"$(NAME)\"" -DKERNEL
-CFLAGS = -fno-builtin -fomit-frame-pointer -Wall -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Igeneric/include/
-
-#SUNCC_CFLAGS = -xO3 -Igeneric/include/ -xnolib -xc99=all \
-#-D__FUNCTION__=__func__ -features=extensions \
-#-erroff=E_ZERO_SIZED_STRUCT_UNION
+DEFS = -D$(ARCH) -DARCH=\"$(ARCH)\" -DRELEASE=\"$(RELEASE)\" "-DNAME=\"$(NAME)\"" \
+	-DKERNEL
+
+GCC_CFLAGS = -fno-builtin -fomit-frame-pointer -Wall -Wmissing-prototypes \
+	-Werror -O3 -nostdlib -nostdinc -Igeneric/include/
+
+SUNCC_CFLAGS = -xO3 -Igeneric/include/ -xnolib -xc99=all \
+	-D__FUNCTION__=__func__ -features=extensions \
+	-erroff=E_ZERO_SIZED_STRUCT_UNION
+
 
 LFLAGS = -M
@@ -132,4 +136,5 @@
 	OBJDUMP = objdump
 	LIBDIR = /usr/lib
+	CFLAGS = $(GCC_CFLAGS)
 endif
 
@@ -142,4 +147,5 @@
 	OBJDUMP = objdump
 	LIBDIR = /usr/lib
+	CFLAGS = $(GCC_CFLAGS)
 endif
 
@@ -152,4 +158,5 @@
 	OBJDUMP = objdump
 	LIBDIR = /usr/lib
+	CFLAGS = $(SUNCC_CFLAGS)
 endif
 
@@ -162,4 +169,5 @@
 	OBJDUMP = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objdump
 	LIBDIR = $(TOOLCHAIN_DIR)/lib
+	CFLAGS = $(GCC_CFLAGS)
 endif