From 4f2c1e07c1a520b6ebb2d683763dd8d181214660 Mon Sep 17 00:00:00 2001
From: Hannes Weisbach <hannes.weisbach@riken.jp>
Date: Wed, 13 Sep 2017 11:14:48 +0900
Subject: [PATCH] Add ARCH variable to Makefiles

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.
---
 executer/user/Makefile.in | 2 +-
 kernel/Makefile.build.in  | 3 ++-
 kernel/Makefile.in        | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/executer/user/Makefile.in b/executer/user/Makefile.in
index b39573ff..3627a1e0 100644
--- a/executer/user/Makefile.in
+++ b/executer/user/Makefile.in
@@ -10,6 +10,7 @@ MANDIR=@MANDIR@
 MCKERNEL_INCDIR=@MCKERNEL_INCDIR@
 MCKERNEL_LIBDIR=@MCKERNEL_LIBDIR@
 KDIR ?= @KDIR@
+ARCH=@ARCH@
 CFLAGS=-Wall -O -I. -I$(VPATH)/arch/${ARCH}
 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}}}')
@@ -17,7 +18,6 @@ VPATH=@abs_srcdir@
 TARGET=mcexec libsched_yield ldump2mcdump.so
 @uncomment_if_ENABLE_MEMDUMP@TARGET+=eclair
 LIBS=@LIBS@
-ARCH=@ARCH@
 IHKDIR ?= $(VPATH)/../../../ihk/linux/include/
 MCEXEC_LIBS=-lmcexec -lrt -lnuma -pthread
 ENABLE_QLMPI=@ENABLE_QLMPI@
diff --git a/kernel/Makefile.build.in b/kernel/Makefile.build.in
index 7b3e5e6a..199dcfb5 100644
--- a/kernel/Makefile.build.in
+++ b/kernel/Makefile.build.in
@@ -1,4 +1,5 @@
 # Makefile.build.in COPYRIGHT FUJITSU LIMITED 2015-2016
+ARCH = @ARCH@
 VPATH=@abs_srcdir@
 SRC=$(VPATH)
 IHKDIR=$(IHKBASE)/$(TARGETDIR)
@@ -37,7 +38,7 @@ OBJCOPY ?= objcopy
 
 # POSTK_DEBUG_ARCH_DEP_26
 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
 SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/ihk CC=$(CC) LD=$(LD) SRC=$(SRC)
 endif
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index 9abaa809..05b933f6 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -1,6 +1,7 @@
 BUILD_TARGET ?= @TARGET@
 KERNDIR=@KERNDIR@
 VPATH=@abs_srcdir@
+ARCH ?= @ARCH@
 
 ifeq ($(ARCH), arm64)
 vdsodir=@abs_builddir@/../arch/$(ARCH)/kernel/vdso