diff --git a/configs/qemu-i486/ostest/Make.defs b/configs/qemu-i486/ostest/Make.defs
index e2ac40b09f..5075731826 100644
--- a/configs/qemu-i486/ostest/Make.defs
+++ b/configs/qemu-i486/ostest/Make.defs
@@ -63,8 +63,7 @@ else
   ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script
 endif
 
-ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin
-#ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector
+ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector
 ARCHPICFLAGS = -fpic
 ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
 ARCHDEFINES =
@@ -73,6 +72,7 @@ ARCHDEFINES =
 
 ifeq ($(CONFIG_ARCH_X86_M32),y)
 ARCHCPUFLAGS += -m32
+LDFLAGS += -m elf_i386
 endif
 
 # We have to use a cross-development toolchain under Cygwin because the native
@@ -109,5 +109,5 @@ MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
 
 HOSTCC = gcc
 HOSTINCLUDESv = -I.
-HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(HOSTINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
 HOSTLDFLAGS =