From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnaldo Carvalho de Melo <acme@kernel•org>
Cc: Josh Poimboeuf <jpoimboe@redhat•com>,
Andy Lutomirski <luto@amacapital•net>,
Arnaldo Carvalho de Melo <acme@redhat•com>,
Peter Zijlstra <peterz@infradead•org>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>
Subject: Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
Date: Sat, 23 Jul 2016 15:08:45 +1000 [thread overview]
Message-ID: <20160723150845.3af8e452@canb.auug.org.au> (raw)
In-Reply-To: <20160722195734.GK18962@kernel.org>
Hi Arnaldo,
On Fri, 22 Jul 2016 16:57:34 -0300 Arnaldo Carvalho de Melo <acme@kernel•org> wrote:
>
> Em Fri, Jul 22, 2016 at 02:44:17PM -0500, Josh Poimboeuf escreveu:
> > On Fri, Jul 22, 2016 at 04:36:55PM -0300, Arnaldo Carvalho de Melo wrote:
> > > Em Fri, Jul 22, 2016 at 02:19:20PM -0500, Josh Poimboeuf escreveu:
> > > > On Fri, Jul 22, 2016 at 11:37:39AM -0300, Arnaldo Carvalho de Melo wrote:
> > > > > I.e. with the two patches I mentioned, that are equivalent to the last patch I
> > > > > sent to Stephen for testing, we would end up with HOSTARCH=powerpc and
> > > > > ARCH=x86, no?
>
> > > > Thanks for spelling it out, that helped a lot.
>
> > > Glad you liked it, I had to do it for my own sanity :-)
>
> > > And something that gave me mixed feelings was an e-mail from the kbuild
> > > test bot that noticed my perf/core changes and said that the build was
> > > broken for "make ARCH=x86_64", so I had to reinstate this part:
>
> > > ifeq ($(ARCH),x86_64)
> > > ARCH := x86
> > > endif
>
> > > Because, as you say, 'make ARCH=x86' works :-\ I think it will not be
> > > needed with your patch, right? I'm checking your patch below right now,
>
> > Yeah, that shouldn't be needed with my patch. I think either would
> > work, but my patch is more of a permanent solution.
>
> Sure, I left it there because then we don't have bisection broke at that
> fix I made, i.e. 'make ARCH=x86_64' works at that point too.
>
> I applied your patch and will push it to Ingo, now we must cross our
> fingers so that Stephen doesn't come back to us once more telling it is
> still broken :o)
Unfortunately, this is what I get when I just build perf/core:
DESCEND objtool
CC /home/sfr/next/x86_64_allmodconfig/tools/objtool/builtin-check.o
LD /home/sfr/next/x86_64_allmodconfig/tools/objtool/objtool-in.o
Warning: objtool: x86 instruction decoder differs from kernel
LINK /home/sfr/next/x86_64_allmodconfig/tools/objtool/objtool
In file included from /home/sfr/next/next/arch/x86/include/uapi/asm/bitsperlong.h:10:0,
from /home/sfr/next/next/include/uapi/asm-generic/int-ll64.h:11,
from /home/sfr/next/next/include/uapi/asm-generic/types.h:6,
from /home/sfr/next/next/arch/x86/include/uapi/asm/types.h:4,
from /home/sfr/next/next/tools/include/linux/types.h:9,
from /home/sfr/next/next/include/uapi/linux/elf.h:4,
from /home/sfr/next/next/arch/x86/entry/vdso/vdso2c.c:66:
/home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:13:2: error: #error Inconsistent word size. Check asm/bitsperlong.h
#error Inconsistent word size. Check asm/bitsperlong.h
^
The be clear: this is a ppc64le hosted, x86_64 target cross build.
I than added the following patch, and the build finishes successfully.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Sat, 23 Jul 2016 14:35:40 +1000
Subject: [PATCH] x86: make the vdso2c compiler use the host architecture
headers
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/x86/entry/vdso/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 253b72eaade6..25e88c030c47 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -55,7 +55,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)
-HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/x86/include/uapi
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi
hostprogs-y += vdso2c
quiet_cmd_vdso2c = VDSO2C $@
--
2.8.1
There may be a more correct way to do this ...
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-07-23 5:08 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 7:06 linux-next: build failure after merge of the luto-misc tree Stephen Rothwell
2016-07-15 7:22 ` Peter Zijlstra
2016-07-15 7:31 ` Peter Zijlstra
2016-07-15 15:09 ` Arnaldo Carvalho de Melo
2016-07-15 15:24 ` Arnaldo Carvalho de Melo
2016-07-15 15:29 ` Peter Zijlstra
2016-07-15 15:56 ` Arnaldo Carvalho de Melo
2016-07-15 15:43 ` [PATCH/RFC] " Arnaldo Carvalho de Melo
2016-07-15 15:49 ` Peter Zijlstra
2016-07-15 16:28 ` Arnaldo Carvalho de Melo
2016-07-15 20:26 ` H. Peter Anvin
2016-07-18 5:18 ` Stephen Rothwell
2016-07-18 20:04 ` Andy Lutomirski
2016-07-18 20:36 ` Arnaldo Carvalho de Melo
2016-07-18 22:22 ` Stephen Rothwell
2016-07-18 23:41 ` Arnaldo Carvalho de Melo
2016-07-19 0:26 ` Stephen Rothwell
2016-07-19 0:39 ` Arnaldo Carvalho de Melo
2016-07-19 3:26 ` Stephen Rothwell
2016-07-19 12:54 ` Arnaldo Carvalho de Melo
2016-07-19 17:45 ` Arnaldo Carvalho de Melo
2016-07-19 23:21 ` Stephen Rothwell
2016-07-19 23:53 ` Stephen Rothwell
2016-07-20 2:52 ` Arnaldo Carvalho de Melo
2016-07-20 2:57 ` Andy Lutomirski
2016-07-20 3:09 ` Arnaldo Carvalho de Melo
2016-07-20 3:18 ` Stephen Rothwell
2016-07-20 23:29 ` Stephen Rothwell
2016-07-21 13:12 ` Arnaldo Carvalho de Melo
2016-07-21 23:23 ` Stephen Rothwell
2016-07-22 3:41 ` Josh Poimboeuf
2016-07-22 14:37 ` Arnaldo Carvalho de Melo
2016-07-22 19:19 ` Josh Poimboeuf
2016-07-22 19:36 ` Arnaldo Carvalho de Melo
2016-07-22 19:44 ` Josh Poimboeuf
2016-07-22 19:57 ` Arnaldo Carvalho de Melo
2016-07-23 5:08 ` Stephen Rothwell [this message]
2016-07-24 18:40 ` Andy Lutomirski
2016-07-25 12:56 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160723150845.3af8e452@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=acme@kernel$(echo .)org \
--cc=acme@redhat$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jpoimboe@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luto@amacapital$(echo .)net \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox