Index: Makefile
===================================================================
--- Makefile	(revision c2ee1c5c14cc94677eea65433eba59084af51714)
+++ Makefile	(revision c2ee1c5c14cc94677eea65433eba59084af51714)
@@ -0,0 +1,90 @@
+#
+# Copyright (C) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+## Make some default assumptions
+#
+
+ifndef ARCH
+	ARCH = ia32
+endif
+
+## Common compiler flags
+#
+
+DEFS = -DARCH=$(ARCH)
+CFLAGS = -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Ilibc/include
+LFLAGS = -M
+AFLAGS =
+
+## Setup platform configuration
+#
+
+include libc/arch/$(ARCH)/Makefile.inc
+
+## Toolchain configuration
+#
+
+ifeq ($(COMPILER),native)
+	CC = gcc
+	AS = as
+	LD = ld
+	OBJCOPY = objcopy
+	OBJDUMP = objdump
+else
+	CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
+	AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
+	LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
+	OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
+	OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+endif
+
+.PHONY: all clean
+
+all: init
+
+clean:
+	-rm -f init init.map _link.ld *.o
+	$(MAKE) -C libc clean
+
+libc/libc.a:
+	$(MAKE) -C libc all
+
+_link.ld: _link.ld.in
+	$(CC) $(DEFS) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
+
+init: init.o libc/libc.a _link.ld
+	$(LD) -T _link.ld $(LFLAGS) init.o libc/libc.a -o $@ -Map init.map
+
+%.o: %.S
+	$(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+
+%.o: %.s
+	$(AS) $(AFLAGS) $< -o $@
+
+%.o: %.c
+	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
Index: ink.ld
===================================================================
--- _link.ld	(revision 1444af8f38531ef75f10dcba149f0e09cf1c37a6)
+++ 	(revision )
@@ -1,9 +1,0 @@
-
-OUTPUT_FORMAT(binary)
-STARTUP(libc/entry.o)
-ENTRY(__entry)
-
-SECTIONS {
- .text 0x00000000 : {
- }
-}
Index: _link.ld.in
===================================================================
--- _link.ld.in	(revision c2ee1c5c14cc94677eea65433eba59084af51714)
+++ _link.ld.in	(revision c2ee1c5c14cc94677eea65433eba59084af51714)
@@ -0,0 +1,8 @@
+OUTPUT_FORMAT(binary)
+STARTUP(libc/arch/ARCH/entry.o)
+ENTRY(__entry)
+
+SECTIONS {
+ .text 0x00000000 : {
+ }
+}
Index: libc/Makefile
===================================================================
--- libc/Makefile	(revision 1444af8f38531ef75f10dcba149f0e09cf1c37a6)
+++ libc/Makefile	(revision c2ee1c5c14cc94677eea65433eba59084af51714)
@@ -54,4 +54,5 @@
 	AS = as
 	LD = ld
+	AR = ar
 	OBJCOPY = objcopy
 	OBJDUMP = objdump
@@ -60,4 +61,5 @@
 	AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
 	LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
+	AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
 	OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
 	OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
@@ -76,5 +78,5 @@
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
 
-.PHONY: all clean depend boot
+.PHONY: all clean depend
 
 all: libc.a
@@ -83,5 +85,5 @@
 
 clean:
-	-rm -f libc.a
+	-rm -f libc.a Makefile.depend
 	find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
 
@@ -90,5 +92,5 @@
 
 libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-	
+	$(AR) rc libc.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
 
 %.o: %.S