Split of architecture-dependent and -independent functions for i386,
mainly in the kernel and headers. This split based on work by Ingmar Alting <iaalting@cs.vu.nl> done for his Minix PowerPC architecture port. . kernel does not program the interrupt controller directly, do any other architecture-dependent operations, or contain assembly any more, but uses architecture-dependent functions in arch/$(ARCH)/. . architecture-dependent constants and types defined in arch/$(ARCH)/include. . <ibm/portio.h> moved to <minix/portio.h>, as they have become, for now, architecture-independent functions. . int86, sdevio, readbios, and iopenable are now i386-specific kernel calls and live in arch/i386/do_* now. . i386 arch now supports even less 86 code; e.g. mpx86.s and klib86.s have gone, and 'machine.protected' is gone (and always taken to be 1 in i386). If 86 support is to return, it should be a new architecture. . prototypes for the architecture-dependent functions defined in kernel/arch/$(ARCH)/*.c but used in kernel/ are in kernel/proto.h . /etc/make.conf included in makefiles and shell scripts that need to know the building architecture; it defines ARCH=<arch>, currently only i386. . some basic per-architecture build support outside of the kernel (lib) . in clock.c, only dequeue a process if it was ready . fixes for new include files files deleted: . mpx/klib.s - only for choosing between mpx/klib86 and -386 . klib86.s - only for 86 i386-specific files files moved (or arch-dependent stuff moved) to arch/i386/: . mpx386.s (entry point) . klib386.s . sconst.h . exception.c . protect.c . protect.h . i8269.c
This commit is contained in:
+5
-18
@@ -1,15 +1,18 @@
|
||||
# Makefile for system library implementation
|
||||
|
||||
include /etc/make.conf
|
||||
|
||||
# Directories
|
||||
u = /usr
|
||||
i = $u/include
|
||||
a = ../arch
|
||||
|
||||
# Programs, flags, etc.
|
||||
CC = exec cc $(CFLAGS) -c
|
||||
CCNOPROF = exec cc $(CFLAGSNOPROF) -c # no call profiling for these
|
||||
CPP = $l/cpp
|
||||
LD = $(CC) -.o
|
||||
CFLAGS = -I$i $(CPROFILE)
|
||||
CFLAGS = -I$i $(CPROFILE) -I$a/$(ARCH)/include
|
||||
CFLAGSNOPROF = -I$i
|
||||
LDFLAGS = -i
|
||||
|
||||
@@ -31,8 +34,6 @@ OBJECTS = \
|
||||
$(SYSTEM)(do_irqctl.o) \
|
||||
$(SYSTEM)(do_devio.o) \
|
||||
$(SYSTEM)(do_vdevio.o) \
|
||||
$(SYSTEM)(do_int86.o) \
|
||||
$(SYSTEM)(do_sdevio.o) \
|
||||
$(SYSTEM)(do_copy.o) \
|
||||
$(SYSTEM)(do_vcopy.o) \
|
||||
$(SYSTEM)(do_umap.o) \
|
||||
@@ -44,19 +45,17 @@ OBJECTS = \
|
||||
$(SYSTEM)(do_getksig.o) \
|
||||
$(SYSTEM)(do_endksig.o) \
|
||||
$(SYSTEM)(do_kill.o) \
|
||||
$(SYSTEM)(do_readbios.o) \
|
||||
$(SYSTEM)(do_sigsend.o) \
|
||||
$(SYSTEM)(do_sigreturn.o) \
|
||||
$(SYSTEM)(do_abort.o) \
|
||||
$(SYSTEM)(do_getinfo.o) \
|
||||
$(SYSTEM)(do_iopenable.o) \
|
||||
$(SYSTEM)(do_vm.o) \
|
||||
$(SYSTEM)(do_vm_setbuf.o) \
|
||||
$(SYSTEM)(do_sprofile.o) \
|
||||
$(SYSTEM)(do_cprofile.o) \
|
||||
$(SYSTEM)(do_profbuf.o)
|
||||
|
||||
$(SYSTEM): $(OBJECTS)
|
||||
build $(SYSTEM): $(OBJECTS)
|
||||
aal cr $@ *.o
|
||||
|
||||
clean:
|
||||
@@ -102,15 +101,9 @@ $(SYSTEM)(do_irqctl.o): do_irqctl.c
|
||||
$(SYSTEM)(do_devio.o): do_devio.c
|
||||
$(CC) do_devio.c
|
||||
|
||||
$(SYSTEM)(do_sdevio.o): do_sdevio.c
|
||||
$(CC) do_sdevio.c
|
||||
|
||||
$(SYSTEM)(do_vdevio.o): do_vdevio.c
|
||||
$(CC) do_vdevio.c
|
||||
|
||||
$(SYSTEM)(do_int86.o): do_int86.c
|
||||
$(CC) do_int86.c
|
||||
|
||||
$(SYSTEM)(do_copy.o): do_copy.c
|
||||
$(CC) do_copy.c
|
||||
|
||||
@@ -144,9 +137,6 @@ $(SYSTEM)(do_getinfo.o): do_getinfo.c
|
||||
$(SYSTEM)(do_abort.o): do_abort.c
|
||||
$(CC) do_abort.c
|
||||
|
||||
$(SYSTEM)(do_readbios.o): do_readbios.c
|
||||
$(CC) do_readbios.c
|
||||
|
||||
$(SYSTEM)(do_setgrant.o): do_setgrant.c
|
||||
$(CC) do_setgrant.c
|
||||
|
||||
@@ -159,9 +149,6 @@ $(SYSTEM)(do_safecopy.o): do_safecopy.c
|
||||
$(SYSTEM)(do_segctl.o): do_segctl.c
|
||||
$(CC) do_segctl.c
|
||||
|
||||
$(SYSTEM)(do_iopenable.o): do_iopenable.c
|
||||
$(CC) do_iopenable.c
|
||||
|
||||
$(SYSTEM)(do_vm.o): do_vm.o
|
||||
do_vm.o: do_vm.c
|
||||
$(CC) do_vm.c
|
||||
|
||||
Reference in New Issue
Block a user