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

arch: x86 -> x86_64 and build system changes

Browse Source
This commit is contained in:
Balazs Gerofi
2017-10-10 23:24:07 +09:00
committed by Hannes Weisbach
parent 51982de36b
commit 43ecf06e83
70 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile.in
View File

@ -40,34 +40,20 @@ install:
;; \
esac
@case "$(TARGET)" in \
attached-mic) \
mkdir -p -m 755 $(SBINDIR); \
install -m 755 arch/x86/tools/mcreboot-attached-mic.sh $(SBINDIR)/mcreboot; \
install -m 755 arch/x86/tools/mcshutdown-attached-mic.sh $(SBINDIR)/mcshutdown; \
mkdir -p -m 755 $(MANDIR)/man1; \
install -m 644 arch/x86/tools/mcreboot.1 $(MANDIR)/man1/mcreboot.1; \
;; \
builtin-x86) \
mkdir -p -m 755 $(SBINDIR); \
install -m 755 arch/x86/tools/mcreboot-builtin-x86.sh $(SBINDIR)/mcreboot; \
install -m 755 arch/x86/tools/mcshutdown-builtin-x86.sh $(SBINDIR)/mcshutdown; \
mkdir -p -m 755 $(MANDIR)/man1; \
install -m 644 arch/x86/tools/mcreboot.1 $(MANDIR)/man1/mcreboot.1; \
;; \
smp-x86 | smp-arm64) \
mkdir -p -m 755 $(SBINDIR); \
install -m 755 arch/x86/tools/mcreboot-smp-x86.sh $(SBINDIR)/mcreboot.sh; \
install -m 755 arch/x86/tools/mcstop+release-smp-x86.sh $(SBINDIR)/mcstop+release.sh; \
install -m 755 arch/x86/tools/mcoverlay-destroy-smp-x86.sh $(SBINDIR)/mcoverlay-destroy.sh; \
install -m 755 arch/x86/tools/mcoverlay-create-smp-x86.sh $(SBINDIR)/mcoverlay-create.sh; \
install -m 755 arch/x86/tools/eclair-dump-backtrace.exp $(SBINDIR)/eclair-dump-backtrace.exp;\
install -m 755 arch/x86_64/tools/mcreboot-smp-x86.sh $(SBINDIR)/mcreboot.sh; \
install -m 755 arch/x86_64/tools/mcstop+release-smp-x86.sh $(SBINDIR)/mcstop+release.sh; \
install -m 755 arch/x86_64/tools/mcoverlay-destroy-smp-x86.sh $(SBINDIR)/mcoverlay-destroy.sh; \
install -m 755 arch/x86_64/tools/mcoverlay-create-smp-x86.sh $(SBINDIR)/mcoverlay-create.sh; \
install -m 755 arch/x86_64/tools/eclair-dump-backtrace.exp $(SBINDIR)/eclair-dump-backtrace.exp;\
mkdir -p -m 755 $(ETCDIR); \
install -m 644 arch/x86/tools/irqbalance_mck.service $(ETCDIR)/irqbalance_mck.service; \
install -m 644 arch/x86/tools/irqbalance_mck.in $(ETCDIR)/irqbalance_mck.in; \
install -m 644 arch/x86_64/tools/irqbalance_mck.service $(ETCDIR)/irqbalance_mck.service; \
install -m 644 arch/x86_64/tools/irqbalance_mck.in $(ETCDIR)/irqbalance_mck.in; \
mkdir -p -m 755 $(INCDIR); \
install -m 644 kernel/include/swapfmt.h $(INCDIR); \
mkdir -p -m 755 $(MANDIR)/man1; \
install -m 644 arch/x86/tools/mcreboot.1 $(MANDIR)/man1/mcreboot.1; \
install -m 644 arch/x86_64/tools/mcreboot.1 $(MANDIR)/man1/mcreboot.1; \
;; \
*) \
echo "unknown target $(TARGET)" >&2 \

7
arch/x86/kernel/Makefile.arch
View File

@ -1,7 +0,0 @@
IHK_OBJS += cpu.o interrupt.o memory.o trampoline.o local.o context.o
IHK_OBJS += perfctr.o syscall.o vsyscall.o
# POSTK_DEBUG_ARCH_DEP_18 coredump arch separation.
# IHK_OBJS added coredump.o
ifeq ($(ARCH), arm64)
IHK_OBJS += coredump.o
endif

0
arch/x86/elfboot/Makefile → arch/x86_64/elfboot/Makefile
View File

0
arch/x86/elfboot/elfboot.c → arch/x86_64/elfboot/elfboot.c
View File

0
arch/x86/elfboot/head.S → arch/x86_64/elfboot/head.S
View File

0
arch/x86/elfboot/raw.lds → arch/x86_64/elfboot/raw.lds
View File

0
arch/x86/elfboot/test.h → arch/x86_64/elfboot/test.h
View File

0
arch/x86/elfboot/test_main.c → arch/x86_64/elfboot/test_main.c
View File

0
arch/x86/kboot/Makefile → arch/x86_64/kboot/Makefile
View File

0
arch/x86/kboot/data.S → arch/x86_64/kboot/data.S
View File

0
arch/x86/kboot/kernel.lds.S → arch/x86_64/kboot/kernel.lds.S
View File

0
arch/x86/kboot/main.c → arch/x86_64/kboot/main.c
View File

2
arch/x86_64/kernel/Makefile.arch.in Normal file
View File

@ -0,0 +1,2 @@
IHK_OBJS += cpu.o interrupt.o memory.o trampoline.o local.o context.o
IHK_OBJS += perfctr.o syscall.o vsyscall.o

0
arch/x86/kernel/context.S → arch/x86_64/kernel/context.S
View File

0
arch/x86/kernel/coredump.c → arch/x86_64/kernel/coredump.c
View File

0
arch/x86/kernel/cpu.c → arch/x86_64/kernel/cpu.c
View File

0
arch/x86/kernel/gencore.c → arch/x86_64/kernel/gencore.c
View File

0
arch/x86/kernel/include/arch-bitops.h → arch/x86_64/kernel/include/arch-bitops.h
View File

0
arch/x86/kernel/include/arch-futex.h → arch/x86_64/kernel/include/arch-futex.h
View File

0
arch/x86/kernel/include/arch-lock.h → arch/x86_64/kernel/include/arch-lock.h
View File

0
arch/x86/kernel/include/arch-memory.h → arch/x86_64/kernel/include/arch-memory.h
View File

0
arch/x86/kernel/include/arch-string.h → arch/x86_64/kernel/include/arch-string.h
View File

0
arch/x86/kernel/include/arch/auxvec.h → arch/x86_64/kernel/include/arch/auxvec.h
View File

0
arch/x86/kernel/include/arch/cpu.h → arch/x86_64/kernel/include/arch/cpu.h
View File

0
arch/x86/kernel/include/arch/mm.h → arch/x86_64/kernel/include/arch/mm.h
View File

0
arch/x86/kernel/include/arch/mman.h → arch/x86_64/kernel/include/arch/mman.h
View File

0
arch/x86/kernel/include/arch/shm.h → arch/x86_64/kernel/include/arch/shm.h
View File

0
arch/x86/kernel/include/arch_rusage.h → arch/x86_64/kernel/include/arch_rusage.h
View File

0
arch/x86/kernel/include/cas.h → arch/x86_64/kernel/include/cas.h
View File

0
arch/x86/kernel/include/cpulocal.h → arch/x86_64/kernel/include/cpulocal.h
View File

0
arch/x86/kernel/include/elf.h → arch/x86_64/kernel/include/elf.h
View File

0
arch/x86/kernel/include/elfcore.h → arch/x86_64/kernel/include/elfcore.h
View File

0
arch/x86/kernel/include/elfcoregpl.h → arch/x86_64/kernel/include/elfcoregpl.h
View File

0
arch/x86/kernel/include/errno.h → arch/x86_64/kernel/include/errno.h
View File

0
arch/x86/kernel/include/hwcap.h → arch/x86_64/kernel/include/hwcap.h
View File

0
arch/x86/kernel/include/ihk/atomic.h → arch/x86_64/kernel/include/ihk/atomic.h
View File

0
arch/x86/kernel/include/ihk/context.h → arch/x86_64/kernel/include/ihk/context.h
View File

0
arch/x86/kernel/include/ihk/ikc.h → arch/x86_64/kernel/include/ihk/ikc.h
View File

0
arch/x86/kernel/include/ihk/types.h → arch/x86_64/kernel/include/ihk/types.h
View File

0
arch/x86/kernel/include/prctl.h → arch/x86_64/kernel/include/prctl.h
View File

0
arch/x86/kernel/include/registers.h → arch/x86_64/kernel/include/registers.h
View File

