Rename "arch/" to "arch/x86/"

2024-11-20 11:16:10 -05:00 · 2017-11-08 08:56:12 +00:00 · 2017-11-08 08:56:12 +00:00 · fca1b839ff
commit fca1b839ff
parent 9ea8f106eb
46 changed files with 8 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,7 +3,7 @@

 /config.mk

-/arch/kernel
+/arch/x86/kernel
 /libk/libk.a
 /iso/image.iso
 /iso/rootfs/boot/kernelmq
--- a/6
+++ b/6
@ -1,7 +1,7 @@
 include config.mk

 export INCLUDE = $(shell pwd)/include
-export KERNEL  = $(shell pwd)/arch/kernel
+export KERNEL  = $(shell pwd)/arch/$(ARCH)/kernel
 export LIBK    = $(shell pwd)/libk/libk.a
 export MODULES = $(addprefix $(shell pwd)/modules/, dummy1.bin dummy2.bin)

@ -17,10 +17,10 @@ test: run-test
 ##########

 all-kernel: all-libk
-	make all -C arch
+	make all -C arch/$(ARCH)

 clean-kernel:
-	make clean -C arch
+	make clean -C arch/$(ARCH)

 #######
 # ISO #
--- a/arch/none/Makefile
+++ b/arch/none/Makefile
@ -0,0 +1 @@
+clean:
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@ -10,7 +10,7 @@ OBJS += pfa.c.o
 OBJS += paging.c.o paging.asm.cpp.o

 # Architecture-independent
-OBJS += ../src/info.c.o
+OBJS += ../../src/info.c.o
 OBJS += main.c.o

 # Built-in drivers
--- a/arch/x86/asm.h
+++ b/arch/x86/asm.h
--- a/arch/x86/config.h
+++ b/arch/x86/config.h
--- a/arch/x86/console.c
+++ b/arch/x86/console.c
--- a/arch/x86/console.h
+++ b/arch/x86/console.h
--- a/arch/x86/exception.c
+++ b/arch/x86/exception.c
--- a/arch/x86/hwint.c
+++ b/arch/x86/hwint.c
--- a/arch/x86/hwint.h
+++ b/arch/x86/hwint.h
--- a/arch/x86/init.c
+++ b/arch/x86/init.c
--- a/arch/x86/interrupt.asm
+++ b/arch/x86/interrupt.asm
--- a/arch/x86/interrupt.h
+++ b/arch/x86/interrupt.h
--- a/arch/x86/keyboard.c
+++ b/arch/x86/keyboard.c
--- a/arch/x86/keyboard.h
+++ b/arch/x86/keyboard.h
--- a/arch/x86/linker.ld
+++ b/arch/x86/linker.ld
--- a/arch/x86/logger.c
+++ b/arch/x86/logger.c
--- a/arch/x86/logger.h
+++ b/arch/x86/logger.h
--- a/arch/x86/main.c
+++ b/arch/x86/main.c
--- a/arch/x86/multiboot.c
+++ b/arch/x86/multiboot.c
--- a/arch/x86/multiboot.h
+++ b/arch/x86/multiboot.h
--- a/arch/x86/paging.asm
+++ b/arch/x86/paging.asm
--- a/arch/x86/paging.c
+++ b/arch/x86/paging.c
--- a/arch/x86/paging.h
+++ b/arch/x86/paging.h
--- a/arch/x86/panic.asm
+++ b/arch/x86/panic.asm
--- a/arch/x86/panic.c
+++ b/arch/x86/panic.c
--- a/arch/x86/panic.h
+++ b/arch/x86/panic.h
--- a/arch/x86/pfa.c
+++ b/arch/x86/pfa.c
--- a/arch/x86/pfa.h
+++ b/arch/x86/pfa.h
--- a/arch/x86/pic.c
+++ b/arch/x86/pic.c
--- a/arch/x86/pic.h
+++ b/arch/x86/pic.h
--- a/arch/x86/protected.asm
+++ b/arch/x86/protected.asm
--- a/arch/x86/protected.c
+++ b/arch/x86/protected.c
--- a/arch/x86/protected.h
+++ b/arch/x86/protected.h
--- a/arch/x86/start.s
+++ b/arch/x86/start.s
--- a/arch/x86/syscall.c
+++ b/arch/x86/syscall.c
--- a/arch/x86/tasks.asm
+++ b/arch/x86/tasks.asm
--- a/arch/x86/tasks.h
+++ b/arch/x86/tasks.h
--- a/arch/x86/timer.c
+++ b/arch/x86/timer.c
--- a/arch/x86/timer.h
+++ b/arch/x86/timer.h
--- a/arch/x86/tss.asm
+++ b/arch/x86/tss.asm
--- a/arch/x86/tss.c
+++ b/arch/x86/tss.c
--- a/arch/x86/tss.h
+++ b/arch/x86/tss.h
--- a/env/build-x86.mk
+++ b/env/build-x86.mk
@ -1 +1,2 @@
 export CCPREFIX = i686-elf-
+export ARCH = x86
--- a/env/test-host.mk
+++ b/env/test-host.mk
@ -1 +1,2 @@
 export CCPREFIX =
+export ARCH = none