Index: uspace/lib/c/Makefile
===================================================================
--- uspace/lib/c/Makefile	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/Makefile	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -39,5 +39,5 @@
 
 PRE_DEPEND =
-EXTRA_OUTPUT = $(LINKER_SCRIPTS)
+EXTRA_OUTPUT = $(LINKER_SCRIPTS) $(START_FILES)
 EXTRA_CLEAN = $(LINKER_SCRIPTS)
 EXTRA_TEST_CFLAGS = -Wno-deprecated-declarations
Index: uspace/lib/c/arch/abs32le/Makefile.inc
===================================================================
--- uspace/lib/c/arch/abs32le/Makefile.inc	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/abs32le/Makefile.inc	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -34,4 +34,2 @@
 	arch/$(UARCH)/src/syscall.c \
 	arch/$(UARCH)/src/stacktrace.c
-
-EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
Index: uspace/lib/c/arch/abs32le/_link.ld.in
===================================================================
--- uspace/lib/c/arch/abs32le/_link.ld.in	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/abs32le/_link.ld.in	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -1,3 +1,2 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(_start)
 
Index: uspace/lib/c/arch/amd64/Makefile.inc
===================================================================
--- uspace/lib/c/arch/amd64/Makefile.inc	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/amd64/Makefile.inc	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -38,5 +38,2 @@
 ARCH_AUTOCHECK_HEADERS = \
 	arch/$(UARCH)/include/libarch/fibril_context.h
-
-EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
-
Index: uspace/lib/c/arch/amd64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/amd64/_link.ld.in	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/amd64/_link.ld.in	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -1,3 +1,2 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(_start)
 
Index: uspace/lib/c/arch/arm32/Makefile.inc
===================================================================
--- uspace/lib/c/arch/arm32/Makefile.inc	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/arm32/Makefile.inc	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -37,5 +37,2 @@
 	arch/$(UARCH)/src/stacktrace.c \
 	arch/$(UARCH)/src/stacktrace_asm.S
-
-EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
-
Index: uspace/lib/c/arch/arm32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/arm32/_link.ld.in	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/arm32/_link.ld.in	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -1,3 +1,2 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(_start)
 
Index: uspace/lib/c/arch/ia32/Makefile.inc
===================================================================
--- uspace/lib/c/arch/ia32/Makefile.inc	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/ia32/Makefile.inc	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -40,4 +40,2 @@
 ARCH_AUTOCHECK_HEADERS = \
 	arch/$(UARCH)/include/libarch/fibril_context.h
-
-EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
Index: uspace/lib/c/arch/ia32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/ia32/_link.ld.in	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/ia32/_link.ld.in	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -1,4 +1,3 @@
 #ifndef SHLIB
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(_start)
 #endif
Index: uspace/lib/c/arch/ia64/Makefile.inc
===================================================================
--- uspace/lib/c/arch/ia64/Makefile.inc	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/ia64/Makefile.inc	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -39,4 +39,2 @@
 ARCH_AUTOCHECK_HEADERS = \
 	arch/$(UARCH)/include/libarch/fibril_context.h
-
-EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
Index: uspace/lib/c/arch/ia64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/ia64/_link.ld.in	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/ia64/_link.ld.in	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -1,3 +1,2 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(_start)
 
Index: uspace/lib/c/arch/mips32/Makefile.inc
===================================================================
--- uspace/lib/c/arch/mips32/Makefile.inc	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/mips32/Makefile.inc	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -38,4 +38,2 @@
 ARCH_AUTOCHECK_HEADERS = \
 	arch/$(UARCH)/include/libarch/fibril_context.h
-
-EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
Index: uspace/lib/c/arch/mips32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/mips32/_link.ld.in	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/mips32/_link.ld.in	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -1,3 +1,2 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__start)
 
Index: uspace/lib/c/arch/mips32eb/Makefile.inc
===================================================================
--- uspace/lib/c/arch/mips32eb/Makefile.inc	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/mips32eb/Makefile.inc	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -38,4 +38,2 @@
 ARCH_AUTOCHECK_HEADERS = \
 	arch/$(UARCH)/include/libarch/fibril_context.h
-
-EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
Index: uspace/lib/c/arch/ppc32/Makefile.inc
===================================================================
--- uspace/lib/c/arch/ppc32/Makefile.inc	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/ppc32/Makefile.inc	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -38,4 +38,2 @@
 ARCH_AUTOCHECK_HEADERS = \
 	arch/$(UARCH)/include/libarch/fibril_context.h
-
-EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
Index: uspace/lib/c/arch/ppc32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/ppc32/_link.ld.in	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/ppc32/_link.ld.in	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -1,3 +1,2 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(_start)
 
Index: uspace/lib/c/arch/riscv64/Makefile.inc
===================================================================
--- uspace/lib/c/arch/riscv64/Makefile.inc	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/riscv64/Makefile.inc	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -37,4 +37,2 @@
 ARCH_AUTOCHECK_HEADERS = \
 	arch/$(UARCH)/include/libarch/fibril_context.h
-
-EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
Index: uspace/lib/c/arch/riscv64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/riscv64/_link.ld.in	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/riscv64/_link.ld.in	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -1,3 +1,2 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(_start)
 
Index: uspace/lib/c/arch/sparc64/Makefile.inc
===================================================================
--- uspace/lib/c/arch/sparc64/Makefile.inc	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/sparc64/Makefile.inc	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -37,4 +37,2 @@
 ARCH_AUTOCHECK_HEADERS = \
 	arch/$(UARCH)/include/libarch/fibril_context.h
-
-EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
Index: uspace/lib/c/arch/sparc64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/sparc64/_link.ld.in	(revision d054ad327ffe0b12fea2dcc17f0711048959b7b2)
+++ uspace/lib/c/arch/sparc64/_link.ld.in	(revision c2c4127e98d81c1d3c0bee95147d80082f1b7e66)
@@ -1,3 +1,2 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(_start)