0
arch/x86/kernel/include/rlimit.h → arch/x86_64/kernel/include/rlimit.h
View File

0
arch/x86/kernel/include/signal.h → arch/x86_64/kernel/include/signal.h
View File

0
arch/x86/kernel/include/syscall_list.h → arch/x86_64/kernel/include/syscall_list.h
View File

0
arch/x86/kernel/interrupt.S → arch/x86_64/kernel/interrupt.S
View File

0
arch/x86/kernel/local.c → arch/x86_64/kernel/local.c
View File

0
arch/x86/kernel/lock.c → arch/x86_64/kernel/lock.c
View File

0
arch/x86/kernel/memory.c → arch/x86_64/kernel/memory.c
View File

0
arch/x86/kernel/mikc.c → arch/x86_64/kernel/mikc.c
View File

0
arch/x86/kernel/perfctr.c → arch/x86_64/kernel/perfctr.c
View File

0
arch/x86/kernel/syscall.c → arch/x86_64/kernel/syscall.c
View File

0
arch/x86/kernel/trampoline.S → arch/x86_64/kernel/trampoline.S
View File

0
arch/x86/kernel/vsyscall.c → arch/x86_64/kernel/vsyscall.c
View File

0
arch/x86/tools/eclair-dump-backtrace.exp.in → arch/x86_64/tools/eclair-dump-backtrace.exp.in
View File

0
arch/x86/tools/irqbalance_mck.in.in → arch/x86_64/tools/irqbalance_mck.in.in
View File

0
arch/x86/tools/irqbalance_mck.service.in → arch/x86_64/tools/irqbalance_mck.service.in
View File

0
arch/x86/tools/mcoverlay-create-smp-x86.sh.in → arch/x86_64/tools/mcoverlay-create-smp-x86.sh.in
View File

0
arch/x86/tools/mcoverlay-destroy-smp-x86.sh.in → arch/x86_64/tools/mcoverlay-destroy-smp-x86.sh.in
View File

0
arch/x86/tools/mcreboot-attached-mic.sh.in → arch/x86_64/tools/mcreboot-attached-mic.sh.in
View File

0
arch/x86/tools/mcreboot-builtin-x86.sh.in → arch/x86_64/tools/mcreboot-builtin-x86.sh.in
View File

0
arch/x86/tools/mcreboot-smp-x86.sh.in → arch/x86_64/tools/mcreboot-smp-x86.sh.in
View File

0
arch/x86/tools/mcreboot.1in → arch/x86_64/tools/mcreboot.1in
View File

0
arch/x86/tools/mcshutdown-attached-mic.sh.in → arch/x86_64/tools/mcshutdown-attached-mic.sh.in
View File

0
arch/x86/tools/mcshutdown-builtin-x86.sh.in → arch/x86_64/tools/mcshutdown-builtin-x86.sh.in
View File

0
arch/x86/tools/mcstop+release-smp-x86.sh.in → arch/x86_64/tools/mcstop+release-smp-x86.sh.in
View File

32
configure vendored
View File

