Index: kernel/arch/amd64/Makefile.inc
===================================================================
--- kernel/arch/amd64/Makefile.inc	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
+++ kernel/arch/amd64/Makefile.inc	(revision bea09de6fa613b688ac7cad04e20e544a8e4c668)
@@ -34,5 +34,5 @@
 BFD = binary
 TARGET = amd64-linux-gnu
-TOOLCHAIN_DIR = /usr/local/amd64/bin
+TOOLCHAIN_DIR = /usr/local/amd64
 
 CFLAGS += -fno-unwind-tables -m64 -mcmodel=kernel -mno-red-zone
Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
+++ kernel/arch/ia32/Makefile.inc	(revision bea09de6fa613b688ac7cad04e20e544a8e4c668)
@@ -34,5 +34,5 @@
 BFD = binary
 TARGET = i686-pc-linux-gnu
-TOOLCHAIN_DIR = /usr/local/i686/bin
+TOOLCHAIN_DIR = /usr/local/i686
 
 DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
Index: kernel/arch/ia32/src/mm/as.c
===================================================================
--- kernel/arch/ia32/src/mm/as.c	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
+++ kernel/arch/ia32/src/mm/as.c	(revision bea09de6fa613b688ac7cad04e20e544a8e4c668)
@@ -40,5 +40,7 @@
 void as_arch_init(void)
 {
+#ifndef __OBJC__
 	as_operations = &as_pt_operations;
+#endif
 }
 
Index: kernel/arch/ia32xen/Makefile.inc
===================================================================
--- kernel/arch/ia32xen/Makefile.inc	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
+++ kernel/arch/ia32xen/Makefile.inc	(revision bea09de6fa613b688ac7cad04e20e544a8e4c668)
@@ -34,5 +34,5 @@
 BFD = elf32-i386
 TARGET = i686-pc-linux-gnu
-TOOLCHAIN_DIR = /usr/local/i686/bin
+TOOLCHAIN_DIR = /usr/local/i686
 
 DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
Index: kernel/arch/ia64/Makefile.inc
===================================================================
--- kernel/arch/ia64/Makefile.inc	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
+++ kernel/arch/ia64/Makefile.inc	(revision bea09de6fa613b688ac7cad04e20e544a8e4c668)
@@ -34,5 +34,5 @@
 BFD = elf64-ia64-little
 TARGET = ia64-pc-linux-gnu
-TOOLCHAIN_DIR = /usr/local/ia64/bin
+TOOLCHAIN_DIR = /usr/local/ia64
 
 INIT0_ADDRESS = 0xe000000000400000
Index: kernel/arch/mips32/Makefile.inc
===================================================================
--- kernel/arch/mips32/Makefile.inc	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
+++ kernel/arch/mips32/Makefile.inc	(revision bea09de6fa613b688ac7cad04e20e544a8e4c668)
@@ -32,5 +32,5 @@
 BFD_ARCH = mips
 TARGET = mipsel-linux-gnu
-TOOLCHAIN_DIR = /usr/local/mipsel/bin
+TOOLCHAIN_DIR = /usr/local/mipsel
 
 KERNEL_LOAD_ADDRESS = 0x80100000
Index: kernel/arch/ppc32/Makefile.inc
===================================================================
--- kernel/arch/ppc32/Makefile.inc	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
+++ kernel/arch/ppc32/Makefile.inc	(revision bea09de6fa613b688ac7cad04e20e544a8e4c668)
@@ -34,5 +34,5 @@
 BFD = binary
 TARGET = ppc-linux-gnu
-TOOLCHAIN_DIR = /usr/local/ppc/bin
+TOOLCHAIN_DIR = /usr/local/ppc
 
 CFLAGS += -mcpu=powerpc -msoft-float -m32
Index: kernel/arch/ppc64/Makefile.inc
===================================================================
--- kernel/arch/ppc64/Makefile.inc	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
+++ kernel/arch/ppc64/Makefile.inc	(revision bea09de6fa613b688ac7cad04e20e544a8e4c668)
@@ -34,5 +34,5 @@
 BFD = binary
 TARGET = ppc64-linux-gnu
-TOOLCHAIN_DIR = /usr/local/ppc64/bin
+TOOLCHAIN_DIR = /usr/local/ppc64
 
 CFLAGS += -mcpu=powerpc64 -msoft-float -m64
Index: kernel/arch/sparc64/Makefile.inc
===================================================================
--- kernel/arch/sparc64/Makefile.inc	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
+++ kernel/arch/sparc64/Makefile.inc	(revision bea09de6fa613b688ac7cad04e20e544a8e4c668)
@@ -34,5 +34,5 @@
 BFD = binary
 TARGET = sparc64-linux-gnu
-TOOLCHAIN_DIR = /usr/local/sparc64/bin
+TOOLCHAIN_DIR = /usr/local/sparc64
 
 CFLAGS += -mcpu=ultrasparc -m64