From patchwork Tue Feb 19 09:33:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 158706 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3450975jaa; Tue, 19 Feb 2019 01:33:31 -0800 (PST) X-Google-Smtp-Source: AHgI3IadB1lFpdpxReqflJA7l+4D3o6IdpCZpEjIiis+aH253jwmQ4v0JUSOPs7DtCz/nPzCyyWN X-Received: by 2002:a17:902:7006:: with SMTP id y6mr16211609plk.260.1550568811196; Tue, 19 Feb 2019 01:33:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550568811; cv=none; d=google.com; s=arc-20160816; b=tta73o8GLolXaBggqfbkWeZZp36U8torpYOX4EnoY72xrq1ckat8NWEXoCvGk9NZwy uoV9nJuqU6p9M7WQIaCitmm1dnQv77085DHtBdy9oxqL2jpcuS1Q362RlbyjRFciS0gW ov/hng7quvfS6U4TAgn9bXDJeog3wmUvenxTtEC8COku0kbMhoxyMBi6UrFfdEu+bvyh 7TSXfIqFpPNeuvIEuT+G511aD+vn4G9YtG6P5Wc3e6Avxw3Ebxp+g0vWY2UcyCSV9VXA okEA6TGL9Ygjg+7xHYkvfe/2jdtm4RlQ6GfL1PyIMbbo4j+yQPUP5lpRzmcOfsDoPOa/ sDqA== 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; bh=HvvF60VcQISFTj9szcbmZ1V43ms0dB+V6d8yWP+KhJc=; b=DIeHZu8pLtK2eqAc61cjt7mrPHYsG64o+Ng9IYE9lB3Tx+njxyYmSEUlLNm/bzyHAC dMhOKDfJD63DSpiMilVqiBapYhFpuZlLMMQznVO0hcwcduvIUmeB+jQUavTc/VTNRMpm WLRaEXOuPk/rIedJiLuWK2eZ333GgtQnUPbxTDTT/rLa7YdHfL0PvKwOiU24nUsRz/GF eo/d1ot2QRFkM5IZoEL5iGsiuiBtDtbz03ffkTbmg4Fmqdofd+1LYO0w58O0YAYE77kv Pwhqnd7mz5CybWMpC20Ts5evmIq6rIxQuMyUVqxnasxhsYojVJdJyLBk3XP69x+JGe6Z 93Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=woJkBY3g; 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 e125si14382897pgc.411.2019.02.19.01.33.30; Tue, 19 Feb 2019 01:33:31 -0800 (PST) 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=woJkBY3g; 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 S1728243AbfBSJd3 (ORCPT + 32 others); Tue, 19 Feb 2019 04:33:29 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:52743 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728116AbfBSJd2 (ORCPT ); Tue, 19 Feb 2019 04:33:28 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x1J9XBkK002572; Tue, 19 Feb 2019 18:33:11 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x1J9XBkK002572 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1550568791; bh=HvvF60VcQISFTj9szcbmZ1V43ms0dB+V6d8yWP+KhJc=; h=From:To:Cc:Subject:Date:From; b=woJkBY3gNgTmTZVBCNIZlOa4za9glgTvi90k465n5OoQRqtYYZMH7V4hk+lKWOwbz /ilk9kK4N5n9hfEaPxfagugnF0eDtDEHpgdxGwUBD7HPedVNbrbZRAsV9hhAyUN+FR MFAznGGAtIc5TxDPkQ2xGgcGTP1yethh1lkLqo+lU4EjYymavxQb78KcHzA6Q92+aZ qzynSDziCPKAS27c+U0egQR6aibPiloCaBNVuOtIkT5VflqbGw4ZZgAh+jAWA8+aux IOkl3nNNaqx5GY8pgEtQum3EC/TPCdVr/eJnCrVYWP5mY8Yqu0zFiyT6/BwVdlR9R8 Ts0S4iXkICFtg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Kieran Bingham , Masahiro Yamada , Michal Marek , Heiko Carstens , linux-kernel@vger.kernel.org Subject: [PATCH 1/5] scripts/gdb: delay generation of gdb constants.py Date: Tue, 19 Feb 2019 18:33:02 +0900 Message-Id: <1550568787-18710-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 scripts/gdb/linux/constants.py is never used in the kernel build process. There is no good reason to create it so early. Get it out of the 'prepare' stage. Signed-off-by: Masahiro Yamada --- Kbuild | 10 ---------- Makefile | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) -- 2.7.4 Reviewed-by: Kieran Bingham diff --git a/Kbuild b/Kbuild index 65db5be..4cebcc7 100644 --- a/Kbuild +++ b/Kbuild @@ -6,7 +6,6 @@ # 2) Generate timeconst.h # 3) Generate asm-offsets.h (may need bounds.h and timeconst.h) # 4) Check for missing system calls -# 5) Generate constants.py (may need bounds.h) ##### # 1) Generate bounds.h @@ -58,14 +57,5 @@ quiet_cmd_syscalls = CALL $< missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE $(call cmd,syscalls) -##### -# 5) Generate constants for Python GDB integration -# - -extra-$(CONFIG_GDB_SCRIPTS) += build_constants_py - -build_constants_py: $(timeconst-file) $(bounds-file) - @$(MAKE) $(build)=scripts/gdb/linux $@ - # Keep these three files during make clean no-clean-files := $(bounds-file) $(offsets-file) $(timeconst-file) diff --git a/Makefile b/Makefile index 88db36b..26dbcb7 100644 --- a/Makefile +++ b/Makefile @@ -1513,6 +1513,17 @@ PHONY += $(DOC_TARGETS) $(DOC_TARGETS): scripts_basic FORCE $(Q)$(MAKE) $(build)=Documentation $@ +# Misc +# --------------------------------------------------------------------------- + +PHONY += scripts_gdb +scripts_gdb: prepare + $(Q)$(MAKE) $(build)=scripts/gdb/linux build_constants_py + +ifdef CONFIG_GDB_SCRIPTS +all: scripts_gdb +endif + else # KBUILD_EXTMOD ### From patchwork Tue Feb 19 09:33:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 158707 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3450995jaa; Tue, 19 Feb 2019 01:33:32 -0800 (PST) X-Google-Smtp-Source: AHgI3IZSJO+ci6l2szXHsgxF7Sr3VOadIAY8swEdmp1jIxXzzhW97kKSYz1ZHUQZhyaDqdu/l381 X-Received: by 2002:a62:864c:: with SMTP id x73mr28728292pfd.49.1550568812309; Tue, 19 Feb 2019 01:33:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550568812; cv=none; d=google.com; s=arc-20160816; b=uyMu7rK9gX1kHfd5/7ZZnVQ3gD2QAL2H2ED3LG6hZk0oGrBiMUuVtBjMIKsKBSsgct OigbMRYbZrieSDNmyUQf9oirAXi1LotXOQmSum+Y4RChNf59xtytiizutF0AVsRqw9Ti u3zEgCvsHI9fcY9Gk3PqqASNF/CqP+G8+e0IhHMPAYqM4MOECbrDZgHM2trT4muUtd8X vQfCMkJ32vUoRF1KZD6hzYMuhho7BCe3vzdoWQIbZBFyt00PSMbA+U7xEek9PkTSGFJb BnMLfqc6GhB3527P2hurXczpUUj9yHSOXxtPY1htIHOphVaOphbt8fsd2zdvXtJgbtFc 4OCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=XdRtcC+1Mcw++lGM+PLPkwfGmBgVfh6AWmRhE8986rg=; b=EEOS/cj+4cR8HnLFHs+9GwnIwbDbNcGw9dTQGBfPzALO4c0G51+GiCfm1Y6r8hxdcs ZFqiC4+Fvvrxp+aykiOlaB6jBr1mPTSRVWW2T7K9kRQ3SkdVnJ1X7FHbhVobRIM87Tln Fn7cxMO9oXI2djwgm9696ka+Yb3+UpEs9RCovv4KFbPP2Chf/GCwajuVNUnhgotdOl0n 6gUNYmC8yCMStRYIkmRjEvc2XetwkL8tw0YyJYape/0NtJrFh9LF27uvu2PkHcT5TS+o Rp1slkebE4XZFMBlrzfzBmzRBcPpSNiPd1SOFFJ94/oh4NYslbig9IGT3AGtW3O6No1D 30Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=hEvMmmB5; 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 e125si14382897pgc.411.2019.02.19.01.33.32; Tue, 19 Feb 2019 01:33:32 -0800 (PST) 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=hEvMmmB5; 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 S1728287AbfBSJdb (ORCPT + 32 others); Tue, 19 Feb 2019 04:33:31 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:52740 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725767AbfBSJd2 (ORCPT ); Tue, 19 Feb 2019 04:33:28 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x1J9XBkL002572; Tue, 19 Feb 2019 18:33:11 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x1J9XBkL002572 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1550568792; bh=XdRtcC+1Mcw++lGM+PLPkwfGmBgVfh6AWmRhE8986rg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hEvMmmB5m3NMDEiB7kr23gwULh9WWUEQ+qWbY7PSU1maiy2Y9xWdHdGYBMd28loWD p+UabPfvYnqp8TQXQfVP9ldu3U7Nz+R6kWLNLfAMHCYBLVq8EH9w8ZYS2AQLA68QZY mTVn8M2l7W9zNlTP/6r1AhvteyXO1k74GyxRJl8HhIZfzg4vHI+Y3WFgVm5lvbjyg+ p1u7xjuz6UoJn1ZV7NqZORWBFnfozk7MgbSshQ/D35Mr51aPQX8RdkRe3VvtbBU9wg zQ5vvHS2NXrkW4UcTNX7j1SC3LpfzQTXZxDIpibFUbXrmsudBAaHFvfthA6Cz8Qw35 7yfII6F+PvTRQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Kieran Bingham , Masahiro Yamada , Heiko Carstens , linux-kernel@vger.kernel.org Subject: [PATCH 2/5] kbuild: remove unimportant comments from ./Kbuild Date: Tue, 19 Feb 2019 18:33:03 +0900 Message-Id: <1550568787-18710-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1550568787-18710-1-git-send-email-yamada.masahiro@socionext.com> References: <1550568787-18710-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Every time we add/remove a target, we need to touch the header part, including renumbering. This is not so important information. Numbering targets is rather misleading because they are not necessarily generated in this order. For example, 1) and 2) can be executed simultaneously when the -j option is given. Signed-off-by: Masahiro Yamada --- Kbuild | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) -- 2.7.4 Reviewed-by: Kieran Bingham diff --git a/Kbuild b/Kbuild index 4cebcc7..a07bbd6 100644 --- a/Kbuild +++ b/Kbuild @@ -1,14 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 # # Kbuild for top-level directory of the kernel -# This file takes care of the following: -# 1) Generate bounds.h -# 2) Generate timeconst.h -# 3) Generate asm-offsets.h (may need bounds.h and timeconst.h) -# 4) Check for missing system calls ##### -# 1) Generate bounds.h +# Generate bounds.h bounds-file := include/generated/bounds.h @@ -19,7 +14,7 @@ $(bounds-file): kernel/bounds.s FORCE $(call filechk,offsets,__LINUX_BOUNDS_H__) ##### -# 2) Generate timeconst.h +# Generate timeconst.h timeconst-file := include/generated/timeconst.h @@ -31,8 +26,7 @@ $(timeconst-file): kernel/time/timeconst.bc FORCE $(call filechk,gentimeconst) ##### -# 3) Generate asm-offsets.h -# +# Generate asm-offsets.h offsets-file := include/generated/asm-offsets.h @@ -45,8 +39,7 @@ $(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s FORCE $(call filechk,offsets,__ASM_OFFSETS_H__) ##### -# 4) Check for missing system calls -# +# Check for missing system calls always += missing-syscalls targets += missing-syscalls From patchwork Tue Feb 19 09:33:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 158709 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3451219jaa; Tue, 19 Feb 2019 01:33:48 -0800 (PST) X-Google-Smtp-Source: AHgI3IY9LQHLk2mU5UUy0sfeU7eQEjnbIlN+FpfBBUEH1LF+qu6tfg0IbS9kyM8EpXST0zOaWEJA X-Received: by 2002:a62:5c4:: with SMTP id 187mr14854235pff.153.1550568828794; Tue, 19 Feb 2019 01:33:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550568828; cv=none; d=google.com; s=arc-20160816; b=dO9C7z/BlFrxf80aLMgMnhwvvz+qVzT6fYArbOKz2aIhKTCnNuSPLwpJP8PZrTbviw O+JrAuYjBuQe7K2P0K2YyzeofJ5Rwzp8dznOmRThQ37cyBiCkRktKi7vgZyEW9ZSL+49 4HNG+8F/tewEijY8GPDl6qM2WrfwzbB7yIZvVFkIg7HpgK9PIeuZWj7Ndd+TS8c5s+DG Bxzfecz9jDgSsTwpA8kM9OBjat8rDIhCQQCEo4/MxGv3bjr/ZcbwEvmTAmGjT50p8nRm STXIvNGiHJTOoj5Wq4JlouhzQXJoFOZu3gKCxLp3pHanNJiMwYHaeDKx1W0ydi4AZ/Kz /UzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=LpVzcmMvxAwWbg6InvMN4itJqp0PH2zyJ5T3ksV7i4k=; b=RFRCwLz19L22H1DKM3eMWdNACVfqeOBzv8kvzHdkOsJEBrtm1qOXnf8YjDljyociaR JgonT8gAnIs+CwbBWyFobiP5saU+gY+7eF6z/RRKqzXL+n5iZjqbYKUFRBn1wABYyWG5 XI7xOsqjBsGRNCGDe2Fp9mFXjkpTGq8QbzRLjUKyuiYZCo+OJ39u+1f6DGQ3PzSCqDYU lp1pBHowu05FyqZc3vLI/5glfP5tFtn+xfw+AB4AWNklHEEK7FHDjI//kM6acleiuFGD MmEaR5glcNglk2XH7eYWTx/pw4igLPzA07XYD2UiaYw0nBanGcWgx/QsaLCGHaqc8j0d UL8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=tcmWlt0Y; 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 r12si15842287plo.59.2019.02.19.01.33.48; Tue, 19 Feb 2019 01:33:48 -0800 (PST) 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=tcmWlt0Y; 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 S1728320AbfBSJdq (ORCPT + 32 others); Tue, 19 Feb 2019 04:33:46 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:53209 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726969AbfBSJdo (ORCPT ); Tue, 19 Feb 2019 04:33:44 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x1J9XBkM002572; Tue, 19 Feb 2019 18:33:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x1J9XBkM002572 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1550568792; bh=LpVzcmMvxAwWbg6InvMN4itJqp0PH2zyJ5T3ksV7i4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tcmWlt0YrbAbfQcvzqsVEym5Ev6XG7pQYx+bxUitf2wUusx3Koem9zJVWSybCa68k 5qRJhxnDq9KJd4k17ANUWC64q1kNPGE/+rRSEah+jVPexeFlO9Zd+j16z/botu1L++ xAYI2s7vJZLg87W3eJywNrLvJstlRn2RXgwiltTtbBXsXUhr20vRUUDGuD+XYqEHPP r+S4xsWLb1cxdzEX0UeTOZR8PzWCN5HP8X5viBZt3A125IvuQH+8wsF9o0iw03qi5B 8vuSgfw4QM3NOj2uzcexOl2Cl2Lge6kvDC1ebFZmiyjfHRM3wnWq+cWrkp2rF22lv0 XDoJkg1HaHoQg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Kieran Bingham , Masahiro Yamada , linux-kernel@vger.kernel.org, Michal Marek , Jan Kiszka Subject: [PATCH 3/5] scripts/gdb: do not descend into scripts/gdb from scripts Date: Tue, 19 Feb 2019 18:33:04 +0900 Message-Id: <1550568787-18710-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1550568787-18710-1-git-send-email-yamada.masahiro@socionext.com> References: <1550568787-18710-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, Kbuild descends from scripts/Makefile to scripts/gdb/Makefile just for creating symbolic links, but it does not need to do it so early. Merge the two descending paths to simplify the code. Signed-off-by: Masahiro Yamada --- Makefile | 2 +- scripts/Makefile | 3 +-- scripts/gdb/linux/Makefile | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-) -- 2.7.4 Reviewed-by: Kieran Bingham diff --git a/Makefile b/Makefile index 26dbcb7..a5762c6 100644 --- a/Makefile +++ b/Makefile @@ -1518,7 +1518,7 @@ $(DOC_TARGETS): scripts_basic FORCE PHONY += scripts_gdb scripts_gdb: prepare - $(Q)$(MAKE) $(build)=scripts/gdb/linux build_constants_py + $(Q)$(MAKE) $(build)=scripts/gdb ifdef CONFIG_GDB_SCRIPTS all: scripts_gdb diff --git a/scripts/Makefile b/scripts/Makefile index feb1f71..9d442ee 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -39,7 +39,6 @@ build_unifdef: $(obj)/unifdef subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins subdir-$(CONFIG_MODVERSIONS) += genksyms subdir-$(CONFIG_SECURITY_SELINUX) += selinux -subdir-$(CONFIG_GDB_SCRIPTS) += gdb # Let clean descend into subdirs -subdir- += basic dtc kconfig mod package +subdir- += basic dtc gdb kconfig mod package diff --git a/scripts/gdb/linux/Makefile b/scripts/gdb/linux/Makefile index aba23be..7545806 100644 --- a/scripts/gdb/linux/Makefile +++ b/scripts/gdb/linux/Makefile @@ -14,11 +14,8 @@ quiet_cmd_gen_constants_py = GEN $@ $(CPP) -E -x c -P $(c_flags) $< > $@ ;\ sed -i '1,//d;' $@ -targets += constants.py -$(obj)/constants.py: $(SRCTREE)/$(obj)/constants.py.in FORCE +extra-y += constants.py +$(obj)/constants.py: $(src)/constants.py.in FORCE $(call if_changed_dep,gen_constants_py) -build_constants_py: $(obj)/constants.py - @: - -clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py) $(obj)/constants.py +clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py) From patchwork Tue Feb 19 09:33:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 158705 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3450905jaa; Tue, 19 Feb 2019 01:33:28 -0800 (PST) X-Google-Smtp-Source: AHgI3IYLWEoYkeViefwq2GWDZFTuu8p9FJIySABJvuTEdddv8JGVaA9sfmmh4opbM/xbJuAQGDOJ X-Received: by 2002:a65:4b83:: with SMTP id t3mr23014485pgq.417.1550568807932; Tue, 19 Feb 2019 01:33:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550568807; cv=none; d=google.com; s=arc-20160816; b=Ovv7078PvaYxL+Noo5xj1ohpZOvhVFBbJYICYLaECbGMEYp7J8xbUa1F2TrZQgLpHG MlZzRCw10yuefB6UTfkjgA91sHbgAwn1xLIvrSJX+PbgpZmTt6cKLaukBCz07drkjmop 0veCH2eQxRvppYQ5ZUt8BreKKTJCfd09naz1nlswT+J/4d4hBDnpi0DsJK9mVxfbsmBG YMdh7Tbc0DVYEdzdGO8YhKKmuW1RnTQtmMHypAoL9oJ73eE9M45baF/D/mw++0XbhNqw FPoNLPTwDyk7Gbo8gRL4CMZELl88IKkA8mQQ7n4Ho/pIgrBjFsn9v2K5UMAT9+OmgIbz ABQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=7gGXpYHokVbBLif6nFDQjQ8PsczV06ea6Pz4i46Teys=; b=wD7jIFMgjDvvvhwp2ClyqOGnw3KHr+3BV2V3bKYmyybtQhLGcxulYKCHcZ2ebJwuw1 +TyzyNetiYMZ76zPTLonFNRfFvYuIw2xIPQKGr6rxkT2AITn93ODv860T3iZjOrAvQRT 9T/pQ+Wk3reuGejpP3lvS9MdtlRLbo1Mw9yfAPSKyhXqjhXmvTbXBbDk6+irNtY4ZRu6 6bsX6r7vo2g5qdjV1nfCbqBPG919zlGb4ceq7sR4ZwJvsBdHl3zlAyosJ7aJlt5y30Lv wrTHZx+Ih8l8lknYHgHKIniHmShokFBGfJ2ThG7oWakq7j4mLDiDEuKawZywkp59JqVI JlHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=NBtDSjoa; 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 x5si14898159pgq.535.2019.02.19.01.33.27; Tue, 19 Feb 2019 01:33:27 -0800 (PST) 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=NBtDSjoa; 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 S1728063AbfBSJdZ (ORCPT + 32 others); Tue, 19 Feb 2019 04:33:25 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:52670 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725767AbfBSJdZ (ORCPT ); Tue, 19 Feb 2019 04:33:25 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x1J9XBkN002572; Tue, 19 Feb 2019 18:33:13 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x1J9XBkN002572 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1550568793; bh=7gGXpYHokVbBLif6nFDQjQ8PsczV06ea6Pz4i46Teys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NBtDSjoaKI9YCnanZOAMfXNl7l+Krp0LfVGtm2Nx1oIoWIy83i0AA+zYPonFcriDR wqemtThqdUEfaUHh4RG7mxtORkPOI7GfBL13sgTAVNobW0hVSjOor8AYo4jpP0ktq4 zin/vnfEuEhsz034eFCYk6anhtQ+UsVmIkwrpqppIYrvjhGZ+iVUK/79ifzoa2zKHn fkS2Jd6NLFKvQc133jTVulKaee5ltE1wXgFQ/TaynGI9klzbdBRRlwmLGxsra8UHO4 4Q8cVCkFx3s6bP5KxduKezmIPR51qe021OZEugZoFHe55fUnijzJEdhpifhUe92Due wmHqbJXU608Pg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Kieran Bingham , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 4/5] kbuild: create symlink to vmlinux-gdb.py in scripts_gdb target Date: Tue, 19 Feb 2019 18:33:05 +0900 Message-Id: <1550568787-18710-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1550568787-18710-1-git-send-email-yamada.masahiro@socionext.com> References: <1550568787-18710-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is weird to create gdb stuff as a side-effect of vmlinux. Move it to a more relevant place. Signed-off-by: Masahiro Yamada --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.7.4 Reviewed-by: Kieran Bingham diff --git a/Makefile b/Makefile index a5762c6..0459260 100644 --- a/Makefile +++ b/Makefile @@ -1015,9 +1015,6 @@ cmd_link-vmlinux = \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE -ifdef CONFIG_GDB_SCRIPTS - $(Q)ln -fsn $(abspath $(srctree)/scripts/gdb/vmlinux-gdb.py) -endif +$(call if_changed,link-vmlinux) targets := vmlinux @@ -1519,6 +1516,7 @@ $(DOC_TARGETS): scripts_basic FORCE PHONY += scripts_gdb scripts_gdb: prepare $(Q)$(MAKE) $(build)=scripts/gdb + $(Q)ln -fsn $(abspath $(srctree)/scripts/gdb/vmlinux-gdb.py) ifdef CONFIG_GDB_SCRIPTS all: scripts_gdb From patchwork Tue Feb 19 09:33:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 158708 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3451116jaa; Tue, 19 Feb 2019 01:33:39 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ2W2ghsVL7OCx2WAPFaSyJqVJDmWcldpqiFyUVeJZHbMHFN5i6nXgp1PEyvapCufQ0VGif X-Received: by 2002:a65:65c9:: with SMTP id y9mr23634530pgv.438.1550568819859; Tue, 19 Feb 2019 01:33:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550568819; cv=none; d=google.com; s=arc-20160816; b=SGTlrmarsBsQIEooW19kph3cQfzYEt1nSdPa65umI8FiSkWsVf4djvzKFh/g5G4PnE ReQskWthmeZGZKQFHSoX7puptSXxeI9wqaRtOPwYLTQ7Tfqal7j5oQcFt8NQUJCt7QqZ BLDDYUTqdXRrSSaev4n/QtDU3OTwK+cIBIQoEXtByCvxc2yfoDBReLEGUX5XRl6Q/U3C o5IcMMNrZZHfnAp/e0SEuBbLmThSdLMbDrTtR8ziz08EE+uS8PP8YODF1w1Zh/2nQm6v OfGPppUHRpwkhDjHKYgDAZ/uiXDnh4LfSJOC1klP+Sa/vq3bBXgWgjCkmtfis0M4qORH 6Jpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=6wrERf29hesZXgquMmrDWBzvVksZP5BU5OXJ1r+sURQ=; b=eU1h+kkDFLAYoOWK0+sbcEbPq4+MqFSUC+JkGVfSa7RvZk4Gb+D3Gbw9OWK0RcRTfP i27pHxs6RzSpiBL0flyxHW9j+MsN9LGFSPZawaOHs1xvqO519/4rHPsEbD2dSqKq9mTb G3PbfFPylEPjTSQtWabJTFy3souhYVHlIY1C3UgdNat0HpdvGnew6p9i4+6M8mgwslss dnAG8D1smQXAtrzkL5bQ9QvdrmRQLY7kaOtwZ3WOZ9UWSxmz9Qx72vAgREStOYqW1qf/ NtK1JL4v3TZjiRuIG1l068UNoIfAa9mM3l/dyS651tQK6y1oxXPrO34bOaanoArspQdQ L5EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=U2L+ckxP; 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 s2si15669174plp.380.2019.02.19.01.33.39; Tue, 19 Feb 2019 01:33:39 -0800 (PST) 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=U2L+ckxP; 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 S1728303AbfBSJdh (ORCPT + 32 others); Tue, 19 Feb 2019 04:33:37 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:52939 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725763AbfBSJdf (ORCPT ); Tue, 19 Feb 2019 04:33:35 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x1J9XBkO002572; Tue, 19 Feb 2019 18:33:13 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x1J9XBkO002572 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1550568794; bh=6wrERf29hesZXgquMmrDWBzvVksZP5BU5OXJ1r+sURQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U2L+ckxPzqR3/OKKx4x8xdvNNP0cs6m2bw/kKVa2BlY57bgG4qKLLa+cmOplneZAr bXv25/29kCDxo1dANx4lQJqloag4X0haUF3BAM/ZnEk9dRR5thhbHvJyUCCmWWX5s3 zFYkNXZJXMfBGO1ONrNq6QCmvL2imiBAZZR0gsKYmTmRuJPWz0OE4QFIsg2RoqPnzK 8x0QzJ9ooPaHLLS+/08WQAn3NYzd+lJSfjS4PiXN9Aj5CC8ShgYiEZDZ0+TyTX+uG+ IUEkI+TibQhR/mvemANw9KJWokorKgyy+eTV9uks8WYi6ZhKsWAyoaASAxghlAQzg/ KFOUidpbpdfJQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Kieran Bingham , Masahiro Yamada , Jan Kiszka , linux-kernel@vger.kernel.org Subject: [PATCH 5/5] scripts/gdb: refactor rules for symlink creation Date: Tue, 19 Feb 2019 18:33:06 +0900 Message-Id: <1550568787-18710-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1550568787-18710-1-git-send-email-yamada.masahiro@socionext.com> References: <1550568787-18710-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gdb-scripts is not a real object, but (ab)used like a phony target. Rewrite the code in a more Kbuild-ish way. Add symlinks to extra-y and use if_changed. Signed-off-by: Masahiro Yamada --- scripts/gdb/linux/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) -- 2.7.4 Reviewed-by: Kieran Bingham diff --git a/scripts/gdb/linux/Makefile b/scripts/gdb/linux/Makefile index 7545806..3df395a 100644 --- a/scripts/gdb/linux/Makefile +++ b/scripts/gdb/linux/Makefile @@ -1,13 +1,17 @@ # SPDX-License-Identifier: GPL-2.0 -always := gdb-scripts -SRCTREE := $(abspath $(srctree)) - -$(obj)/gdb-scripts: ifneq ($(KBUILD_SRC),) - $(Q)ln -fsn $(SRCTREE)/$(obj)/*.py $(objtree)/$(obj) + +symlinks := $(patsubst $(srctree)/$(src)/%,%,$(wildcard $(srctree)/$(src)/*.py)) + +quiet_cmd_symlink = SYMLINK $@ + cmd_symlink = ln -fsn $(patsubst $(obj)/%,$(abspath $(srctree))/$(src)/%,$@) $@ + +extra-y += $(symlinks) +$(addprefix $(obj)/, $(symlinks)): FORCE + $(call if_changed,symlink) + endif - @: quiet_cmd_gen_constants_py = GEN $@ cmd_gen_constants_py = \ @@ -18,4 +22,4 @@ extra-y += constants.py $(obj)/constants.py: $(src)/constants.py.in FORCE $(call if_changed_dep,gen_constants_py) -clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py) +clean-files := *.pyc *.pyo