Index: libc/Makefile
===================================================================
--- libc/Makefile	(revision 25b0e6a7a58aae15fdd78041df3db0d184f6d2ee)
+++ libc/Makefile	(revision b5440cf541def5ef335e5908fbf8a45c8d9b1df8)
@@ -31,8 +31,4 @@
 
 LIBC_PREFIX = .
-DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include
-LFLAGS = -M
-AFLAGS =
 
 ## Setup toolchain
@@ -45,9 +41,10 @@
 
 GENERIC_SOURCES = \
-	generic/libc.c
+	generic/libc.c \
+	generic/io.c
 
 ARCH_SOURCES = \
-	arch/$(ARCH)/entry.s \
-	arch/$(ARCH)/syscall.c
+	arch/$(ARCH)/src/entry.s \
+	arch/$(ARCH)/src/syscall.c
 
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))