Index: uspace/lib/libc/arch/amd64/Makefile.inc
===================================================================
--- uspace/lib/libc/arch/amd64/Makefile.inc	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/amd64/Makefile.inc	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -30,14 +30,10 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 TARGET = amd64-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
 
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-		arch/$(ARCH)/src/fibril.S \
-		arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+	arch/$(UARCH)/src/fibril.S \
+	arch/$(UARCH)/src/tls.c
 
 LFLAGS += -N
Index: uspace/lib/libc/arch/amd64/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/amd64/_link.ld.in	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/amd64/_link.ld.in	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -1,3 +1,3 @@
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/libc/arch/arm32/Makefile.inc
===================================================================
--- uspace/lib/libc/arch/arm32/Makefile.inc	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/arm32/Makefile.inc	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -31,18 +31,14 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 TARGET = arm-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
 CFLAGS += -ffixed-r9 -mtp=soft 
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
-AFLAGS += 
+AFLAGS +=
 
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-		arch/$(ARCH)/src/fibril.S \
-		arch/$(ARCH)/src/tls.c \
-		arch/$(ARCH)/src/eabi.S
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+	arch/$(UARCH)/src/fibril.S \
+	arch/$(UARCH)/src/tls.c \
+	arch/$(UARCH)/src/eabi.S
 
 BFD_NAME = elf32-littlearm
Index: uspace/lib/libc/arch/arm32/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/arm32/_link.ld.in	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/arm32/_link.ld.in	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -1,3 +1,3 @@
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/libc/arch/ia32/Makefile.inc
===================================================================
--- uspace/lib/libc/arch/ia32/Makefile.inc	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/ia32/Makefile.inc	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -30,15 +30,11 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 TARGET = i686-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686/bin
 
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-		arch/$(ARCH)/src/fibril.S \
-		arch/$(ARCH)/src/tls.c \
-		arch/$(ARCH)/src/setjmp.S 
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+	arch/$(UARCH)/src/fibril.S \
+	arch/$(UARCH)/src/tls.c \
+	arch/$(UARCH)/src/setjmp.S
 
 LFLAGS += -N
Index: uspace/lib/libc/arch/ia32/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/ia32/_link.ld.in	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/ia32/_link.ld.in	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -1,3 +1,3 @@
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/libc/arch/ia64/Makefile.inc
===================================================================
--- uspace/lib/libc/arch/ia64/Makefile.inc	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/ia64/Makefile.inc	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -30,8 +30,4 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 TARGET = ia64-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
@@ -40,8 +36,8 @@
 AFLAGS += 
 
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-		arch/$(ARCH)/src/fibril.S \
-		arch/$(ARCH)/src/tls.c\
-		arch/$(ARCH)/src/ddi.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+	arch/$(UARCH)/src/fibril.S \
+	arch/$(UARCH)/src/tls.c \
+	arch/$(UARCH)/src/ddi.c
 
 BFD_NAME = elf64-ia64-little
Index: uspace/lib/libc/arch/ia64/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/ia64/_link.ld.in	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/ia64/_link.ld.in	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -1,3 +1,3 @@
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/libc/arch/mips32/Makefile.inc
===================================================================
--- uspace/lib/libc/arch/mips32/Makefile.inc	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/mips32/Makefile.inc	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -30,21 +30,11 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
 CFLAGS += -mips3
 
--include ../../../Makefile.config
-ifeq ($(CONFIG_MIPS_FPU),y)
-	CFLAGS += -DCONFIG_MIPS_FPU
-endif
-
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-	arch/$(ARCH)/src/fibril.S \
-	arch/$(ARCH)/src/tls.c
-
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+	arch/$(UARCH)/src/fibril.S \
+	arch/$(UARCH)/src/tls.c
 
 BFD_ARCH = mips
Index: uspace/lib/libc/arch/mips32/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/mips32/_link.ld.in	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/mips32/_link.ld.in	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -1,3 +1,3 @@
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/libc/arch/mips32eb/Makefile.inc
===================================================================
--- uspace/lib/libc/arch/mips32eb/Makefile.inc	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/mips32eb/Makefile.inc	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -30,15 +30,11 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 TARGET = mips-sgi-irix5
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
 CFLAGS += -mips3 
 
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-		arch/$(ARCH)/src/fibril.S \
-		arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+		arch/$(UARCH)/src/fibril.S \
+		arch/$(UARCH)/src/tls.c
 
 LFLAGS += -N
Index: uspace/lib/libc/arch/ppc32/Makefile.inc
===================================================================
--- uspace/lib/libc/arch/ppc32/Makefile.inc	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/ppc32/Makefile.inc	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -30,14 +30,10 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 TARGET = ppc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
 
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-		arch/$(ARCH)/src/fibril.S \
-		arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+	arch/$(UARCH)/src/fibril.S \
+	arch/$(UARCH)/src/tls.c
 
 CFLAGS += -mcpu=powerpc -msoft-float -m32
Index: uspace/lib/libc/arch/ppc32/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/ppc32/_link.ld.in	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/ppc32/_link.ld.in	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -1,3 +1,3 @@
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/libc/arch/sparc64/Makefile.inc
===================================================================
--- uspace/lib/libc/arch/sparc64/Makefile.inc	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/sparc64/Makefile.inc	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -30,13 +30,9 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 TARGET = sparc64-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
 
-ARCH_SOURCES += arch/$(ARCH)/src/fibril.S \
-		arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \
+	arch/$(UARCH)/src/tls.c
 
 CFLAGS += -mcpu=ultrasparc -m64
Index: uspace/lib/libc/arch/sparc64/_link.ld.in
===================================================================
--- uspace/lib/libc/arch/sparc64/_link.ld.in	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/libc/arch/sparc64/_link.ld.in	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -1,3 +1,3 @@
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)