@ -5021,9 +5021,14 @@ ac_config_headers="$ac_config_headers config.h"
# POSTK_DEBUG_ARCH_DEP_37
# AC_CONFIG_FILES arch dependfiles separate
ac_config_files="$ac_config_files Makefile executer/user/Makefile executer/user/mcexec.1:executer/user/mcexec.1in executer/user/vmcore2mckdump executer/user/arch/$ARCH/Makefile executer/user/arch/x86_64/Makefile executer/kernel/mcctrl/Makefile executer/kernel/mcctrl/arch/$ARCH/Makefile executer/kernel/mcoverlayfs/Makefile executer/kernel/mcoverlayfs/linux-3.10.0-327.36.1.el7/Makefile executer/kernel/mcoverlayfs/linux-4.0.9/Makefile executer/kernel/mcoverlayfs/linux-4.6.7/Makefile executer/include/qlmpilib.h kernel/Makefile kernel/Makefile.build kernel/include/swapfmt.h 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/mcstop+release-smp-x86.sh arch/x86/tools/mcoverlay-destroy-smp-x86.sh arch/x86/tools/mcoverlay-create-smp-x86.sh arch/x86/tools/eclair-dump-backtrace.exp arch/x86/tools/mcshutdown-builtin-x86.sh arch/x86/tools/mcreboot.1:arch/x86/tools/mcreboot.1in arch/x86/tools/irqbalance_mck.service arch/x86/tools/irqbalance_mck.in"
ac_config_files="$ac_config_files Makefile executer/user/Makefile executer/user/mcexec.1:executer/user/mcexec.1in executer/user/vmcore2mckdump executer/user/arch/$ARCH/Makefile executer/user/arch/x86_64/Makefile executer/kernel/mcctrl/Makefile executer/kernel/mcctrl/arch/$ARCH/Makefile executer/kernel/mcoverlayfs/Makefile executer/kernel/mcoverlayfs/linux-3.10.0-327.36.1.el7/Makefile executer/kernel/mcoverlayfs/linux-4.0.9/Makefile executer/kernel/mcoverlayfs/linux-4.6.7/Makefile executer/include/qlmpilib.h kernel/Makefile kernel/Makefile.build kernel/include/swapfmt.h arch/x86_64/tools/mcreboot-attached-mic.sh arch/x86_64/tools/mcshutdown-attached-mic.sh arch/x86_64/tools/mcreboot-builtin-x86.sh arch/x86_64/tools/mcreboot-smp-x86.sh arch/x86_64/tools/mcstop+release-smp-x86.sh arch/x86_64/tools/mcoverlay-destroy-smp-x86.sh arch/x86_64/tools/mcoverlay-create-smp-x86.sh arch/x86_64/tools/eclair-dump-backtrace.exp arch/x86_64/tools/mcshutdown-builtin-x86.sh arch/x86_64/tools/mcreboot.1:arch/x86_64/tools/mcreboot.1in arch/x86_64/tools/irqbalance_mck.service arch/x86_64/tools/irqbalance_mck.in"
if test "$TARGET" = "smp-x86"; then
ac_config_files="$ac_config_files arch/x86_64/kernel/Makefile.arch"
fi
if test "$TARGET" = "smp-arm64"; then
ac_config_files="$ac_config_files kernel/config/config.smp-arm64 arch/arm64/kernel/vdso/Makefile arch/arm64/kernel/Makefile.arch"
@ -5741,18 +5746,19 @@ do
"kernel/Makefile") CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;;
"kernel/Makefile.build") CONFIG_FILES="$CONFIG_FILES kernel/Makefile.build" ;;
"kernel/include/swapfmt.h") CONFIG_FILES="$CONFIG_FILES kernel/include/swapfmt.h" ;;
"arch/x86/tools/mcreboot-attached-mic.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcreboot-attached-mic.sh" ;;
"arch/x86/tools/mcshutdown-attached-mic.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcshutdown-attached-mic.sh" ;;
"arch/x86/tools/mcreboot-builtin-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcreboot-builtin-x86.sh" ;;
"arch/x86/tools/mcreboot-smp-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcreboot-smp-x86.sh" ;;
"arch/x86/tools/mcstop+release-smp-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcstop+release-smp-x86.sh" ;;
"arch/x86/tools/mcoverlay-destroy-smp-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcoverlay-destroy-smp-x86.sh" ;;
"arch/x86/tools/mcoverlay-create-smp-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcoverlay-create-smp-x86.sh" ;;
"arch/x86/tools/eclair-dump-backtrace.exp") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/eclair-dump-backtrace.exp" ;;
"arch/x86/tools/mcshutdown-builtin-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcshutdown-builtin-x86.sh" ;;
"arch/x86/tools/mcreboot.1") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcreboot.1:arch/x86/tools/mcreboot.1in" ;;
"arch/x86/tools/irqbalance_mck.service") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/irqbalance_mck.service" ;;
"arch/x86/tools/irqbalance_mck.in") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/irqbalance_mck.in" ;;
"arch/x86_64/tools/mcreboot-attached-mic.sh") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/mcreboot-attached-mic.sh" ;;
"arch/x86_64/tools/mcshutdown-attached-mic.sh") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/mcshutdown-attached-mic.sh" ;;
"arch/x86_64/tools/mcreboot-builtin-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/mcreboot-builtin-x86.sh" ;;
"arch/x86_64/tools/mcreboot-smp-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/mcreboot-smp-x86.sh" ;;
"arch/x86_64/tools/mcstop+release-smp-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/mcstop+release-smp-x86.sh" ;;
"arch/x86_64/tools/mcoverlay-destroy-smp-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/mcoverlay-destroy-smp-x86.sh" ;;
"arch/x86_64/tools/mcoverlay-create-smp-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/mcoverlay-create-smp-x86.sh" ;;
"arch/x86_64/tools/eclair-dump-backtrace.exp") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/eclair-dump-backtrace.exp" ;;
"arch/x86_64/tools/mcshutdown-builtin-x86.sh") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/mcshutdown-builtin-x86.sh" ;;
"arch/x86_64/tools/mcreboot.1") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/mcreboot.1:arch/x86_64/tools/mcreboot.1in" ;;
"arch/x86_64/tools/irqbalance_mck.service") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/irqbalance_mck.service" ;;
"arch/x86_64/tools/irqbalance_mck.in") CONFIG_FILES="$CONFIG_FILES arch/x86_64/tools/irqbalance_mck.in" ;;
"arch/x86_64/kernel/Makefile.arch") CONFIG_FILES="$CONFIG_FILES arch/x86_64/kernel/Makefile.arch" ;;
"kernel/config/config.smp-arm64") CONFIG_FILES="$CONFIG_FILES kernel/config/config.smp-arm64" ;;
"arch/arm64/kernel/vdso/Makefile") CONFIG_FILES="$CONFIG_FILES arch/arm64/kernel/vdso/Makefile" ;;
"arch/arm64/kernel/Makefile.arch") CONFIG_FILES="$CONFIG_FILES arch/arm64/kernel/Makefile.arch" ;;

