q3k
/
Cucumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it build.

master
q3k 2013-04-23 14:15:31 +02:00
parent b4f6409bcb
commit a13cbc2fb1
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Kernel/Makefile
View File

@ -12,12 +12,12 @@
default: emulate-nohdd
SHELL:=/bin/bash
ENV:=/usr/xdev/bin
#ENV:=/usr/xdev/bin
TARGET:=x86_64-elf
CC:=$(ENV)/$(TARGET)-gcc
CX:=$(ENV)/$(TARGET)-g++
CC:=$(TARGET)-gcc
CX:=$(TARGET)-g++
AS:=nasm
LD:=$(ENV)/$(TARGET)-ld
LD:=$(TARGET)-ld
# -O2 sets -foptimize-sibling-calls which breaks code...
CFLAGS:=-m64 -mcmodel=large -Wall -Werror -nostdlib -nostartfiles -nodefaultlibs -std=c99 -g
@ -132,7 +132,7 @@ emulate-nohdd: kernel.bin
@echo "[i] Building loader..."
@pushd ../Loader > /dev/null && $(MAKE) -f Makefile loader.bin && popd > /dev/null
@echo "[i] Starting QEMU..."
@qemu-system-x86_64 --no-kvm -d int -smp 4 -kernel ../Loader/loader.bin -initrd kernel.bin
@qemu-system-x86_64 $(QEMU_FLAGS) --no-kvm -d int -smp 4 -kernel ../Loader/loader.bin -initrd kernel.bin
emulate: hdd.img
@echo "[i] Starting QEmu..."

4
Kernel/src/Lua/Makefile
View File

@ -6,13 +6,13 @@
# Your platform. See PLATS for possible values.
PLAT= cucumber-kernel
CC= /usr/xdev/bin/x86_64-elf-gcc
CC=x86_64-elf-gcc
CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
LIBS= -lm $(SYSLIBS) $(MYLIBS)
AR= ar rcu
RANLIB= /usr/xdev/bin/x86_64-elf-ranlib
RANLIB=x86_64-elf-ranlib
RM= rm -f
SYSCFLAGS=

2
Kernel/src/Tier1/CKernelML4.cpp
View File

@ -68,7 +68,7 @@ void CKernelML4::PopulateCommonPointers(void)
for (u16 i = 0; i < 256; i++)
LowmemDirectory->Entries[i].Present = 0;
POPULATE_PAGING_ENTRY(LowmemDPT-Entries[0], paging_scratch_get_physical(LowmemDirectory));
POPULATE_PAGING_ENTRY(LowmemDPT->Entries[0], paging_scratch_get_physical(LowmemDirectory));
ASSERT_ALIGNED(paging_scratch_get_physical(LowmemDirectory));
T_PAGING_TAB *LowmemTable = (T_PAGING_TAB*)kmalloc_aligned(sizeof(T_PAGING_TAB));

5
Loader/Makefile
View File

@ -12,11 +12,10 @@
default: emulate-nohdd
SHELL:=/bin/bash
ENV:=/usr/xdev/bin
TARGET:=i586-elf
CC:=$(ENV)/$(TARGET)-gcc
CC:=$(TARGET)-gcc
AS:=nasm
LD:=$(ENV)/$(TARGET)-ld
LD:=$(TARGET)-ld
# -O2 sets -foptimize-sibling-calls which breaks code...
CFLAGS:=-Wall -Werror -nostdlib -nostartfiles -nodefaultlibs -std=c99 -g