Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 45059d6ba68c419a6e19822bae82147cf20a763f)
+++ HelenOS.config	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -70,8 +70,8 @@
 @ "pentium4" Pentium 4
 @ "pentium3" Pentium 3
-@ "i486" i486
 @ "core" Core Solo/Duo
 @ "athlon_xp" Athlon XP
 @ "athlon_mp" Athlon MP
+@ "i486" i486
 ! [PLATFORM=ia32] PROCESSOR (choice)
 
Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision 45059d6ba68c419a6e19822bae82147cf20a763f)
+++ kernel/arch/ia32/Makefile.inc	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -44,4 +44,8 @@
 #
 
+ifeq ($(PROCESSOR),i486)
+	CMN2 = -march=i486
+endif
+
 ifeq ($(PROCESSOR),athlon_xp)
 	CMN2 = -march=athlon-xp
@@ -62,8 +66,4 @@
 	CMN2 = -march=pentium4
 	SUNCC_CFLAGS += -xarch=sse2
-endif
-
-ifeq ($(PROCESSOR),i486)
-	CMN2 = -march=i486
 endif
 
Index: kernel/arch/ia32/include/asm.h
===================================================================
--- kernel/arch/ia32/include/asm.h	(revision 45059d6ba68c419a6e19822bae82147cf20a763f)
+++ kernel/arch/ia32/include/asm.h	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -312,4 +312,5 @@
 
 #ifndef PROCESSOR_i486
+
 /** Write to MSR */
 NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
@@ -336,5 +337,6 @@
 	return ((uint64_t) dx << 32) | ax;
 }
-#endif
+
+#endif /* PROCESSOR_i486 */
 
 
Index: kernel/arch/ia32/src/asm.S
===================================================================
--- kernel/arch/ia32/src/asm.S	(revision 45059d6ba68c419a6e19822bae82147cf20a763f)
+++ kernel/arch/ia32/src/asm.S	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -407,6 +407,6 @@
 #ifdef PROCESSOR_i486
 	jz 0f
-	movl %eax, %ebp
-0:
+		movl %eax, %ebp
+	0:
 #else
 	cmovnzl %eax, %ebp
Index: kernel/arch/ia32/src/syscall.c
===================================================================
--- kernel/arch/ia32/src/syscall.c	(revision 45059d6ba68c419a6e19822bae82147cf20a763f)
+++ kernel/arch/ia32/src/syscall.c	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -40,4 +40,5 @@
 
 #ifndef PROCESSOR_i486
+
 /** Enable & setup support for SYSENTER/SYSEXIT */
 void syscall_setup_cpu(void)
@@ -50,5 +51,6 @@
 	write_msr(IA32_MSR_SYSENTER_EIP, (uint32_t) sysenter_handler);
 }
-#endif
+
+#endif /* PROCESSOR_i486 */
 
 /** @}
Index: uspace/lib/c/arch/ia32/Makefile.common
===================================================================
--- uspace/lib/c/arch/ia32/Makefile.common	(revision 45059d6ba68c419a6e19822bae82147cf20a763f)
+++ uspace/lib/c/arch/ia32/Makefile.common	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -28,8 +28,9 @@
 
 CLANG_ARCH = i386
+
 ifeq ($(PROCESSOR),i486)
-GCC_CFLAGS += -march=i486 -fno-omit-frame-pointer
+	GCC_CFLAGS += -march=i486 -fno-omit-frame-pointer
 else
-GCC_CFLAGS += -march=pentium -fno-omit-frame-pointer
+	GCC_CFLAGS += -march=pentium -fno-omit-frame-pointer
 endif
 
Index: uspace/lib/c/arch/ia32/src/entry.S
===================================================================
--- uspace/lib/c/arch/ia32/src/entry.S	(revision 45059d6ba68c419a6e19822bae82147cf20a763f)
+++ uspace/lib/c/arch/ia32/src/entry.S	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -46,5 +46,5 @@
 	mov %ax, %fs
 	# Do not set %gs, it contains descriptor that can see TLS
-
+	
 #ifndef PROCESSOR_i486	
 	# Detect the mechanism used for making syscalls
@@ -53,8 +53,9 @@
 	bt $(INTEL_SEP), %edx
 	jnc 0f
-	leal __syscall_fast_func, %eax
-	movl $__syscall_fast, (%eax)
-0:
+		leal __syscall_fast_func, %eax
+		movl $__syscall_fast, (%eax)
+	0:
 #endif
+	
 	#
 	# Create the first stack frame.