Changeset 30 for trunk

Timestamp:

Jun 21, 2017, 8:44:15 AM (8 years ago)

Author:

max@…

Message:

Update Makefile.x86.

File:

• trunk/Makefile.x86 (modified) (4 diffs)

trunk/Makefile.x86

@@ -58 +58 @@
 HAL_OBJS    = \
               build/kernel/hal/hal_boot.o         \
+              build/kernel/hal/hal_init.o         \
+              build/kernel/hal/hal_cpu.o          \
+              build/kernel/hal/hal_trap.o         \
+              build/kernel/hal/hal_kentry.o       \
+              build/kernel/hal/x86_printf.o       \
               build/kernel/hal/hal_special.o      \
               build/kernel/hal/hal_context.o      \
@@ -67 +72 @@
               build/kernel/hal/hal_exception.o    \
               build/kernel/hal/hal_interrupt.o    \
-              build/kernel/hal/hal_syscall.o      \
-              build/kernel/hal/hal_kentry.o
+              build/kernel/hal/hal_syscall.o
 
 DEV_OBJS    = build/kernel/devices/dev_txt.o      \
@@ -295 +299 @@
 build/kernel/hal/hal_boot.o:    hal/x86_64/hal_boot.S \
                                 hal/x86_64/hal_boot.h        \
-                                kernel_config.h              \
-                                hal/x86_64/hal_types.h
-        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
-        $(DU) -D $@ > $@.txt
-
-build/kernel/hal/hal_kentry.o:  hal/x86_64/hal_kentry.S \
-                                hal/x86_64/hal_kentry.h \
+                                hal/x86_64/hal_segmentation.h \
+                                kernel_config.h              \
+                                hal/x86_64/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_init.o:    hal/x86_64/hal_init.c \
+                                hal/x86_64/hal_boot.h        \
+                                hal/x86_64/hal_segmentation.h \
+                                kernel_config.h              \
+                                hal/x86_64/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_cpu.o:     hal/x86_64/hal_cpu.S \
+                                hal/x86_64/hal_boot.h        \
+                                hal/x86_64/hal_segmentation.h \
+                                kernel_config.h              \
+                                hal/x86_64/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_trap.o:    hal/x86_64/hal_trap.c \
+                                hal/x86_64/hal_boot.h        \
+                                hal/x86_64/hal_segmentation.h \
+                                kernel_config.h              \
+                                hal/x86_64/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_kentry.o:  hal/x86_64/hal_kentry.S      \
+                                hal/x86_64/hal_kentry.h      \
+                                hal/x86_64/hal_boot.h        \
+                                kernel_config.h              \
+                                hal/x86_64/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/x86_printf.o:  hal/x86_64/x86_printf.c      \
                                 kernel_config.h              \
                                 hal/x86_64/hal_types.h
@@ -365 +401 @@
                                 $(SYS_OBJS_2)               \
                                 $(SYS_OBJS_3)               \
-                                                                kernel/kernel_x86.ld
-        $(LD) -o $@ -z max-page-size=0x1000 -T kernel/kernel_x86.ld  \
+                                kernel/kernel_x86.ld
+        $(LD) -o $@ -z max-page-size=0x1000 -T kernel/kernel_x86.ld \
           $(KERN_OBJS) $(HAL_OBJS) $(DEV_OBJS) $(MM_OBJS)   \
           $(LIBK_OBJS) $(DRIVERS_OBJS) $(VFS_OBJS)          \