Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision c1f68b0b464a5358c1ef12ca16a6a4fb18b3ad5a)
+++ uspace/Makefile.common	(revision eca820c68a88b21d4b9fef3a00447516bc3f7684)
@@ -110,6 +110,4 @@
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
 
-STARTUP = $(LIBC_PREFIX)/arch/$(UARCH)/src/entry.o
-
 LIBMATH_PREFIX = $(LIB_PREFIX)/math
 LIBMATH_INCLUDES_FLAGS = \
@@ -304,5 +302,5 @@
 
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(STARTUP) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
 	$(STRIP) $(BINARY)
@@ -340,5 +338,5 @@
 ifneq ($(TEST_OUTPUT),)
 $(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS)
-	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(STARTUP) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
+	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
 	$(STRIP) $(TEST_OUTPUT)
Index: uspace/lib/c/arch/abs32le/_link.ld.in
===================================================================
--- uspace/lib/c/arch/abs32le/_link.ld.in	(revision c1f68b0b464a5358c1ef12ca16a6a4fb18b3ad5a)
+++ uspace/lib/c/arch/abs32le/_link.ld.in	(revision eca820c68a88b21d4b9fef3a00447516bc3f7684)
@@ -1,2 +1,3 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/c/arch/amd64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/amd64/_link.ld.in	(revision c1f68b0b464a5358c1ef12ca16a6a4fb18b3ad5a)
+++ uspace/lib/c/arch/amd64/_link.ld.in	(revision eca820c68a88b21d4b9fef3a00447516bc3f7684)
@@ -1,2 +1,3 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/c/arch/arm32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/arm32/_link.ld.in	(revision c1f68b0b464a5358c1ef12ca16a6a4fb18b3ad5a)
+++ uspace/lib/c/arch/arm32/_link.ld.in	(revision eca820c68a88b21d4b9fef3a00447516bc3f7684)
@@ -1,2 +1,3 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/c/arch/ia32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/ia32/_link.ld.in	(revision c1f68b0b464a5358c1ef12ca16a6a4fb18b3ad5a)
+++ uspace/lib/c/arch/ia32/_link.ld.in	(revision eca820c68a88b21d4b9fef3a00447516bc3f7684)
@@ -1,3 +1,4 @@
 #ifndef SHLIB
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 #endif
Index: uspace/lib/c/arch/ia64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/ia64/_link.ld.in	(revision c1f68b0b464a5358c1ef12ca16a6a4fb18b3ad5a)
+++ uspace/lib/c/arch/ia64/_link.ld.in	(revision eca820c68a88b21d4b9fef3a00447516bc3f7684)
@@ -1,2 +1,3 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/c/arch/mips32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/mips32/_link.ld.in	(revision c1f68b0b464a5358c1ef12ca16a6a4fb18b3ad5a)
+++ uspace/lib/c/arch/mips32/_link.ld.in	(revision eca820c68a88b21d4b9fef3a00447516bc3f7684)
@@ -1,2 +1,3 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/c/arch/ppc32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/ppc32/_link.ld.in	(revision c1f68b0b464a5358c1ef12ca16a6a4fb18b3ad5a)
+++ uspace/lib/c/arch/ppc32/_link.ld.in	(revision eca820c68a88b21d4b9fef3a00447516bc3f7684)
@@ -1,2 +1,3 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/c/arch/riscv64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/riscv64/_link.ld.in	(revision c1f68b0b464a5358c1ef12ca16a6a4fb18b3ad5a)
+++ uspace/lib/c/arch/riscv64/_link.ld.in	(revision eca820c68a88b21d4b9fef3a00447516bc3f7684)
@@ -1,2 +1,3 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 
Index: uspace/lib/c/arch/sparc64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/sparc64/_link.ld.in	(revision c1f68b0b464a5358c1ef12ca16a6a4fb18b3ad5a)
+++ uspace/lib/c/arch/sparc64/_link.ld.in	(revision eca820c68a88b21d4b9fef3a00447516bc3f7684)
@@ -1,2 +1,3 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)