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
Linking and MM Fiddling (mm now handles large pages - well, partially)
[tpg/acess2.git]
/
Kernel
/
arch
/
x86_64
/
Makefile
diff --git
a/Kernel/arch/x86_64/Makefile
b/Kernel/arch/x86_64/Makefile
index
3820a69
..
647a49a
100644
(file)
--- a/
Kernel/arch/x86_64/Makefile
+++ b/
Kernel/arch/x86_64/Makefile
@@
-3,15
+3,12
@@
# 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
+MAX_CPUS := 4
-CPPFLAGS =
-CFLAGS =
-ASFLAGS = -f elf
+CPPFLAGS := -DMAX_CPUS=$(MAX_CPUS) -D USE_MP=0
+CFLAGS := $(KERNEL_CFLAGS) -mno-sse -mno-mmx
+ASFLAGS := -f elf64 -D MAX_CPUS=$(MAX_CPUS) -D USE_MP=0
+LDFLAGS := -nostdlib -nodefaultlibs
ifeq ($(ARCH),amd64)
ASFLAGS += -D AMD64=1
ifeq ($(ARCH),amd64)
ASFLAGS += -D AMD64=1
@@
-24,5
+21,6
@@
else
endif
endif
-A_OBJ = start32.ao start64.ao
-A_OBJ += main.o lib.o
+A_OBJ = start32.ao start64.ao desctab.ao
+A_OBJ += main.o lib.o proc.o mm_virt.o mm_phys.o vm8086.o
+A_OBJ += kernelpanic.o errors.o
UCC
git Repository :: git.ucc.asn.au