Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp1107558imm; Fri, 22 Jun 2018 10:26:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKt17T49FYIeXgdMjH/gT9BrGBcd0i6stuqLdj2GCy6P0KRs3PvDChu1gpqVNw66Gh+0Tuc X-Received: by 2002:a63:b041:: with SMTP id z1-v6mr2130893pgo.397.1529688376824; Fri, 22 Jun 2018 10:26:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529688376; cv=none; d=google.com; s=arc-20160816; b=nhK3beQE+Q9rdoUrNOJltqZcqO1Xa1SGBKZcbwndBEMtNUO+GYwSptTD+3B6RHLdbs /P+W5sm5ZQkP7WscBDOsbqO7/YFt1FvzDc0pBkAz5TUyjciiW1Q46udYqwalwhGnVt7b ACEfCzWPYgp23o4qhX50cpnFaYUeYzHVlu9DIgq8psua34rSb1cWkK9s1BEtL33C4uth Cbia97oH6kmEIfDRiF9haE+afSk4PBogjUr6WMSNPIF0zvtWteVmepRaBBa5lNXfrIR6 ZJtYE99Zr3fOr6IppTxap5Pz6VYOGmM2XCpDZYqpxs3pkFf/JWECIwyoyt3vCj4tx7ej nKvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=PvROkuLZgn2gtLdObFP8t/wu4K7tJLKUh7zufh+OOqA=; b=SzBtkUyHOs+SJttrSgjfbe4igNiZINcH82rp/Wo+5R/RKRj5ou5s3xO3c7pSuzP/Ww sGAuh+0F5EOAklCLbPLICI192Z4cNzUKwVo0c5tirDo69U4cJjiOijZaj0csd0O05Fad 7ONih92nYADrb26IGbP+eczi8uB0xbQ6UqAS7MRphY96P83Kid7n55Rwu+ZygfYgbFHm kYoEVJrW6c72brTdE/rl9fY+tmL/XduxgG7fOkx6vj6IG+lmPRp2mjtBRrkH3rXSQwUG p+RPJIwGaTSuZDIxTTUQ9E7rNrSAJiolVHX4UrpzL79oysUJLQ8N0QGQdSc9qNreBAa7 iUXA== ARC-Authentication-Results: i=1; mx.google.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vmware.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i27-v6si8083079pfd.117.2018.06.22.10.26.02; Fri, 22 Jun 2018 10:26:16 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vmware.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934307AbeFVRYi (ORCPT + 99 others); Fri, 22 Jun 2018 13:24:38 -0400 Received: from ex13-edg-ou-001.vmware.com ([208.91.0.189]:17636 "EHLO EX13-EDG-OU-001.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933354AbeFVRWn (ORCPT ); Fri, 22 Jun 2018 13:22:43 -0400 Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Fri, 22 Jun 2018 10:22:04 -0700 Received: from sc2-haas01-esx0118.eng.vmware.com (sc2-haas01-esx0118.eng.vmware.com [10.172.44.118]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id CD32B405FC; Fri, 22 Jun 2018 10:22:41 -0700 (PDT) From: Nadav Amit To: , CC: Nadav Amit , Sam Ravnborg , Masahiro Yamada , Michal Marek , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Subject: [PATCH v6 1/9] Makefile: Prepare for using macros for inline asm Date: Fri, 22 Jun 2018 10:22:04 -0700 Message-ID: <20180622172212.199633-2-namit@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180622172212.199633-1-namit@vmware.com> References: <20180622172212.199633-1-namit@vmware.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: None (EX13-EDG-OU-001.vmware.com: namit@vmware.com does not designate permitted sender hosts) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Using macros for inline assembly improves both readability and compilation decisions that are distorted by big assembly blocks that use alternative sections. Compile macros.S and use it to assemble all C files. Currently, only x86 will use it. Cc: Sam Ravnborg Cc: Masahiro Yamada Cc: Michal Marek Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: linux-kbuild@vger.kernel.org Acked-by: Peter Zijlstra (Intel) Signed-off-by: Nadav Amit --- Makefile | 9 +++++++-- arch/x86/Makefile | 11 +++++++++-- arch/x86/kernel/macros.S | 7 +++++++ scripts/Kbuild.include | 4 +++- scripts/mod/Makefile | 2 ++ 5 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 arch/x86/kernel/macros.S diff --git a/Makefile b/Makefile index ca2af1ab91eb..66c1da72c156 100644 --- a/Makefile +++ b/Makefile @@ -1056,7 +1056,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \ # version.h and scripts_basic is processed / created. # Listed in dependency order -PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3 +PHONY += prepare archprepare macroprepare prepare0 prepare1 prepare2 prepare3 # prepare3 is used to check if we are building in a separate output directory, # and if so do: @@ -1080,7 +1080,9 @@ prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h \ include/config/auto.conf $(cmd_crmodverdir) -archprepare: archheaders archscripts prepare1 scripts_basic +macroprepare: prepare1 archmacros + +archprepare: archheaders archscripts macroprepare scripts_basic prepare0: archprepare gcc-plugins $(Q)$(MAKE) $(build)=. @@ -1148,6 +1150,9 @@ archheaders: PHONY += archscripts archscripts: +PHONY += archmacros +archmacros: + PHONY += __headers __headers: $(version_h) scripts_basic uapi-asm-generic archheaders archscripts $(Q)$(MAKE) $(build)=scripts build_unifdef diff --git a/arch/x86/Makefile b/arch/x86/Makefile index f0a6ea22429d..363c3d8ed964 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -235,8 +235,8 @@ ifdef CONFIG_X86_64 LDFLAGS += $(call ld-option, -z max-page-size=0x200000) endif -# Speed up the build -KBUILD_CFLAGS += -pipe +# We cannot use -pipe flag since we give an additional .s file to the compiler +#KBUILD_CFLAGS += -pipe # Workaround for a gcc prelease that unfortunately was shipped in a suse release KBUILD_CFLAGS += -Wno-sign-compare # @@ -258,11 +258,18 @@ archscripts: scripts_basic archheaders: $(Q)$(MAKE) $(build)=arch/x86/entry/syscalls all +archmacros: + $(Q)$(MAKE) $(build)=arch/x86/kernel arch/x86/kernel/macros.s + archprepare: ifeq ($(CONFIG_KEXEC_FILE),y) $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c endif +ASM_MACRO_FLAGS = -Wa,arch/x86/kernel/macros.s +export ASM_MACRO_FLAGS +KBUILD_CFLAGS += $(ASM_MACRO_FLAGS) + ### # Kernel objects diff --git a/arch/x86/kernel/macros.S b/arch/x86/kernel/macros.S new file mode 100644 index 000000000000..cfc1c7d1a6eb --- /dev/null +++ b/arch/x86/kernel/macros.S @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * This file includes headers whose assembly part includes macros which are + * commonly used. The macros are precompiled into assmebly file which is later + * assembled together with each compiled file. + */ diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index c8156d61678c..8eeb5636a2a7 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -115,7 +115,9 @@ __cc-option = $(call try-run,\ # Do not attempt to build with gcc plugins during cc-option tests. # (And this uses delayed resolution so the flags will be up to date.) -CC_OPTION_CFLAGS = $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS)) +# In addition, do not include the asm macros which are built later. +CC_OPTION_FILTERED = $(GCC_PLUGINS_CFLAGS) $(ASM_MACRO_FLAGS) +CC_OPTION_CFLAGS = $(filter-out $(CC_OPTION_FILTERED),$(KBUILD_CFLAGS)) # cc-option # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586) diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile index 42c5d50f2bcc..a5b4af47987a 100644 --- a/scripts/mod/Makefile +++ b/scripts/mod/Makefile @@ -4,6 +4,8 @@ OBJECT_FILES_NON_STANDARD := y hostprogs-y := modpost mk_elfconfig always := $(hostprogs-y) empty.o +CFLAGS_REMOVE_empty.o := $(ASM_MACRO_FLAGS) + modpost-objs := modpost.o file2alias.o sumversion.o devicetable-offsets-file := devicetable-offsets.h -- 2.17.1