build: 'i386' -> 'amd64'

Signed-off-by: Ian Moffett <ian@osmora.org>

8 files changed, 15 insertions, 13 deletions

diff --git a/src/Makefile b/src/Makefile
index f3232f3..9503a1e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-TARGET = x86_64
+TARGET = amd64
 KBIN = sys/l5
 SHIMDIR = shim
 SHIMBIN = BOOTX64.EFI
@@ -21,14 +21,15 @@ all: root sys image
 
 .PHONY: sys
 sys:
-	cd sys/; make CC=$(CC) AS=$(AS) LD=$(LD)
+	cd sys/; make CC=$(CC) AS=$(AS) LD=$(LD) TARGET=$(TARGET)
 	cp $(KBIN) root/boot/
 
 root:
 	mkdir -p $(SYSROOT)/
 	mkdir -p $(SYSROOT)/boot/
 	mkdir -p $(SYSROOT)/usr/include/
-	cp -vr sys/include/sys/* $(SYSROOT)/usr/include/
+	mkdir -p sys/target/header/
+	rsync -av sys/include/arch/$(TARGET)/ sys/target/header/
 
 .PHONY: sysroot
 image:
@@ -51,4 +52,4 @@ run:
 clean:
 	rm -rf lunos.iso root
 	rm -f $(KBIN)
-	cd sys/; make clean
+	cd sys/; make clean TARGET=$(TARGET)
diff --git a/src/sys/Makefile b/src/sys/Makefile
index a00f247..6e1cc74 100644
--- a/src/sys/Makefile
+++ b/src/sys/Makefile
@@ -6,15 +6,11 @@ LD =
 AS =
 
 .PHONY: all
-all: target md kern
-
-.PHONY: target
-target:
-	mkdir -p target/
+all: kern md
 
 .PHONY: kern
 kern:
-	cd kern; make CC=$(CC) LD=$(LD) AS=$(AS)
+	cd kern; make CC=$(CC) LD=$(LD) AS=$(AS) TARGETDIR=$(TARGETDIR)
 
 .PHONY: md
 md:
diff --git a/src/sys/arch/i386/Makefile b/src/sys/arch/amd64/Makefile
index 78e6e4c..f4f4f48 100644
--- a/src/sys/arch/i386/Makefile
+++ b/src/sys/arch/amd64/Makefile
@@ -1,9 +1,8 @@
 include ../../conf/sys.mk
 
-.SILENT:
 override PROMPT := printf "%s\t\t%s\n"
 
-TARGET = ../../l5
+TARGET_BIN = ../../l5
 TARGET_INC = -I../../target/header/
 CFLAGS = -I../../include/ -I../../include/lib/ $(TARGET_INC) $(MI_CFLAGS) $(MD_CFLAGS)
 CFILES = $(shell find . -name "*.c")
@@ -18,7 +17,7 @@ LD_FLAGS = -Tconf/sys.ld -L../../target -lkern
 
 .PHONY: all
 all: $(OBJECTS) $(ASMOBJECTS)
-	$(LD) $(OBJECTS) $(ASMOBJECTS) -o $(TARGET) $(LD_FLAGS)
+	$(LD) $(OBJECTS) $(ASMOBJECTS) -o $(TARGET_BIN) $(LD_FLAGS)
 
 -include $(DEPS)
 %.o: %.c
diff --git a/src/sys/arch/amd64/amd64 b/src/sys/arch/amd64/amd64
new file mode 100755
index 0000000..de0e4ea
--- /dev/null
+++ b/src/sys/arch/amd64/amd64
diff --git a/src/sys/arch/i386/conf/sys.ld b/src/sys/arch/amd64/conf/sys.ld
index b5d1cf0..b5d1cf0 100644
--- a/src/sys/arch/i386/conf/sys.ld
+++ b/src/sys/arch/amd64/conf/sys.ld
diff --git a/src/sys/arch/i386/locore.S b/src/sys/arch/amd64/locore.S
index 5f7c3df..5f7c3df 100644
--- a/src/sys/arch/i386/locore.S
+++ b/src/sys/arch/amd64/locore.S
diff --git a/src/sys/include/arch/amd64/uart.h b/src/sys/include/arch/amd64/uart.h
new file mode 100644
index 0000000..8c3356a
--- /dev/null
+++ b/src/sys/include/arch/amd64/uart.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_UART_H_
+#define _MACHINE_UART_H_ 1
+
+#include <stdint.h>
+
+#endif  /* !_MACHINE_UART_H_ */
diff --git a/src/sys/kern/amd64 b/src/sys/kern/amd64
new file mode 100644
index 0000000..8b9342e
--- /dev/null
+++ b/src/sys/kern/amd64