From patchwork Fri Jun 9 08:29:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 103443 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp101375qgd; Fri, 9 Jun 2017 01:33:45 -0700 (PDT) X-Received: by 10.84.238.139 with SMTP id v11mr40005256plk.182.1496997225376; Fri, 09 Jun 2017 01:33:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496997225; cv=none; d=google.com; s=arc-20160816; b=awgTxmabD1HvezpBOx+x17OiafboHpDNTDmYxGd27OlQOUvI8P7yS1RcVb9LSCBIC2 Re4wxwyUT6/UtZZtEFzKdD3BDzj8j7QbLhBloX1zXgaT95elXLIqOEQHVTrndbP4GMQK sbEq1sLCCeVdiWwfdWRVtNyYL1Lgx0hMw5Ly/wExym26lbO2gPMr1EVtguTdl15z0KJF H0G9xpdq/l473fAsbYP6Rh52CwHYLE/UE/edLMjyiaj/aajn51iOgD6f7GnY0DuSOIbU yuMcja4U1gz4D6lR86xcCvsuXI+AGfLzyjUvpuH9kutxiaxM2QyvUg+S8yjpQdZoKynt BppQ== 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=/anD9nu6jrmwsiy64F6t1XQhJ7uHv0RgqD7/Mwax6WU=; b=cRQxu/zyUP/ePTY+AbrrgbbPYfcxL0obauMgrB76TWKp8qFQ6je1RSaE2j7bKWiT3k UgX82lsFTBnzSfxmKI08REbSHO74r+fBZ7oyIMgSfJETeK2fPlLnIeJOa+uZnrCXA980 kagpZ4fFqYf1szCVfM+YuNTVkY0dlpd0yhCkyxFSEz60kdvR5l9K/2R9gzk5SgHmI0JJ nCF6EdzUfgpxCxP+4EvHBACtGAw7nUaCNzWDe3KHbpvbKGwNeB+CWysyUWKCNhj5iduv ZZ+DuhyURKnLCn2HYIgta3BXyFcBWFyYErTpPjnSqi4LdeHrs5VeOw8QK2IwRWAjSgBS mcWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com; 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 i35si431389plg.209.2017.06.09.01.33.45; Fri, 09 Jun 2017 01:33:45 -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; 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 S1751638AbdFIIdb (ORCPT + 25 others); Fri, 9 Jun 2017 04:33:31 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:18057 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751600AbdFIId2 (ORCPT ); Fri, 9 Jun 2017 04:33:28 -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 v598TtKM009809; Fri, 9 Jun 2017 17:29:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v598TtKM009809 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1496996996; bh=/anD9nu6jrmwsiy64F6t1XQhJ7uHv0RgqD7/Mwax6WU=; h=From:To:Cc:Subject:Date:From; b=B89odiDh5S+mM4+X1jiS1m2HSVmUUa1kddMUTE4IGMmwcZg7Ypagr5jFsbVNnubCJ E74hNL8G2f0JH9vFNVSAGCCZtqDbfkCEURpziZtnv4Q4OMS2NPv0bd1Sdtf4BFukPt RyZzIpFOo35Rz1vqBzn2GCiKdzZDz1g75Ro+DJpiq7ktwautroK2WjSna+mx0lnOUr ygW7pCl3lthl0Mi/9Z0ZQ+1tPjRPdJaOq9ydOBai50Pz2doGu9TveX+NclAB/p3QQ+ i2wracSpTmr4shIb8RnIBojE4DH6RVLnr2vGE3e4a53rX+LmkO0m7dL1qUgosXw5M6 DdIrvR3YGe2Xw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Nicolas Dichtel , Masahiro Yamada , Daniel Vetter , Michal Marek , Michael Ellerman , x86@kernel.org, "H. Peter Anvin" , Jonathan Corbet , Thomas Gleixner , linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ingo Molnar , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: replace genhdr-y with generated-y, deprecating genhdr-y Date: Fri, 9 Jun 2017 17:29:52 +0900 Message-Id: <1496996992-17857-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 Prior to commit fcc8487d477a ("uapi: export all headers under uapi directories"), genhdr-y was meant to specify generated UAPI headers. - generated-y: generated headers (other than asm-generic wrappers) - header-y : headers to be exported - genhdr-y : generated headers to be exported (generated-y + header-y) Now headers under UAPI directories are all exported. So, there is no more difference between generated-y and genhdr-y. We see two users of genhdr-y, arch/{arm,x86}/include/uapi/asm/Kbuild. They generate some headers in arch/{arm,x86}/include/uapi/generated/ directories, which are obviously exported. Replace genhdr-y with generated-y, and deprecate genhdr-y. Signed-off-by: Masahiro Yamada --- Documentation/kbuild/makefiles.txt | 25 ++++++------------------- arch/arm/include/uapi/asm/Kbuild | 6 +++--- arch/x86/include/uapi/asm/Kbuild | 6 +++--- scripts/Makefile.asm-generic | 2 +- 4 files changed, 13 insertions(+), 26 deletions(-) -- 2.7.4 Acked-by: Nicolas Dichtel diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index e18daca65ccd..1c49e87cea4f 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -45,10 +45,9 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 no-export-headers - --- 7.2 genhdr-y - --- 7.3 generic-y - --- 7.4 generated-y - --- 7.5 mandatory-y + --- 7.2 generic-y + --- 7.3 generated-y + --- 7.4 mandatory-y === 8 Kbuild Variables === 9 Makefile language @@ -1277,18 +1276,7 @@ See subsequent chapter for the syntax of the Kbuild file. avoid exporting specific headers (e.g. kvm.h) on architectures that do not support it. It should be avoided as much as possible. - --- 7.2 genhdr-y - - genhdr-y specifies asm files to be generated. - - Example: - #arch/x86/include/uapi/asm/Kbuild - genhdr-y += unistd_32.h - genhdr-y += unistd_64.h - genhdr-y += unistd_x32.h - - - --- 7.3 generic-y + --- 7.2 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1315,11 +1303,10 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include - --- 7.4 generated-y + --- 7.3 generated-y If an architecture generates other header files alongside generic-y - wrappers, and not included in genhdr-y, then generated-y specifies - them. + wrappers, generated-y specifies them. This prevents them being treated as stale asm-generic wrappers and removed. diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 607f702c2d62..424935e4515d 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,6 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -genhdr-y += unistd-common.h -genhdr-y += unistd-oabi.h -genhdr-y += unistd-eabi.h +generated-y += unistd-common.h +generated-y += unistd-oabi.h +generated-y += unistd-eabi.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 83b6e9a0dce4..da1489cb64dc 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -1,6 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -genhdr-y += unistd_32.h -genhdr-y += unistd_64.h -genhdr-y += unistd_x32.h +generated-y += unistd_32.h +generated-y += unistd_64.h +generated-y += unistd_x32.h diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic index e4d017d53819..95f7d8090152 100644 --- a/scripts/Makefile.asm-generic +++ b/scripts/Makefile.asm-generic @@ -15,7 +15,7 @@ _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj)) # Stale wrappers when the corresponding files are removed from generic-y # need removing. -generated-y := $(generic-y) $(genhdr-y) $(generated-y) +generated-y := $(generic-y) $(generated-y) all-files := $(patsubst %, $(obj)/%, $(generated-y)) old-headers := $(wildcard $(obj)/*.h) unwanted := $(filter-out $(all-files),$(old-headers))