Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision 60133d0afd1e7d9529d61aac6419c1afec8cd212)
+++ kernel/arch/ia32/Makefile.inc	(revision 52d30c45bd8c0361dfebda500f106036efcd7686)
@@ -37,4 +37,5 @@
 
 DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
+SUNCC_CFLAGS = -m32
 
 ## Accepted CPUs
@@ -42,5 +43,5 @@
 
 ifeq ($(MACHINE),athlon-xp)
-	CFLAGS += -march=athlon-xp -mmmx -msse -m3dnow
+	GCC_CFLAGS += -march=athlon-xp -mmmx -msse -m3dnow
 	DEFS += -DCONFIG_FENCES_P3
 	CONFIG_SMP = n
@@ -48,22 +49,22 @@
 endif
 ifeq ($(MACHINE),athlon-mp)
-	CFLAGS += -march=athlon-mp -mmmx -msse -m3dnow
+	GCC_CFLAGS += -march=athlon-mp -mmmx -msse -m3dnow
 	DEFS += -DCONFIG_FENCES_P3
 	CONFIG_HT = n
 endif
 ifeq ($(MACHINE),pentium3)
-	CFLAGS += -march=pentium3 -mmmx -msse
+	GCC_CFLAGS += -march=pentium3 -mmmx -msse
 	DEFS += -DCONFIG_FENCES_P3
 	CONFIG_HT = n
 endif
 ifeq ($(MACHINE),prescott)
-	CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
+	GCC_CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
 	DEFS += -DCONFIG_FENCES_P4
 endif
 ifeq ($(MACHINE),pentium4)
 	ifeq ($(COMPILER),icc_native)
-		CFLAGS += -march=pentium4
+		GCC_CFLAGS += -march=pentium4
 	else
-		CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
+		GCC_CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
 	endif
 	DEFS += -DCONFIG_FENCES_P4