From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/11830 Path: news.gmane.org!.POSTED!not-for-mail From: Szabolcs Nagy Newsgroups: gmane.linux.lib.musl.general Subject: Re: [musl-cross-make] [PATCH] Fix LINUX_ARCH for aarch64-* TARGET Date: Sun, 20 Aug 2017 23:30:26 +0200 Message-ID: <20170820213025.GN15263@port70.net> References: <20170820203033.19393-1-mforney@mforney.org> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1503264643 3742 195.159.176.226 (20 Aug 2017 21:30:43 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 20 Aug 2017 21:30:43 +0000 (UTC) User-Agent: Mutt/1.6.0 (2016-04-01) To: musl@lists.openwall.com Original-X-From: musl-return-11843-gllmg-musl=m.gmane.org@lists.openwall.com Sun Aug 20 23:30:39 2017 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1djXnk-0000L3-R6 for gllmg-musl@m.gmane.org; Sun, 20 Aug 2017 23:30:32 +0200 Original-Received: (qmail 30107 invoked by uid 550); 20 Aug 2017 21:30:38 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 30086 invoked from network); 20 Aug 2017 21:30:37 -0000 Mail-Followup-To: musl@lists.openwall.com Content-Disposition: inline In-Reply-To: <20170820203033.19393-1-mforney@mforney.org> Xref: news.gmane.org gmane.linux.lib.musl.general:11830 Archived-At: * Michael Forney [2017-08-20 13:30:33 -0700]: > 'aarch64' is converted to 'arm64' in the TARGET_ARCH_MANGLED assignment, > but then LINUX_ARCH is set the first to the first linux arch which > appears in TARGET_ARCH_MANGLED. Since 'arm' is a substring of 'arm64' > and appears ahead of 'arm64' in sorted order, it gets chosen > incorrectly. > yes it seems my aarch64 musl toolchain has arm kernel headers because of this. > To fix this, use 'lastword' instead of 'firstword'. This should work for > all current linux architectures, but is still not perfect in the > theoretical case where the substring match is not rooted at the > beginning of TARGET_ARCH_MANGLED. So, also replace 'findstring' with an > 'if' and 'filter'. > --- > litecross/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/litecross/Makefile b/litecross/Makefile > index 371affb..46584fd 100644 > --- a/litecross/Makefile > +++ b/litecross/Makefile > @@ -206,7 +206,7 @@ ifneq ($(LINUX_SRCDIR),) > TARGET_ARCH = $(firstword $(subst -, ,$(TARGET))) > TARGET_ARCH_MANGLED = $(patsubst i%86,x86,$(patsubst aarch64%,arm64%,$(TARGET_ARCH))) > LINUX_ARCH_LIST = $(sort $(notdir $(wildcard $(LINUX_SRCDIR)/arch/*))) > -LINUX_ARCH = $(firstword $(foreach a,$(LINUX_ARCH_LIST),$(findstring $(a),$(TARGET_ARCH_MANGLED)))) > +LINUX_ARCH = $(lastword $(foreach a,$(LINUX_ARCH_LIST),$(if $(filter $(a)%,$(TARGET_ARCH_MANGLED)),$(a)))) > ifneq ($(LINUX_ARCH),) > all: kernel-headers > install: install-kernel-headers > -- > 2.14.0