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

Add ARCH variable to Makefiles

Browse Source 
In some Makefiles the ARCH variable was not set, although it was used.
In executer/user/Makefile.in it was used before it was set.
This commit is contained in:
Hannes Weisbach
2017-09-13 11:14:48 +09:00
parent 77bb3038d3
commit 4f2c1e07c1
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
executer/user/Makefile.in
View File

@@ -10,6 +10,7 @@ MANDIR=@MANDIR@
MCKERNEL_INCDIR=@MCKERNEL_INCDIR@ MCKERNEL_INCDIR=@MCKERNEL_INCDIR@
MCKERNEL_LIBDIR=@MCKERNEL_LIBDIR@ MCKERNEL_LIBDIR=@MCKERNEL_LIBDIR@
KDIR ?= @KDIR@ KDIR ?= @KDIR@
ARCH=@ARCH@
CFLAGS=-Wall -O -I. -I$(VPATH)/arch/${ARCH} CFLAGS=-Wall -O -I. -I$(VPATH)/arch/${ARCH}
LDFLAGS=@LDFLAGS@ LDFLAGS=@LDFLAGS@
RPATH=$(shell echo $(LDFLAGS)|awk '{for(i=1;i<=NF;i++){if($$i~/^-L/){w=$$i;sub(/^-L/,"-Wl,-rpath,",w);print w}}}') RPATH=$(shell echo $(LDFLAGS)|awk '{for(i=1;i<=NF;i++){if($$i~/^-L/){w=$$i;sub(/^-L/,"-Wl,-rpath,",w);print w}}}')
@@ -17,7 +18,6 @@ VPATH=@abs_srcdir@
TARGET=mcexec libsched_yield ldump2mcdump.so TARGET=mcexec libsched_yield ldump2mcdump.so
@uncomment_if_ENABLE_MEMDUMP@TARGET+=eclair @uncomment_if_ENABLE_MEMDUMP@TARGET+=eclair
LIBS=@LIBS@ LIBS=@LIBS@
ARCH=@ARCH@
IHKDIR ?= $(VPATH)/../../../ihk/linux/include/ IHKDIR ?= $(VPATH)/../../../ihk/linux/include/
MCEXEC_LIBS=-lmcexec -lrt -lnuma -pthread MCEXEC_LIBS=-lmcexec -lrt -lnuma -pthread
ENABLE_QLMPI=@ENABLE_QLMPI@ ENABLE_QLMPI=@ENABLE_QLMPI@

3
kernel/Makefile.build.in
View File

@@ -1,4 +1,5 @@
# Makefile.build.in COPYRIGHT FUJITSU LIMITED 2015-2016 # Makefile.build.in COPYRIGHT FUJITSU LIMITED 2015-2016
ARCH = @ARCH@
VPATH=@abs_srcdir@ VPATH=@abs_srcdir@
SRC=$(VPATH) SRC=$(VPATH)
IHKDIR=$(IHKBASE)/$(TARGETDIR) IHKDIR=$(IHKBASE)/$(TARGETDIR)
@@ -37,7 +38,7 @@ OBJCOPY ?= objcopy
# POSTK_DEBUG_ARCH_DEP_26 # POSTK_DEBUG_ARCH_DEP_26
ifeq ($(ARCH), arm64) ifeq ($(ARCH), arm64)
SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/ihk CC=$(CC) LD=$(LD) OBJCOPY=$(OBJCOPY) SRC=$(SRC) SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/ihk CC=$(CC) LD=$(LD) OBJCOPY=$(OBJCOPY) SRC=$(SRC) ARCH=$(ARCH)
else else
SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/ihk CC=$(CC) LD=$(LD) SRC=$(SRC) SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/ihk CC=$(CC) LD=$(LD) SRC=$(SRC)
endif endif

1
kernel/Makefile.in
View File

@@ -1,6 +1,7 @@
BUILD_TARGET ?= @TARGET@ BUILD_TARGET ?= @TARGET@
KERNDIR=@KERNDIR@ KERNDIR=@KERNDIR@
VPATH=@abs_srcdir@ VPATH=@abs_srcdir@
ARCH ?= @ARCH@
ifeq ($(ARCH), arm64) ifeq ($(ARCH), arm64)
vdsodir=@abs_builddir@/../arch/$(ARCH)/kernel/vdso vdsodir=@abs_builddir@/../arch/$(ARCH)/kernel/vdso