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

fix out of tree build

Browse Source
This commit is contained in:
Tomoki Shirasawa
2015-07-01 23:58:50 +09:00
parent b7c5cba361
commit fa79db3bcc
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -3816,7 +3816,7 @@ TARGET="$WITH_TARGET"
ac_config_files="$ac_config_files Makefile executer/user/Makefile executer/kernel/Makefile executer/kernel/mcctrl.h kernel/Makefile kernel/Makefile.build arch/x86/tools/mcreboot-attached-mic.sh arch/x86/tools/mcshutdown-attached-mic.sh arch/x86/tools/mcreboot-builtin-x86.sh arch/x86/tools/mcreboot-smp-x86.sh arch/x86/tools/mcshutdown-builtin-x86.sh arch/x86/tools/mcreboot.1:arch/x86/tools/mcreboot.1in" ac_config_files="$ac_config_files Makefile executer/user/Makefile executer/kernel/Makefile kernel/Makefile kernel/Makefile.build arch/x86/tools/mcreboot-attached-mic.sh arch/x86/tools/mcshutdown-attached-mic.sh arch/x86/tools/mcreboot-builtin-x86.sh arch/x86/tools/mcreboot-smp-x86.sh arch/x86/tools/mcshutdown-builtin-x86.sh arch/x86/tools/mcreboot.1:arch/x86/tools/mcreboot.1in"
if test "x$enable_dcfa" = xyes; then : if test "x$enable_dcfa" = xyes; then :
@ -4533,7 +4533,6 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"executer/user/Makefile") CONFIG_FILES="$CONFIG_FILES executer/user/Makefile" ;; "executer/user/Makefile") CONFIG_FILES="$CONFIG_FILES executer/user/Makefile" ;;
"executer/kernel/Makefile") CONFIG_FILES="$CONFIG_FILES executer/kernel/Makefile" ;; "executer/kernel/Makefile") CONFIG_FILES="$CONFIG_FILES executer/kernel/Makefile" ;;
"executer/kernel/mcctrl.h") CONFIG_FILES="$CONFIG_FILES executer/kernel/mcctrl.h" ;;
"kernel/Makefile") CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;; "kernel/Makefile") CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;;
"kernel/Makefile.build") CONFIG_FILES="$CONFIG_FILES kernel/Makefile.build" ;; "kernel/Makefile.build") CONFIG_FILES="$CONFIG_FILES kernel/Makefile.build" ;;
"arch/x86/tools/mcreboot-attached-mic.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcreboot-attached-mic.sh" ;; "arch/x86/tools/mcreboot-attached-mic.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcreboot-attached-mic.sh" ;;

1
configure.ac
View File

@ -161,7 +161,6 @@ AC_CONFIG_FILES([
Makefile Makefile
executer/user/Makefile executer/user/Makefile
executer/kernel/Makefile executer/kernel/Makefile
executer/kernel/mcctrl.h
kernel/Makefile kernel/Makefile
kernel/Makefile.build kernel/Makefile.build
arch/x86/tools/mcreboot-attached-mic.sh arch/x86/tools/mcreboot-attached-mic.sh

3
executer/kernel/Makefile.in
View File

@ -2,11 +2,12 @@ KDIR ?= @KDIR@
ARCH ?= @ARCH@ ARCH ?= @ARCH@
src = @abs_srcdir@ src = @abs_srcdir@
KMODDIR=@KMODDIR@ KMODDIR=@KMODDIR@
BINDIR=@BINDIR@
IHK_BASE=$(src)/../../../ihk IHK_BASE=$(src)/../../../ihk
obj-m += mcctrl.o obj-m += mcctrl.o
ccflags-y := -I$(IHK_BASE)/linux/include -I$(IHK_BASE)/ikc/include -I$(IHK_BASE)/include -I$(src)/../include -mcmodel=kernel -mno-red-zone ccflags-y := -I$(IHK_BASE)/linux/include -I$(IHK_BASE)/ikc/include -I$(IHK_BASE)/include -I$(src)/../include -mcmodel=kernel -mno-red-zone -DMCEXEC_PATH=\"$(BINDIR)/mcexec\"
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

2
executer/kernel/mcctrl.h.in → executer/kernel/mcctrl.h
View File

@ -38,8 +38,6 @@
#include <ihk/ikc.h> #include <ihk/ikc.h>
#include <ikc/master.h> #include <ikc/master.h>
#define MCEXEC_PATH "@BINDIR@/mcexec"
#define SCD_MSG_PREPARE_PROCESS 0x1 #define SCD_MSG_PREPARE_PROCESS 0x1
#define SCD_MSG_PREPARE_PROCESS_ACKED 0x2 #define SCD_MSG_PREPARE_PROCESS_ACKED 0x2
#define SCD_MSG_PREPARE_PROCESS_NACKED 0x7 #define SCD_MSG_PREPARE_PROCESS_NACKED 0x7