git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel - Disable nested locks in x86, added workqueue to build
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
Makefile
diff --git
a/Kernel/arch/x86/Makefile
b/Kernel/arch/x86/Makefile
index
335d219
..
10cd645
100644
(file)
--- a/
Kernel/arch/x86/Makefile
+++ b/
Kernel/arch/x86/Makefile
@@
-3,16
+3,25
@@
# i386 Architecture Makefile
# arch/i386/Makefile
# i386 Architecture Makefile
# arch/i386/Makefile
-# Assuming build machine is 32-bit ELF
-CC = gcc
-AS = nasm
-LD = ld
-OBJDUMP = objdump
+AS_SUFFIX = asm
CPPFLAGS =
CFLAGS =
ASFLAGS = -f elf
CPPFLAGS =
CFLAGS =
ASFLAGS = -f elf
+USE_MP=0
+
+ifeq ($(ARCH),x86)
+ USE_MP=0
+else ifeq ($(ARCH),x86-smp)
+ USE_MP=1
+endif
+
+#ASFLAGS += -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
+ASFLAGS += -D USE_MP=$(USE_MP)
+CPPFLAGS += -DUSE_MP=$(USE_MP)
+
A_OBJ = start.ao main.o lib.o desctab.ao errors.o irq.o
A_OBJ += mm_phys.o mm_virt.o
A_OBJ = start.ao main.o lib.o desctab.ao errors.o irq.o
A_OBJ += mm_phys.o mm_virt.o
-A_OBJ += proc.o time.o
+A_OBJ += proc.o proc.ao time.o vm8086.o
+A_OBJ += kpanic.o pci.o
UCC
git Repository :: git.ucc.asn.au