Index: kernel/arch/arm32/Makefile.inc
===================================================================
--- kernel/arch/arm32/Makefile.inc	(revision 38428aa3a942be2f91b8d28f2cfb80517b8f2ec7)
+++ kernel/arch/arm32/Makefile.inc	(revision 440b0ce271332b2196cbca972521f716c8f75a04)
@@ -34,5 +34,5 @@
 BFD = binary
 TARGET = arm-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32
 
 ATSIGN = %
Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision 38428aa3a942be2f91b8d28f2cfb80517b8f2ec7)
+++ kernel/arch/ia32/Makefile.inc	(revision 440b0ce271332b2196cbca972521f716c8f75a04)
@@ -34,5 +34,5 @@
 BFD = binary
 TARGET = i686-pc-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia32
 
 BITS = 32
Index: kernel/arch/mips32/Makefile.inc
===================================================================
--- kernel/arch/mips32/Makefile.inc	(revision 38428aa3a942be2f91b8d28f2cfb80517b8f2ec7)
+++ kernel/arch/mips32/Makefile.inc	(revision 440b0ce271332b2196cbca972521f716c8f75a04)
@@ -33,5 +33,5 @@
 BFD = binary
 TARGET = mipsel-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32
 
 GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3
@@ -48,5 +48,5 @@
 ifeq ($(MACHINE),bgxemul)
 	BFD_NAME = elf32-tradbigmips
-	TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips
+	TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb
 	TARGET = mips-linux-gnu
 	ENDIANESS = BE
Index: kernel/arch/ppc32/Makefile.inc
===================================================================
--- kernel/arch/ppc32/Makefile.inc	(revision 38428aa3a942be2f91b8d28f2cfb80517b8f2ec7)
+++ kernel/arch/ppc32/Makefile.inc	(revision 440b0ce271332b2196cbca972521f716c8f75a04)
@@ -34,5 +34,5 @@
 BFD = binary
 TARGET = ppc-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32
 
 GCC_CFLAGS += -mcpu=powerpc -msoft-float -m32