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
Changed i386 build to x86
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
Makefile
diff --git
a/Kernel/arch/x86/Makefile
b/Kernel/arch/x86/Makefile
index
aa5d8e2
..
10cd645
100644
(file)
--- a/
Kernel/arch/x86/Makefile
+++ b/
Kernel/arch/x86/Makefile
@@
-10,23
+10,18
@@
CFLAGS =
ASFLAGS = -f elf
USE_MP=0
ASFLAGS = -f elf
USE_MP=0
-USE_PAE=0
-ifeq ($(ARCH),
i3
86)
+ifeq ($(ARCH),
x
86)
USE_MP=0
USE_MP=0
- USE_PAE=0
-else ifeq ($(ARCH),i486)
+else ifeq ($(ARCH),x86-smp)
USE_MP=1
USE_MP=1
-else ifeq ($(ARCH),i586)
- USE_MP=1
- USE_PAE=1
endif
#ASFLAGS += -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
endif
#ASFLAGS += -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
-ASFLAGS += -D USE_MP=$(USE_MP)
-D USE_PAE=$(USE_PAE)
-CPPFLAGS += -DUSE_MP=$(USE_MP)
-DUSE_PAE=$(USE_PAE)
+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 += proc.o proc.ao time.o vm8086.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 proc.ao time.o vm8086.o
-A_OBJ += kpanic.o
+A_OBJ += kpanic.o
pci.o
UCC
git Repository :: git.ucc.asn.au