gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix (?) build system

Browse Source 
- disable -mno-red-zone for ARM
- add missing INCLUDEDIR
- make gencore.c compile
This commit is contained in:
Hannes Weisbach
2017-10-12 17:10:34 +09:00
parent 43ecf06e83
commit 1cb9b435a9
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@@ -4366,6 +4366,9 @@ case $WITH_TARGET in
if test "X$ETCDIR" = X; then if test "X$ETCDIR" = X; then
ETCDIR="$prefix/etc" ETCDIR="$prefix/etc"
fi fi
if test "X$INCLUDEDIR" = X; then
INCLUDEDIR="$prefix/include"
fi
if test "X$KMODDIR" = X; then if test "X$KMODDIR" = X; then
KMODDIR="$prefix/kmod" KMODDIR="$prefix/kmod"
fi fi

3
configure.ac
View File

@@ -316,6 +316,9 @@ case $WITH_TARGET in
if test "X$ETCDIR" = X; then if test "X$ETCDIR" = X; then
ETCDIR="$prefix/etc" ETCDIR="$prefix/etc"
fi fi
if test "X$INCLUDEDIR" = X; then
INCLUDEDIR="$prefix/include"
fi
if test "X$KMODDIR" = X; then if test "X$KMODDIR" = X; then
KMODDIR="$prefix/kmod" KMODDIR="$prefix/kmod"
fi fi

19
executer/kernel/mcctrl/Makefile.in
View File

@@ -11,10 +11,21 @@ obj-m += mcctrl.o
# POSTK_DEBUG_ARCH_DEP_1, arch depend "-mcmodel" # POSTK_DEBUG_ARCH_DEP_1, arch depend "-mcmodel"
# POSTK_DEBUG_ARCH_DEP_83, arch depend translate_rva_to_rpa() move # POSTK_DEBUG_ARCH_DEP_83, arch depend translate_rva_to_rpa() move
ifeq ($(ARCH), arm64) ccflags-y := -I$(IHK_BASE)/linux/include \
ccflags-y := -I$(IHK_BASE)/linux/include -I$(IHK_BASE)/linux/include/ihk/arch/$(ARCH) -I$(IHK_BASE)/ikc/include -I$(IHK_BASE)/ikc/include/ikc/arch/$(ARCH) -I$(IHK_BASE)/include -I$(IHK_BASE)/include/arch/$(ARCH) -I$(src)/../../include -I$(src)/arch/$(ARCH)/include -DMCEXEC_PATH=\"$(BINDIR)/mcexec\" -I@abs_builddir@ -I$(IHK_BASE)/linux/include/ihk/arch/$(ARCH) \
else -I$(IHK_BASE)/ikc/include \
ccflags-y := -I$(IHK_BASE)/linux/include -I$(IHK_BASE)/linux/include/ihk/arch/$(ARCH) -I$(IHK_BASE)/ikc/include -I$(IHK_BASE)/ikc/include/ikc/arch/$(ARCH) -I$(IHK_BASE)/include -I$(IHK_BASE)/include/arch/$(ARCH) -I$(src)/../../../kernel/include -I$(src)/../../include -mcmodel=kernel -mno-red-zone -DMCEXEC_PATH=\"$(BINDIR)/mcexec\" -I@abs_builddir@ -I@abs_builddir@/../../../ -I$(IHK_BASE)/ikc/include/ikc/arch/$(ARCH) \
-I$(IHK_BASE)/include \
-I$(IHK_BASE)/include/arch/$(ARCH) \
-I$(src)/../../include \
-I$(src)/arch/$(ARCH)/include \
-I@abs_builddir@ \
-I@abs_builddir@/../../../ \
-I$(src)/../../../kernel/include \
-DMCEXEC_PATH=\"$(BINDIR)/mcexec\"
ifneq ($(ARCH), arm64)
ccflags-y += -mno-red-zone -mcmodel=kernel
endif endif
mcctrl-y := driver.o control.o ikc.o syscall.o procfs.o binfmt_mcexec.o mcctrl-y := driver.o control.o ikc.o syscall.o procfs.o binfmt_mcexec.o

9
kernel/Makefile.build.in
View File

@@ -9,14 +9,18 @@ OBJS += zeroobj.o procfs.o devobj.o sysfs.o xpmem.o profile.o freeze.o
OBJS += rbtree.o OBJS += rbtree.o
OBJS += pager.o OBJS += pager.o
# POSTK_DEBUG_ARCH_DEP_18 coredump arch separation. # POSTK_DEBUG_ARCH_DEP_18 coredump arch separation.
DEPSRCS=$(wildcard $(SRC)/*.c)
# OBJS added gencore.o # OBJS added gencore.o
ifeq ($(ARCH), arm64) ifeq ($(ARCH), arm64)
OBJS += gencore.o OBJS += gencore.o
DEPSRCS += $(SRC)/../arch/arm64/kernel/gencore.c
endif endif
DEPSRCS=$(wildcard $(SRC)/*.c)
CFLAGS += -I$(SRC)/include -I@abs_builddir@/../ -I@abs_builddir@/include -D__KERNEL__ -g -fno-omit-frame-pointer -fno-inline -fno-inline-small-functions CFLAGS += -I$(SRC)/include -I@abs_builddir@/../ -I@abs_builddir@/include -D__KERNEL__ -g -fno-omit-frame-pointer -fno-inline -fno-inline-small-functions
ifneq ($(ARCH), arm64)
CFLAGS += -mcmodel=large -mno-red-zone CFLAGS += -mcmodel=large -mno-red-zone
endif
LDFLAGS += -e arch_start LDFLAGS += -e arch_start
IHKOBJ = ihk/ihk.o IHKOBJ = ihk/ihk.o
@@ -73,6 +77,9 @@ $(IHKOBJ): FORCE
%.o: $(SRC)/%.c %.o: $(SRC)/%.c
$(cc_cmd) $(cc_cmd)
gencore.o: ../arch/arm64/kernel/gencore.c
$(cc_cmd)
FORCE: FORCE:
-include Makefile.dep -include Makefile.dep