diff --git a/[refs] b/[refs]
index 89e96e780ca4..7ed02b7ec4c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f4e1e5061c44a93337338af4bf9bed10ee9f32e
+refs/heads/master: d0e7feb03d5ac48069c2fd57bbba61522e0ca493
diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile
index 1c36ca332a96..bf7c9ba709f3 100644
--- a/trunk/arch/i386/Makefile
+++ b/trunk/arch/i386/Makefile
@@ -17,6 +17,13 @@
 # 20050320  Kianusch Sayah Karadji <kianusch@sk-tech.net>
 #           Added support for GEODE CPU
 
+HAS_BIARCH      := $(call cc-option-yn, -m32)
+ifeq ($(HAS_BIARCH),y)
+AS              := $(AS) --32
+LD              := $(LD) -m elf_i386
+CC              := $(CC) -m32
+endif
+
 LDFLAGS		:= -m elf_i386
 OBJCOPYFLAGS	:= -O binary -R .note -R .comment -S
 LDFLAGS_vmlinux :=