30
configure.ac
View File

@ -535,20 +535,26 @@ AC_CONFIG_FILES([
kernel/Makefile
kernel/Makefile.build
kernel/include/swapfmt.h
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/mcstop+release-smp-x86.sh
arch/x86/tools/mcoverlay-destroy-smp-x86.sh
arch/x86/tools/mcoverlay-create-smp-x86.sh
arch/x86/tools/eclair-dump-backtrace.exp
arch/x86/tools/mcshutdown-builtin-x86.sh
arch/x86/tools/mcreboot.1:arch/x86/tools/mcreboot.1in
arch/x86/tools/irqbalance_mck.service
arch/x86/tools/irqbalance_mck.in
arch/x86_64/tools/mcreboot-attached-mic.sh
arch/x86_64/tools/mcshutdown-attached-mic.sh
arch/x86_64/tools/mcreboot-builtin-x86.sh
arch/x86_64/tools/mcreboot-smp-x86.sh
arch/x86_64/tools/mcstop+release-smp-x86.sh
arch/x86_64/tools/mcoverlay-destroy-smp-x86.sh
arch/x86_64/tools/mcoverlay-create-smp-x86.sh
arch/x86_64/tools/eclair-dump-backtrace.exp
arch/x86_64/tools/mcshutdown-builtin-x86.sh
arch/x86_64/tools/mcreboot.1:arch/x86_64/tools/mcreboot.1in
arch/x86_64/tools/irqbalance_mck.service
arch/x86_64/tools/irqbalance_mck.in
])
if test "$TARGET" = "smp-x86"; then
AC_CONFIG_FILES([
arch/x86_64/kernel/Makefile.arch
])
fi
if test "$TARGET" = "smp-arm64"; then
AC_CONFIG_FILES([
kernel/config/config.smp-arm64

1
kernel/Makefile.build.in
View File

@ -16,6 +16,7 @@ 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 += -mcmodel=large -mno-red-zone
LDFLAGS += -e arch_start
IHKOBJ = ihk/ihk.o

2
kernel/Makefile.in
View File

@ -36,7 +36,7 @@ $(O):
@echo 'SRC = $(SRC)' > $@
@echo 'IHKBASE = $(IHKBASE)' >> $@
@echo 'TARGET = $(notdir $(patsubst %/,%,$(dir $@)))' >> $@
@echo 'TARGETDIR = $$(shell echo $$(TARGET) | sed "s/-/\//")' >> $@
@echo 'TARGETDIR = smp/$(ARCH)' >> $@
@cat Makefile.build >> $@
@rm -f $(dir $@)/Makefile.dep

2
kernel/include/elfcore.h
View File

@ -118,7 +118,7 @@ extern void arch_fill_prstatus(struct elf_prstatus64 *prstatus, struct thread *t
#endif /* __HEADER_ELFCORE_H */
#else /* POSTK_DEBUG_ARCH_DEP_18 */
#ifdef __x86_64
#include "../../arch/x86/kernel/include/elfcore.h"
#include "../../arch/x86_64/kernel/include/elfcore.h"
#elif __aarch64__
#include "../../arch/arm64/kernel/include/elfcore.h"
#endif