From patchwork Sat Dec 22 09:50:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10741347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C126C13AD for ; Sat, 22 Dec 2018 16:54:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1422288BB for ; Sat, 22 Dec 2018 16:54:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A530D28A15; Sat, 22 Dec 2018 16:54:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 578BB28A12 for ; Sat, 22 Dec 2018 16:54:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729246AbeLVQyk (ORCPT ); Sat, 22 Dec 2018 11:54:40 -0500 Received: from condef-04.nifty.com ([202.248.20.69]:57919 "EHLO condef-04.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725802AbeLVQyk (ORCPT ); Sat, 22 Dec 2018 11:54:40 -0500 Received: from conuserg-09.nifty.com ([10.126.8.72])by condef-04.nifty.com with ESMTP id wBM9r7LC011548; Sat, 22 Dec 2018 18:53:07 +0900 Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-09.nifty.com with ESMTP id wBM9p7DN014613; Sat, 22 Dec 2018 18:51:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wBM9p7DN014613 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545472268; bh=ND+aJPnbi1isezN4iF7leDctF3P1l1D8eol/rcKWEro=; h=From:To:Cc:Subject:Date:From; b=iB93f2Ntt2Ldni+uOl09oWDHfUuCCp8GwIHthpte7aG6vsEjP929ZCgsZQVLH08yw yNkCMYGczG3pwShOdpZMYrwMVw7nnBVR5lSgSUVLk4BPQQ4YCovb7fNBCS2l3r5Jzq cxUTpkz6QEVFRr2S8bVNLnKHYJ6DOR0GX6AhlqHsByGyAfqcjLJsy3WqpbQSBaiqHL 9oSTpkOQQWj0gc+GnvAUvicm6+KKcPjnfOWIFCV0ekvThcy5ambNgcOqTXvr2wlAZ7 p78w6cScbHkTADrNW7GT+jrPJL9CGR+4hL1hEnMKOIKGl7z8WA5wL7NnvMKvXbBkTD UTPjiPANlaPAw== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Tony Luck , linux-ia64@vger.kernel.org, Alexei Starovoitov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Borkmann , Ludovic Desroches , Alexandre Belloni , Tony Lindgren , Nicolas Ferre , Fenghua Yu , linux-omap@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] treewide: remove explicit rules for *offsets.s Date: Sat, 22 Dec 2018 18:50:33 +0900 Message-Id: <1545472235-12782-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These explicit rules are unneeded because scripts/Makefile.build provides a pattern rule to create %.s from %.c Signed-off-by: Masahiro Yamada --- Kbuild | 9 +-------- arch/arm/mach-at91/Makefile | 3 --- arch/arm/mach-omap2/Makefile | 3 --- arch/ia64/kernel/Makefile | 5 ----- drivers/memory/Makefile.asm-offsets | 3 --- samples/bpf/Makefile | 3 --- 6 files changed, 1 insertion(+), 25 deletions(-) diff --git a/Kbuild b/Kbuild index 0053042..b24210c 100644 --- a/Kbuild +++ b/Kbuild @@ -16,10 +16,6 @@ bounds-file := include/generated/bounds.h always := $(bounds-file) targets := kernel/bounds.s -# We use internal kbuild rules to avoid the "is up to date" message from make -kernel/bounds.s: kernel/bounds.c FORCE - $(call if_changed_dep,cc_s_c) - $(obj)/$(bounds-file): kernel/bounds.s FORCE $(call filechk,offsets,__LINUX_BOUNDS_H__) @@ -50,10 +46,7 @@ offsets-file := include/generated/asm-offsets.h always += $(offsets-file) targets += arch/$(SRCARCH)/kernel/asm-offsets.s -# We use internal kbuild rules to avoid the "is up to date" message from make -arch/$(SRCARCH)/kernel/asm-offsets.s: arch/$(SRCARCH)/kernel/asm-offsets.c \ - $(obj)/$(timeconst-file) $(obj)/$(bounds-file) FORCE - $(call if_changed_dep,cc_s_c) +arch/$(SRCARCH)/kernel/asm-offsets.s: $(obj)/$(timeconst-file) $(obj)/$(bounds-file) $(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s FORCE $(call filechk,offsets,__ASM_OFFSETS_H__) diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 7415f18..f87066b 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -19,9 +19,6 @@ ifeq ($(CONFIG_PM_DEBUG),y) CFLAGS_pm.o += -DDEBUG endif -arch/arm/mach-at91/pm_data-offsets.s: arch/arm/mach-at91/pm_data-offsets.c - $(call if_changed_dep,cc_s_c) - include/generated/at91_pm_data-offsets.h: arch/arm/mach-at91/pm_data-offsets.s FORCE $(call filechk,offsets,__PM_DATA_OFFSETS_H__) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 01377c2..55c482c 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -236,9 +236,6 @@ obj-y += omap_phy_internal.o obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o -arch/arm/mach-omap2/pm-asm-offsets.s: arch/arm/mach-omap2/pm-asm-offsets.c - $(call if_changed_dep,cc_s_c) - include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORCE $(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__) diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile index d0c0ccd..7372d99 100644 --- a/arch/ia64/kernel/Makefile +++ b/arch/ia64/kernel/Makefile @@ -50,10 +50,5 @@ CFLAGS_traps.o += -mfixed-range=f2-f5,f16-f31 # The gate DSO image is built using a special linker script. include $(src)/Makefile.gate -# We use internal kbuild rules to avoid the "is up to date" message from make -arch/$(SRCARCH)/kernel/nr-irqs.s: arch/$(SRCARCH)/kernel/nr-irqs.c - $(Q)mkdir -p $(dir $@) - $(call if_changed_dep,cc_s_c) - include/generated/nr-irqs.h: arch/$(SRCARCH)/kernel/nr-irqs.s FORCE $(call filechk,offsets,__ASM_NR_IRQS_H__) diff --git a/drivers/memory/Makefile.asm-offsets b/drivers/memory/Makefile.asm-offsets index 843ff60..f968dfa 100644 --- a/drivers/memory/Makefile.asm-offsets +++ b/drivers/memory/Makefile.asm-offsets @@ -1,5 +1,2 @@ -drivers/memory/emif-asm-offsets.s: drivers/memory/emif-asm-offsets.c - $(call if_changed_dep,cc_s_c) - include/generated/ti-emif-asm-offsets.h: drivers/memory/emif-asm-offsets.s FORCE $(call filechk,offsets,__TI_EMIF_ASM_OFFSETS_H__) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index be0a961..100a49d 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -227,9 +227,6 @@ $(LIBBPF): FORCE # Fix up variables inherited from Kbuild that tools/ build system won't like $(MAKE) -C $(dir $@) RM='rm -rf' LDFLAGS= srctree=$(BPF_SAMPLES_PATH)/../../ O= -$(obj)/syscall_nrs.s: $(src)/syscall_nrs.c - $(call if_changed_dep,cc_s_c) - $(obj)/syscall_nrs.h: $(obj)/syscall_nrs.s FORCE $(call filechk,offsets,__SYSCALL_NRS_H__) From patchwork Sat Dec 22 09:50:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10741337 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3CC1713AD for ; Sat, 22 Dec 2018 16:53:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B4A127CAF for ; Sat, 22 Dec 2018 16:53:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D3A9284A5; Sat, 22 Dec 2018 16:53:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F286A27CAF for ; Sat, 22 Dec 2018 16:53:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389097AbeLVQxs (ORCPT ); Sat, 22 Dec 2018 11:53:48 -0500 Received: from condef-03.nifty.com ([202.248.20.68]:21017 "EHLO condef-03.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388791AbeLVQxs (ORCPT ); Sat, 22 Dec 2018 11:53:48 -0500 X-Greylist: delayed 480 seconds by postgrey-1.27 at vger.kernel.org; Sat, 22 Dec 2018 11:53:45 EST Received: from conuserg-09.nifty.com ([10.126.8.72])by condef-03.nifty.com with ESMTP id wBM9sMrH011935; Sat, 22 Dec 2018 18:54:22 +0900 Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-09.nifty.com with ESMTP id wBM9p7DO014613; Sat, 22 Dec 2018 18:51:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wBM9p7DO014613 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545472270; bh=wiIUzgc+fysfmDuxKAkmwaprsNIQhVxjxb/GXgFvzRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uj35dlCjpYUATghrAgk9dVF7mNbFFvEQ2gVPCbncqlT35c5N6+OIC2oU4Mt58orHo 3f74sas/9hAo23IUa4hcwuvxME27/oaW92kP+oPV1eVeR1dSuH1GtD84aZXyWEYISe YupW5gqHOpRi3nDSJ/F/AYxw6xyG7ppPSInlYJeWUafCUn6nCcDi0rSUsnJsIxbYWr qkbAro2J2Ha3eWvKF93z8g/vCOUcP2CgmWMzDNhkkvITA+jsQM7gL2m+S6nIaI6C79 jgUpEVzFZPikxvZcz341HYrPX19aPt4et2ICtNVZxR/pAdZnaq8+VsaMw40mIXrGpe h55lbS8smdkzw== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Tony Luck , linux-ia64@vger.kernel.org, Borislav Petkov , Alexandre Belloni , Nicolas Ferre , Daniel Borkmann , x86@kernel.org, Thomas Gleixner , Fenghua Yu , Jeff Dike , "H. Peter Anvin" , linux-um@lists.infradead.org, Ludovic Desroches , Ingo Molnar , linux-omap@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org, Alexei Starovoitov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Weinberger , Tony Lindgren Subject: [PATCH 2/3] treewide: add intermediate .s files to targets Date: Sat, 22 Dec 2018 18:50:34 +0900 Message-Id: <1545472235-12782-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545472235-12782-1-git-send-email-yamada.masahiro@socionext.com> References: <1545472235-12782-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Avoid unneeded recreation of these in the incremental build. Signed-off-by: Masahiro Yamada --- arch/arm/mach-at91/Makefile | 2 ++ arch/arm/mach-omap2/Makefile | 2 ++ arch/ia64/kernel/Makefile | 2 ++ arch/x86/um/Makefile | 1 + drivers/memory/Makefile.asm-offsets | 2 ++ samples/bpf/Makefile | 1 + 6 files changed, 10 insertions(+) diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index f87066b..31b61f0 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -23,3 +23,5 @@ include/generated/at91_pm_data-offsets.h: arch/arm/mach-at91/pm_data-offsets.s F $(call filechk,offsets,__PM_DATA_OFFSETS_H__) arch/arm/mach-at91/pm_suspend.o: include/generated/at91_pm_data-offsets.h + +targets += pm_data-offsets.s diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 55c482c..4afdf56 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -240,3 +240,5 @@ include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORC $(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__) $(obj)/sleep33xx.o $(obj)/sleep43xx.o: include/generated/ti-pm-asm-offsets.h + +targets += pm-asm-offsets.s diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile index 7372d99..4ba0514 100644 --- a/arch/ia64/kernel/Makefile +++ b/arch/ia64/kernel/Makefile @@ -52,3 +52,5 @@ include $(src)/Makefile.gate include/generated/nr-irqs.h: arch/$(SRCARCH)/kernel/nr-irqs.s FORCE $(call filechk,offsets,__ASM_NR_IRQS_H__) + +targets += nr-irqs.s diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index 1792464..2d686ae 100644 --- a/arch/x86/um/Makefile +++ b/arch/x86/um/Makefile @@ -38,6 +38,7 @@ USER_OBJS := bugs_$(BITS).o ptrace_user.o fault.o $(obj)/user-offsets.s: c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) \ -Iarch/x86/include/generated +targets += user-offsets.s include/generated/user_constants.h: $(obj)/user-offsets.s $(call filechk,offsets,__USER_CONSTANT_H__) diff --git a/drivers/memory/Makefile.asm-offsets b/drivers/memory/Makefile.asm-offsets index f968dfa..0447e17 100644 --- a/drivers/memory/Makefile.asm-offsets +++ b/drivers/memory/Makefile.asm-offsets @@ -1,2 +1,4 @@ include/generated/ti-emif-asm-offsets.h: drivers/memory/emif-asm-offsets.s FORCE $(call filechk,offsets,__TI_EMIF_ASM_OFFSETS_H__) + +targets += emif-asm-offsets.s diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 100a49d..82d5a38 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -230,6 +230,7 @@ $(LIBBPF): FORCE $(obj)/syscall_nrs.h: $(obj)/syscall_nrs.s FORCE $(call filechk,offsets,__SYSCALL_NRS_H__) +targets += syscall_nrs.s clean-files += syscall_nrs.h FORCE: