Index: uspace/srv/console/Makefile
===================================================================
--- uspace/srv/console/Makefile	(revision 21c5d41203c27518a7e92e48687dac5516c5a998)
+++ uspace/srv/console/Makefile	(revision bd804653e43355acb79fecc133c2780b8a5c5a1b)
@@ -71,5 +71,5 @@
 
 $(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld -e __entry_driver $(GENERIC_OBJECTS) $(ARCH_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(GENERIC_OBJECTS) $(ARCH_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm:
Index: uspace/srv/fb/Makefile
===================================================================
--- uspace/srv/fb/Makefile	(revision 21c5d41203c27518a7e92e48687dac5516c5a998)
+++ uspace/srv/fb/Makefile	(revision bd804653e43355acb79fecc133c2780b8a5c5a1b)
@@ -44,5 +44,4 @@
 SOURCES = \
 	main.c \
-	sysio.c \
 	ppm.c
 
@@ -83,5 +82,5 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld -e __entry_driver $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm:
Index: uspace/srv/kbd/Makefile
===================================================================
--- uspace/srv/kbd/Makefile	(revision 21c5d41203c27518a7e92e48687dac5516c5a998)
+++ uspace/srv/kbd/Makefile	(revision bd804653e43355acb79fecc133c2780b8a5c5a1b)
@@ -73,8 +73,6 @@
 endif
 ifeq ($(ARCH), arm32)
-ifeq ($(MACHINE), gxemul_testarm)
 	ARCH_SOURCES += \
 		arch/$(ARCH)/src/kbd_gxemul.c
-endif
 endif
 
@@ -101,5 +99,5 @@
 
 $(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(GENARCH_OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld -e __entry_driver $(GENERIC_OBJECTS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(GENERIC_OBJECTS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm:
Index: uspace/srv/ns/Makefile
===================================================================
--- uspace/srv/ns/Makefile	(revision 21c5d41203c27518a7e92e48687dac5516c5a998)
+++ uspace/srv/ns/Makefile	(revision bd804653e43355acb79fecc133c2780b8a5c5a1b)
@@ -58,5 +58,5 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld -e __entry_driver $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm:
Index: uspace/srv/rd/Makefile
===================================================================
--- uspace/srv/rd/Makefile	(revision 21c5d41203c27518a7e92e48687dac5516c5a998)
+++ uspace/srv/rd/Makefile	(revision bd804653e43355acb79fecc133c2780b8a5c5a1b)
@@ -58,5 +58,5 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld -e __entry_driver $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm: