From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luis R. Rodriguez" Subject: [PATCH v6 02/14] xtensa: skip adding literal when SORT() is used Date: Mon, 9 Jan 2017 06:58:20 -0800 Message-ID: <20170109145833.11502-3-mcgrof@kernel.org> References: <20161222023811.21246-1-mcgrof@kernel.org> <20170109145833.11502-1-mcgrof@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170109145833.11502-1-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, acme@redhat.com, tglx@linutronix.de, mingo@redhat.com, jpoimboe@redhat.com, bp@alien8.de, npiggin@gmail.com, 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, dalias@libc.org, linux@arm.linux.org.uk 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, wangnan0@huawei.com, 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, joro@8bytes.org, x86@kernel.org, fontana@sharpeleven.org, dsahern@gmail.com, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, dvhart@infradead.org, dwmw2@infradead.org, linux@roeck-us.net, 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, ak@ List-Id: linux-arch.vger.kernel.org V2hlbiBTT1JUKGZvby4qKSBpcyB1c2VkIHRoZSBjdXJyZW50IHNlZCByZXBsYWNlbWVudHMgYWRk ClNPUlQoZm9vLmxpdGVyYWwgZm9vLiopLCB0aGlzIGJyZWFrcyBsaW5raW5nLiBBdm9pZCBhZGRp bmcKbGl0ZXJhbHMgZm9yIFNPUlQgZ2xvYnMsIGlmIG5lZWRlZCwgdGhlc2UgbmVlZCB0byBiZSBh ZGRlZAptYW51YWxseS4KClNpZ25lZC1vZmYtYnk6IEx1aXMgUi4gUm9kcmlndWV6IDxtY2dyb2ZA a2VybmVsLm9yZz4KLS0tCiBhcmNoL3h0ZW5zYS9rZXJuZWwvTWFrZWZpbGUgfCA4ICsrKystLS0t CiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2FyY2gveHRlbnNhL2tlcm5lbC9NYWtlZmlsZSBiL2FyY2gveHRlbnNhL2tlcm5lbC9N YWtlZmlsZQppbmRleCAyNjRmYjg5YzQ0NGUuLmNjZWRkMDE2YThlMCAxMDA2NDQKLS0tIGEvYXJj aC94dGVuc2Eva2VybmVsL01ha2VmaWxlCisrKyBiL2FyY2gveHRlbnNhL2tlcm5lbC9NYWtlZmls ZQpAQCAtMzAsMTAgKzMwLDEwIEBAIEFGTEFHU19teGhlYWQubyArPSAtbXRleHQtc2VjdGlvbi1s aXRlcmFscwogIwogIyBSZXBsaWNhdGUgcnVsZXMgaW4gc2NyaXB0cy9NYWtlZmlsZS5idWlsZAog Ci1zZWQteSA9IC1lICc6YTsgcy9cKihcKFteKV0qXClcLnRleHRcLnVubGlrZWx5LyooXDEubGl0 ZXJhbC51bmxpa2VseSAue3RleHR9LnVubGlrZWx5LzsgdGE7ICcgXAotCS1lICc6Yjsgcy9cKihc KFteKV0qXClcLnRleHRcKFwuW2Etel0qXCkvKihcMS57dGV4dH1cMi5saXRlcmFsIC57dGV4dH1c Mi87IHRiOyAnIFwKLQktZSAnOmM7IHMvXCooXChbXildKlwpXChcLlthLXpdKml0XHxcLnJlZlwp XC50ZXh0LyooXDFcMi5saXRlcmFsIFwyLnt0ZXh0fS87IHRjOyAnIFwKLQktZSAnOmQ7IHMvXCoo XChbXildXCsgXHxcKVwudGV4dC8qKFwxLmxpdGVyYWwgLnt0ZXh0fS87IHRkOyAnIFwKK3NlZC15 ID0gLWUgJzphOyBzL1wqKFwoW14pU09SVF0qXClcLnRleHRcLnVubGlrZWx5LyooXDEubGl0ZXJh bC51bmxpa2VseSAue3RleHR9LnVubGlrZWx5LzsgdGE7ICcgXAorCS1lICc6Yjsgcy9cKihcKFte KVNPUlRdKlwpXC50ZXh0XChcLlthLXpdKlwpLyooXDEue3RleHR9XDIubGl0ZXJhbCAue3RleHR9 XDIvOyB0YjsgJyBcCisJLWUgJzpjOyBzL1wqKFwoW15TT1JUKV0qXClcKFwuW2Etel0qaXRcfFwu cmVmXClcLnRleHQvKihcMVwyLmxpdGVyYWwgXDIue3RleHR9LzsgdGM7ICcgXAorCS1lICc6ZDsg cy9cKihcKFteU09SVCldXCsgXHxcKVwudGV4dC8qKFwxLmxpdGVyYWwgLnt0ZXh0fS87IHRkOyAn IFwKIAktZSAncy9cLnt0ZXh0fS8udGV4dC9nJwogCiBxdWlldF9jbWRfX2NwcF9sZHNfUyA9IExE UyAgICAgJEAKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5v cmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.136]:52028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968047AbdAIO64 (ORCPT ); Mon, 9 Jan 2017 09:58:56 -0500 From: "Luis R. Rodriguez" Subject: [PATCH v6 02/14] xtensa: skip adding literal when SORT() is used Date: Mon, 9 Jan 2017 06:58:20 -0800 Message-ID: <20170109145833.11502-3-mcgrof@kernel.org> In-Reply-To: <20170109145833.11502-1-mcgrof@kernel.org> References: <20161222023811.21246-1-mcgrof@kernel.org> <20170109145833.11502-1-mcgrof@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, mingo@redhat.com, jpoimboe@redhat.com, bp@alien8.de, npiggin@gmail.com, 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, dalias@libc.org, linux@arm.linux.org.uk Cc: x86@kernel.org, luto@amacapital.net, keescook@chromium.org, linux@roeck-us.net, 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, 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, jolsa@kernel.org, msalter@redhat.com, chris@zankel.net, jcmvbkbc@gmail.com, linux-xtensa@linux-xtensa.org, adrian.hunter@intel.com, dsahern@gmail.com, namhyung@kernel.org, wangnan0@huawei.com, dmitry.torokhov@gmail.com, joro@8bytes.org, paulus@samba.org, mpe@ellerman.id.au, James.Bottomley@HansenPartnership.com, "Luis R. Rodriguez" Message-ID: <20170109145820.RkATFPMY7IBWtPmZMGzFxMPr4F9hJUN_4L9GCuk2Bjg@z> When SORT(foo.*) is used the current sed replacements add SORT(foo.literal foo.*), this breaks linking. Avoid adding literals for SORT globs, if needed, these need to be added manually. Signed-off-by: Luis R. Rodriguez --- arch/xtensa/kernel/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile index 264fb89c444e..ccedd016a8e0 100644 --- a/arch/xtensa/kernel/Makefile +++ b/arch/xtensa/kernel/Makefile @@ -30,10 +30,10 @@ AFLAGS_mxhead.o += -mtext-section-literals # # Replicate rules in scripts/Makefile.build -sed-y = -e ':a; s/\*(\([^)]*\)\.text\.unlikely/*(\1.literal.unlikely .{text}.unlikely/; ta; ' \ - -e ':b; s/\*(\([^)]*\)\.text\(\.[a-z]*\)/*(\1.{text}\2.literal .{text}\2/; tb; ' \ - -e ':c; s/\*(\([^)]*\)\(\.[a-z]*it\|\.ref\)\.text/*(\1\2.literal \2.{text}/; tc; ' \ - -e ':d; s/\*(\([^)]\+ \|\)\.text/*(\1.literal .{text}/; td; ' \ +sed-y = -e ':a; s/\*(\([^)SORT]*\)\.text\.unlikely/*(\1.literal.unlikely .{text}.unlikely/; ta; ' \ + -e ':b; s/\*(\([^)SORT]*\)\.text\(\.[a-z]*\)/*(\1.{text}\2.literal .{text}\2/; tb; ' \ + -e ':c; s/\*(\([^SORT)]*\)\(\.[a-z]*it\|\.ref\)\.text/*(\1\2.literal \2.{text}/; tc; ' \ + -e ':d; s/\*(\([^SORT)]\+ \|\)\.text/*(\1.literal .{text}/; td; ' \ -e 's/\.{text}/.text/g' quiet_cmd__cpp_lds_S = LDS $@ -- 2.11.0