From patchwork Fri Jul 22 21:24:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 9244347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0648C60459 for ; Fri, 22 Jul 2016 21:28:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA0D9280F4 for ; Fri, 22 Jul 2016 21:28:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDD6D28111; Fri, 22 Jul 2016 21:28:11 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 624E9280F4 for ; Fri, 22 Jul 2016 21:28:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bQhwS-0000zs-9z; Fri, 22 Jul 2016 21:25:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bQhwQ-0000zc-OI for xen-devel@lists.xensource.com; Fri, 22 Jul 2016 21:25:06 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id BF/3F-23620-13F82975; Fri, 22 Jul 2016 21:25:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsVybKJsh65h/6R wgw0HWS3uTXnP7sDosb1vF3sAYxRrZl5SfkUCa0b7mrdsBefEKtb3HmFvYLwt1MXIySEkMJVR 4v8J7i5GLiB7BpPElLczWbsYOTjYBHQlbt6WAImLCGxgklj45S47iMMssJRT4sPMbawg3cICL hI3v8wEs1kEVCU+9N1jAbF5BRwkJi26xQRiSwjISbT82A02lFPAUWLTUiWIxQ4SzXMawcISAg US+w9HQ1R7SSy6cYkVwlaTuHpuE/MERr4FjAyrGDWKU4vKUot0jQ30kooy0zNKchMzc3QNDYz 1clOLixPTU3MSk4r1kvNzNzECg6SegYFxB2PnCb9DjJIcTEqivO+DJ4UL8SXlp1RmJBZnxBeV 5qQWH2KU4eBQkuBV6QPKCRalpqdWpGXmAMMVJi3BwaMkwqsJkuYtLkjMLc5Mh0idYlSUEue90 QuUEABJZJTmwbXBYuQSo6yUMC8jAwODEE9BalFuZgmq/CtGcQ5GJWFefZDxPJl5JXDTXwEtZg JaPEegH2RxSSJCSqqB0UmVY9uUdwInV+9te+FaM992O8PjzQ4uKfPXp6+73HLPJSXrZYRUTHv YkSser+923FjcxFfx7xrj6lXfFjsIMqy7eDx28vEvv/s/POLdsitz1novxt1N1fMOC3xh/PM9 je3OivtPzkju/VXrtP2Aoyj3hjNPatPa9srNjTb12cKSUXLB8qV/m6cSS3FGoqEWc1FxIgCA8 9zJjAIAAA== X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-13.tower-31.messagelabs.com!1469222703!51379511!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34452 invoked from network); 22 Jul 2016 21:25:04 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-13.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 22 Jul 2016 21:25:04 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C9326205B1; Fri, 22 Jul 2016 21:25:01 +0000 (UTC) Received: from garbanzo.do-not-panic.com (c-73-15-241-2.hsd1.ca.comcast.net [73.15.241.2]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F8F2205B6; Fri, 22 Jul 2016 21:24:59 +0000 (UTC) From: "Luis R. Rodriguez" To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, linux@arm.linux.org.uk, mhiramat@kernel.org, masami.hiramatsu.pt@hitachi.com, jbaron@akamai.com, heiko.carstens@de.ibm.com, ananth@linux.vnet.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net, realmz6@gmail.com Date: Fri, 22 Jul 2016 14:24:37 -0700 Message-Id: <1469222687-1600-4-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1469222687-1600-1-git-send-email-mcgrof@kernel.org> References: <1469222687-1600-1-git-send-email-mcgrof@kernel.org> X-Virus-Scanned: ClamAV using ClamSMTP Cc: gnomes@lxorguk.ukuu.org.uk, linux-ia64@vger.kernel.org, jkosina@suse.cz, benh@kernel.crashing.org, ming.lei@canonical.com, linux@rasmusvillemoes.dk, platform-driver-x86@vger.kernel.org, paul.gortmaker@windriver.com, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org, xen-devel@lists.xensource.com, linux-sh@vger.kernel.org, x86@kernel.org, fontana@sharpeleven.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, dvhart@infradead.org, dwmw2@infradead.org, pali.rohar@gmail.com, keescook@chromium.org, arnd@arndb.de, will.deacon@arm.com, rusty@rustcorp.com.au, rostedt@goodmis.org, christopher.denicolo@suse.com, ak@linux.intel.com, ciaran.farrell@suse.com, jpoimboe@redhat.com, andriy.shevchenko@linux.intel.com, mcb30@ipxe.org, linux-kbuild@vger.kernel.org, alan@linux.intel.com, jgross@suse.com, pebolle@tiscali.nl, tony.luck@intel.com, ananth@in.ibm.com, gregkh@linuxfoundation.org, luto@amacapital.net, "Luis R. Rodriguez" , mmarek@suse.com, david.vrabel@citrix.com, andrew.cooper3@citrix.com, akpm@linux-foundation.org, torvalds@linux-foundation.org, korea.drzix@gmail.com Subject: [Xen-devel] [RFC v3 03/13] scripts/module-common.lds: enable generation X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP scripts/module-common.lds is currently pretty static, in the future this may change and we will want access to kernel macros to help expands certain areas. To get access to use macros we need to generate module-common.lds from module-common.lds.S, for now though only enable the generation. We'll later expand on this as needed. Since this file is now generated add it to .gitignore. v3: new to this series Signed-off-by: Luis R. Rodriguez --- .gitignore | 2 ++ Makefile | 6 +++++- scripts/Makefile.modpost | 2 +- scripts/{module-common.lds => module-common.lds.S} | 0 4 files changed, 8 insertions(+), 2 deletions(-) rename scripts/{module-common.lds => module-common.lds.S} (100%) diff --git a/.gitignore b/.gitignore index 2be25f771bd8..14a94d939a6f 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,5 @@ all.config # Kdevelop4 *.kdev4 + +scripts/module-common.lds diff --git a/Makefile b/Makefile index caa33e007a8c..c56cca906769 100644 --- a/Makefile +++ b/Makefile @@ -408,6 +408,10 @@ KBUILD_AFLAGS_MODULE := -DMODULE KBUILD_CFLAGS_MODULE := -DMODULE KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds +$(srctree)/scripts/module-common.lds: $(srctree)/scripts/module-common.lds.S + $(Q)$(CC) $(CFLAGS) $(INCLUDES) $(LINUXINCLUDE) -E -P \ + -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $< + # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) @@ -1178,7 +1182,7 @@ all: modules # using awk while concatenating to the final file. PHONY += modules -modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin +modules: $(srctree)/scripts/module-common.lds $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 1366a94b6c39..2d8aff7735d6 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -121,7 +121,7 @@ quiet_cmd_ld_ko_o = LD [M] $@ $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ -o $@ $(filter-out FORCE,$^) -$(modules): %.ko :%.o %.mod.o FORCE +$(modules): %.ko : $(srctree)/scripts/module-common.lds %.o %.mod.o FORCE $(call if_changed,ld_ko_o) targets += $(modules) diff --git a/scripts/module-common.lds b/scripts/module-common.lds.S similarity index 100% rename from scripts/module-common.lds rename to scripts/module-common.lds.S