From patchwork Wed Oct 4 03:56:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 114721 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2632109qgn; Tue, 3 Oct 2017 20:57:41 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBRkPOe78MdEuVi/8kvc1iJUNz3ckdGIOnqkNpMHLUDmAEHlTXQZFynoSaNYer7kgegizkS X-Received: by 10.84.132.66 with SMTP id 60mr18770151ple.158.1507089461363; Tue, 03 Oct 2017 20:57:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507089461; cv=none; d=google.com; s=arc-20160816; b=RK75OdNu45nBKGeGW98N1DnFGXdD05TP1jKWdrkPynglBXF5o1NMtN8q8xnKDQ09bE HYZIk/EPFn5znsbR3iYw6sLgXXuzd+zGpuHGtWVzVlSY/JWKKMWB+4ZVtBLTiK52xN6X 3ntVHaeQoDbZ0O/945NhO5Cjz0K39n7e+N4s4L4RIZdYVeyFOymK67Jx8uhXTPsdmXHD QByYJHAToXD8u/Gf6yWkt+qZ6TMpZL3kWT0PhsZjLTc5HpLQeO16/1E61kzfProB9Wbz aNfCb93E1ajwLmZaI9/bEl/MmKcFkeaBtU+veHCDGFipNdebOvahVHe5FfRDw24CKVbe 82tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=XMCZDJ9HPinVSKIZn38d7DIoXDS/DClxUKwmJGuUu/s=; b=ltlps/x/DQtV8vBL2/vIBEFIm6PH/qiPQ55jLKcYiSbaTWFglrxUntz/CZbINHCidJ 4CtkhBS/JxoT9vMEdCPG+wVZmGmnlPI2Y05fytU8o81y+7pbY7YcFdoNyL154As02Kt+ SA3xjS+JUGQFWAliKRqshhZiTT4O5Ezavh8DgUvROhQ4ShVwGr6RKhJuawMIEhKCL4x4 9YrCnVcSZIJ6IK9Wi7L2SevIQplC9TeyN//3JjC64mKDktMm0ldMlxJPpC8Xsfu+b2pg MIeFjTXtHIBL0ueVuBZr8DIXb1AIvNsDRD2APf7zkMYqLiT56S42v7U/GuyY7RcsdEED Z5iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=rRwAf3A4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n62si11188648pfh.131.2017.10.03.20.57.41; Tue, 03 Oct 2017 20:57:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=rRwAf3A4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752135AbdJDD5i (ORCPT + 26 others); Tue, 3 Oct 2017 23:57:38 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:25223 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751527AbdJDD5c (ORCPT ); Tue, 3 Oct 2017 23:57:32 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id v943u8Pm001949; Wed, 4 Oct 2017 12:56:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v943u8Pm001949 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1507089369; bh=XMCZDJ9HPinVSKIZn38d7DIoXDS/DClxUKwmJGuUu/s=; h=From:To:Cc:Subject:Date:From; b=rRwAf3A49bFlKJ3KowDfQ/gBQO9bKIRsmrSaVPNAUuYYio9q1Jb7g8aWlYljHYHPR tEKHHvbkRQNgnE2tJF38UaXFvW/+ZB9I8dGtocTbRr4N9msPRIZoBLYqvH7z224FHD Wfg5OG5nwzOL+hY3xUs0GpWRyP2yFH0cJaK7xlrnVN7X9Ttrb6FSTKx+emoJULrOd2 alMWqCmpYElo9I/hG5eQm7mt5wWcT44szI+HSNGdjQ6yXOfTLzEhiqiQjJ9INGkssK vX1gDdLvboPPx8QbxAX21IEamTd5j4HfmfVh4fATmwrKqFDoxyrEvCNFw5XuobqD9J np3w4d2scTp2g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Douglas Anderson , Sam Ravnborg , linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 1/4] kbuild: replace $(hdr-arch) with $(SRCARCH) Date: Wed, 4 Oct 2017 12:56:04 +0900 Message-Id: <1507089367-10402-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit 5e53879008b9 ("sparc,sparc64: unify Makefile"), hdr-arch and SRCARCH always match. Signed-off-by: Masahiro Yamada --- Makefile | 21 +++++++++------------ scripts/Makefile.headersinst | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) -- 2.7.4 Reviewed-by: Douglas Anderson diff --git a/Makefile b/Makefile index cf007a3..8d900ba 100644 --- a/Makefile +++ b/Makefile @@ -283,9 +283,6 @@ ifeq ($(ARCH),tilegx) SRCARCH := tile endif -# Where to locate arch specific headers -hdr-arch := $(SRCARCH) - KCONFIG_CONFIG ?= .config export KCONFIG_CONFIG @@ -378,8 +375,8 @@ CFLAGS_KCOV := $(call cc-option,-fsanitize-coverage=trace-pc,) # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE := \ - -I$(srctree)/arch/$(hdr-arch)/include/uapi \ - -I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \ + -I$(srctree)/arch/$(SRCARCH)/include/uapi \ + -I$(objtree)/arch/$(SRCARCH)/include/generated/uapi \ -I$(srctree)/include/uapi \ -I$(objtree)/include/generated/uapi \ -include $(srctree)/include/linux/kconfig.h @@ -387,8 +384,8 @@ USERINCLUDE := \ # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option LINUXINCLUDE := \ - -I$(srctree)/arch/$(hdr-arch)/include \ - -I$(objtree)/arch/$(hdr-arch)/include/generated \ + -I$(srctree)/arch/$(SRCARCH)/include \ + -I$(objtree)/arch/$(SRCARCH)/include/generated \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ -I$(objtree)/include \ $(USERINCLUDE) @@ -1134,8 +1131,8 @@ headerdep: #Default location for installed headers export INSTALL_HDR_PATH = $(objtree)/usr -# If we do an all arch process set dst to include/arch-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) +# If we do an all arch process set dst to include/arch-$(SRCARCH) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(SRCARCH), dst=include) PHONY += archheaders archheaders: @@ -1153,10 +1150,10 @@ headers_install_all: PHONY += headers_install headers_install: __headers - $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ + $(if $(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all @@ -1165,7 +1162,7 @@ headers_check_all: headers_install_all PHONY += headers_check headers_check: headers_install $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include HDRCHECK=1 - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) HDRCHECK=1 + $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi $(hdr-dst) HDRCHECK=1 # --------------------------------------------------------------------------- # Kernel selftest diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 343d586..5692d7a 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -30,7 +30,7 @@ __headers: $(subdirs) $(subdirs): $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(dst)/$@ -# Skip header install/check for include/uapi and arch/$(hdr-arch)/include/uapi. +# Skip header install/check for include/uapi and arch/$(SRCARCH)/include/uapi. # We have only sub-directories there. skip-inst := $(if $(filter %/uapi,$(obj)),1)