From mboxrd@z Thu Jan 1 00:00:00 1970 From: mcgrof@kernel.org Subject: [PATCH v4 03/16] scripts/module-common.lds: enable generation Date: Fri, 19 Aug 2016 14:34:01 -0700 Message-ID: <1471642454-5679-4-git-send-email-mcgrof@kernel.org> References: <1471642454-5679-1-git-send-email-mcgrof@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1471642454-5679-1-git-send-email-mcgrof@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, jpoimboe@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 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, James.Bottomley@HansenPartnership.com, paul.gortmaker@windriver.com, paulus@samba.org, sparclinux@vger.kernel.org, mchehab@osg.samsung.com, linux-arch@vger.kernel.org, markus.heiser@darmarit.de, xen-devel@lists.xensource.com, msalter@redhat.com, linux-sh@vger.kernel.org, mpe@ellerman.id.au, x86@kernel.org, fontana@sharpeleven.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, dvhart@infradead.org, dwmw2@infradead.org, linux-xtensa@linux-xtensa.org, pali.rohar@gmail.com, keescook@chromium.org, arnd@arndb.de, jani.nikula@intel.com, will.deacon@arm.com, rusty@rustcorp.com.au, rostedt@goodmis.org, acme@redhat.com, ak@linux.intel.com, andriy.shevchenko@linux.intel.com, mcb30@ip List-Id: linux-arch.vger.kernel.org RnJvbTogIkx1aXMgUi4gUm9kcmlndWV6IiA8bWNncm9mQGtlcm5lbC5vcmc+CgpzY3JpcHRzL21v ZHVsZS1jb21tb24ubGRzIGlzIGN1cnJlbnRseSBwcmV0dHkgc3RhdGljLCBpbiB0aGUKZnV0dXJl IHRoaXMgbWF5IGNoYW5nZSBhbmQgd2Ugd2lsbCB3YW50IGFjY2VzcyB0byBrZXJuZWwgbWFjcm9z CnRvIGhlbHAgZXhwYW5kcyBjZXJ0YWluIGFyZWFzLiBUbyBnZXQgYWNjZXNzIHRvIHVzZSBtYWNy b3Mgd2UKbmVlZCB0byBnZW5lcmF0ZSBtb2R1bGUtY29tbW9uLmxkcyBmcm9tIG1vZHVsZS1jb21t b24ubGRzLlMsIGZvcgpub3cgdGhvdWdoIG9ubHkgZW5hYmxlIHRoZSBnZW5lcmF0aW9uLiBXZSds bCBsYXRlciBleHBhbmQgb24gdGhpcwphcyBuZWVkZWQuCgpTaW5jZSB0aGlzIGZpbGUgaXMgbm93 IGdlbmVyYXRlZCBhZGQgaXQgdG8gLmdpdGlnbm9yZS4KCnY0OiBhZGQgZmlsZSB0byBNQUlOVEFJ TkVSUwp2MzogbmV3IHRvIHRoaXMgc2VyaWVzCgpTaWduZWQtb2ZmLWJ5OiBMdWlzIFIuIFJvZHJp Z3VleiA8bWNncm9mQGtlcm5lbC5vcmc+Ci0tLQogLmdpdGlnbm9yZSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAyICsrCiBNQUlOVEFJTkVSUyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB8IDEgKwogTWFrZWZpbGUgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgfCA2ICsrKysrLQogc2NyaXB0cy9NYWtlZmlsZS5t b2Rwb3N0ICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyICstCiBzY3JpcHRzL3ttb2R1bGUt Y29tbW9uLmxkcyA9PiBtb2R1bGUtY29tbW9uLmxkcy5TfSB8IDAKIDUgZmlsZXMgY2hhbmdlZCwg OSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQogcmVuYW1lIHNjcmlwdHMve21vZHVsZS1j b21tb24ubGRzID0+IG1vZHVsZS1jb21tb24ubGRzLlN9ICgxMDAlKQoKZGlmZiAtLWdpdCBhLy5n aXRpZ25vcmUgYi8uZ2l0aWdub3JlCmluZGV4IGMyZWQ0ZWNiMGFjZC4uMGYwNzAyMDU0ZmRiIDEw MDY0NAotLS0gYS8uZ2l0aWdub3JlCisrKyBiLy5naXRpZ25vcmUKQEAgLTExNCwzICsxMTQsNSBA QCBhbGwuY29uZmlnCiAKICMgS2RldmVsb3A0CiAqLmtkZXY0CisKK3NjcmlwdHMvbW9kdWxlLWNv bW1vbi5sZHMKZGlmZiAtLWdpdCBhL01BSU5UQUlORVJTIGIvTUFJTlRBSU5FUlMKaW5kZXggZDYz NWFiMDQ3ZjNhLi41YWVjMDE4ODMwMjAgMTAwNjQ0Ci0tLSBhL01BSU5UQUlORVJTCisrKyBiL01B SU5UQUlORVJTCkBAIC03ODg3LDYgKzc4ODcsNyBAQCBNOglSdXN0eSBSdXNzZWxsIDxydXN0eUBy dXN0Y29ycC5jb20uYXU+CiBTOglNYWludGFpbmVkCiBGOglpbmNsdWRlL2xpbnV4L21vZHVsZS5o CiBGOglrZXJuZWwvbW9kdWxlLmMKK0Y6CXNjcmlwdHMvbW9kdWxlLWNvbW1vbi5sZHMuUwogCiBN T1RJT04gRVlFIFZBSU8gUElDVFVSRUJPT0sgQ0FNRVJBIERSSVZFUgogVzoJaHR0cDovL3BvcGll cy5uZXQvbWV5ZS8KZGlmZiAtLWdpdCBhL01ha2VmaWxlIGIvTWFrZWZpbGUKaW5kZXggNWMxOGJh YWQ3MjE4Li5iM2U1ZWE3OGQ1ODIgMTAwNjQ0Ci0tLSBhL01ha2VmaWxlCisrKyBiL01ha2VmaWxl CkBAIC00MDgsNiArNDA4LDEwIEBAIEtCVUlMRF9BRkxBR1NfTU9EVUxFICA6PSAtRE1PRFVMRQog S0JVSUxEX0NGTEFHU19NT0RVTEUgIDo9IC1ETU9EVUxFCiBLQlVJTERfTERGTEFHU19NT0RVTEUg Oj0gLVQgJChzcmN0cmVlKS9zY3JpcHRzL21vZHVsZS1jb21tb24ubGRzCiAKKyQoc3JjdHJlZSkv c2NyaXB0cy9tb2R1bGUtY29tbW9uLmxkczogJChzcmN0cmVlKS9zY3JpcHRzL21vZHVsZS1jb21t b24ubGRzLlMKKwkkKFEpJChDQykgJChDRkxBR1MpICQoSU5DTFVERVMpICQoTElOVVhJTkNMVURF KSAtRSAtUCBcCisJCS1EX19BU1NFTUJMWV9fIC1ETElOS0VSX1NDUklQVCAtbyAkQCAkPAorCiAj IFJlYWQgS0VSTkVMUkVMRUFTRSBmcm9tIGluY2x1ZGUvY29uZmlnL2tlcm5lbC5yZWxlYXNlIChp ZiBpdCBleGlzdHMpCiBLRVJORUxSRUxFQVNFID0gJChzaGVsbCBjYXQgaW5jbHVkZS9jb25maWcv a2VybmVsLnJlbGVhc2UgMj4gL2Rldi9udWxsKQogS0VSTkVMVkVSU0lPTiA9ICQoVkVSU0lPTikk KGlmICQoUEFUQ0hMRVZFTCksLiQoUEFUQ0hMRVZFTCkkKGlmICQoU1VCTEVWRUwpLC4kKFNVQkxF VkVMKSkpJChFWFRSQVZFUlNJT04pCkBAIC0xMTc0LDcgKzExNzgsNyBAQCBhbGw6IG1vZHVsZXMK ICMgdXNpbmcgYXdrIHdoaWxlIGNvbmNhdGVuYXRpbmcgdG8gdGhlIGZpbmFsIGZpbGUuCiAKIFBI T05ZICs9IG1vZHVsZXMKLW1vZHVsZXM6ICQodm1saW51eC1kaXJzKSAkKGlmICQoS0JVSUxEX0JV SUxUSU4pLHZtbGludXgpIG1vZHVsZXMuYnVpbHRpbgorbW9kdWxlczogJChzcmN0cmVlKS9zY3Jp cHRzL21vZHVsZS1jb21tb24ubGRzICQodm1saW51eC1kaXJzKSAkKGlmICQoS0JVSUxEX0JVSUxU SU4pLHZtbGludXgpIG1vZHVsZXMuYnVpbHRpbgogCSQoUSkkKEFXSykgJyF4WyQkMF0rKycgJCh2 bWxpbnV4LWRpcnM6JT0kKG9ianRyZWUpLyUvbW9kdWxlcy5vcmRlcikgPiAkKG9ianRyZWUpL21v ZHVsZXMub3JkZXIKIAlAJChrZWNobykgJyAgQnVpbGRpbmcgbW9kdWxlcywgc3RhZ2UgMi4nOwog CSQoUSkkKE1BS0UpIC1mICQoc3JjdHJlZSkvc2NyaXB0cy9NYWtlZmlsZS5tb2Rwb3N0CmRpZmYg LS1naXQgYS9zY3JpcHRzL01ha2VmaWxlLm1vZHBvc3QgYi9zY3JpcHRzL01ha2VmaWxlLm1vZHBv c3QKaW5kZXggMTM2NmE5NGI2YzM5Li4yZDhhZmY3NzM1ZDYgMTAwNjQ0Ci0tLSBhL3NjcmlwdHMv TWFrZWZpbGUubW9kcG9zdAorKysgYi9zY3JpcHRzL01ha2VmaWxlLm1vZHBvc3QKQEAgLTEyMSw3 ICsxMjEsNyBAQCBxdWlldF9jbWRfbGRfa29fbyA9IExEIFtNXSAgJEAKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJChLQlVJTERfTERGTEFHU19NT0RVTEUpICQoTERGTEFHU19NT0RVTEUp IFwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLW8gJEAgJChmaWx0ZXItb3V0IEZPUkNF LCReKQogCi0kKG1vZHVsZXMpOiAlLmtvIDolLm8gJS5tb2QubyBGT1JDRQorJChtb2R1bGVzKTog JS5rbyA6ICQoc3JjdHJlZSkvc2NyaXB0cy9tb2R1bGUtY29tbW9uLmxkcyAlLm8gJS5tb2QubyBG T1JDRQogCSQoY2FsbCBpZl9jaGFuZ2VkLGxkX2tvX28pCiAKIHRhcmdldHMgKz0gJChtb2R1bGVz KQpkaWZmIC0tZ2l0IGEvc2NyaXB0cy9tb2R1bGUtY29tbW9uLmxkcyBiL3NjcmlwdHMvbW9kdWxl LWNvbW1vbi5sZHMuUwpzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZyb20gc2NyaXB0cy9t b2R1bGUtY29tbW9uLmxkcwpyZW5hbWUgdG8gc2NyaXB0cy9tb2R1bGUtY29tbW9uLmxkcy5TCi0t IAoyLjkuMgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Clhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9s aXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: mcgrof@kernel.org Date: Fri, 19 Aug 2016 21:34:01 +0000 Subject: [PATCH v4 03/16] scripts/module-common.lds: enable generation Message-Id: <1471642454-5679-4-git-send-email-mcgrof@kernel.org> List-Id: References: <1471642454-5679-1-git-send-email-mcgrof@kernel.org> In-Reply-To: <1471642454-5679-1-git-send-email-mcgrof@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, jpoimboe@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 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, James.Bottomley@HansenPartnership.com, paul.gortmaker@windriver.com, paulus@samba.org, sparclinux@vger.kernel.org, mchehab@osg.samsung.com, linux-arch@vger.kernel.org, markus.heiser@darmarit.de, xen-devel@lists.xensource.com, msalter@redhat.com, linux-sh@vger.kernel.org, mpe@ellerman.id.au, x86@kernel.org, fontana@sharpeleven.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, dvhart@infradead.org, dwmw2@infradead.org, linux-xtensa@linux-xtensa.org, pali.rohar@gmail.com, keescook@chromium.org, arnd@arndb.de, jani.nikula@intel.com, will.deacon@arm.com, rusty@rustcorp.com.au, rostedt@goodmis.org, acme@redhat.com, ak@linux.intel.com, andriy.shevchenko@linux.intel.com, mcb30@ip From: "Luis R. Rodriguez" 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. v4: add file to MAINTAINERS v3: new to this series Signed-off-by: Luis R. Rodriguez --- .gitignore | 2 ++ MAINTAINERS | 1 + Makefile | 6 +++++- scripts/Makefile.modpost | 2 +- scripts/{module-common.lds => module-common.lds.S} | 0 5 files changed, 9 insertions(+), 2 deletions(-) rename scripts/{module-common.lds => module-common.lds.S} (100%) diff --git a/.gitignore b/.gitignore index c2ed4ecb0acd..0f0702054fdb 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,5 @@ all.config # Kdevelop4 *.kdev4 + +scripts/module-common.lds diff --git a/MAINTAINERS b/MAINTAINERS index d635ab047f3a..5aec01883020 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7887,6 +7887,7 @@ M: Rusty Russell S: Maintained F: include/linux/module.h F: kernel/module.c +F: scripts/module-common.lds.S MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER W: http://popies.net/meye/ diff --git a/Makefile b/Makefile index 5c18baad7218..b3e5ea78d582 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) @@ -1174,7 +1178,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 -- 2.9.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.136]:39278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755372AbcHSVe4 (ORCPT ); Fri, 19 Aug 2016 17:34:56 -0400 From: mcgrof@kernel.org Subject: [PATCH v4 03/16] scripts/module-common.lds: enable generation Date: Fri, 19 Aug 2016 14:34:01 -0700 Message-Id: <1471642454-5679-4-git-send-email-mcgrof@kernel.org> In-Reply-To: <1471642454-5679-1-git-send-email-mcgrof@kernel.org> References: <1471642454-5679-1-git-send-email-mcgrof@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org List-ID: To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, jpoimboe@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 Cc: x86@kernel.org, luto@amacapital.net, keescook@chromium.org, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, rusty@rustcorp.com.au, gnomes@lxorguk.ukuu.org.uk, alan@linux.intel.com, dwmw2@infradead.org, arnd@arndb.de, ming.lei@canonical.com, linux-arch@vger.kernel.org, benh@kernel.crashing.org, ananth@in.ibm.com, pebolle@tiscali.nl, fontana@sharpeleven.org, david.vrabel@citrix.com, konrad.wilk@oracle.com, mcb30@ipxe.org, jgross@suse.com, andrew.cooper3@citrix.com, andriy.shevchenko@linux.intel.com, paul.gortmaker@windriver.com, xen-devel@lists.xensource.com, ak@linux.intel.com, pali.rohar@gmail.com, dvhart@infradead.org, platform-driver-x86@vger.kernel.org, mmarek@suse.com, linux@rasmusvillemoes.dk, jkosina@suse.cz, korea.drzix@gmail.com, linux-kbuild@vger.kernel.org, tony.luck@intel.com, akpm@linux-foundation.org, linux-ia64@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, rostedt@goodmis.org, jani.nikula@intel.com, mchehab@osg.samsung.com, markus.heiser@darmarit.de, acme@redhat.com, jolsa@kernel.org, msalter@redhat.com, chris@zankel.net, jcmvbkbc@gmail.com, linux-xtensa@linux-xtensa.org, paulus@samba.org, mpe@ellerman.id.au, James.Bottomley@HansenPartnership.com, "Luis R. Rodriguez" From: "Luis R. Rodriguez" 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. v4: add file to MAINTAINERS v3: new to this series Signed-off-by: Luis R. Rodriguez --- .gitignore | 2 ++ MAINTAINERS | 1 + Makefile | 6 +++++- scripts/Makefile.modpost | 2 +- scripts/{module-common.lds => module-common.lds.S} | 0 5 files changed, 9 insertions(+), 2 deletions(-) rename scripts/{module-common.lds => module-common.lds.S} (100%) diff --git a/.gitignore b/.gitignore index c2ed4ecb0acd..0f0702054fdb 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,5 @@ all.config # Kdevelop4 *.kdev4 + +scripts/module-common.lds diff --git a/MAINTAINERS b/MAINTAINERS index d635ab047f3a..5aec01883020 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7887,6 +7887,7 @@ M: Rusty Russell S: Maintained F: include/linux/module.h F: kernel/module.c +F: scripts/module-common.lds.S MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER W: http://popies.net/meye/ diff --git a/Makefile b/Makefile index 5c18baad7218..b3e5ea78d582 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) @@ -1174,7 +1178,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 -- 2.9.2