Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1443984

linux-next: build failure after merge of the luto-misc tree

From Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups linux.kernel
Subject linux-next: build failure after merge of the luto-misc tree
Date 2016-07-15 09:10 +0200
Message-ID <rV5q2-3U6-57@gated-at.bofh.it> (permalink)
Organization linux.* mail to news gateway

Show all headers | View raw


Hi Andy,

After merging the luto-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from arch/x86/include/uapi/asm/bitsperlong.h:10:0,
                 from include/uapi/asm-generic/int-ll64.h:11,
                 from include/uapi/asm-generic/types.h:6,  
                 from arch/x86/include/uapi/asm/types.h:4,
                 from tools/include/linux/types.h:9,
                 from include/uapi/linux/elf.h:4,
                 from arch/x86/entry/vdso/vdso2c.c:66:
tools/include/asm-generic/bitsperlong.h:32:2: error: #error Inconsistent word size. Check asm/bitsperlong.h
 #error Inconsistent word size. Check asm/bitsperlong.h
  ^

Caused by commit

  6436d4c1a83c ("x86/vdso: Fail the build if the vdso image has no dynamic section")

interacting with commit

  2a00f026a15d ("tools: Fix up BITS_PER_LONG setting")

from the tip tree.

I am not sure why 6436d4c1a83c does this ... maybe it just causes
arch/x86/entry/vdso/vdso2c.c to be rebuilt?

I applied this partial revert of the latter commit:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Jul 2016 16:58:25 +1000
Subject: [PATCH] tools: partial revert of 2a00f026a15d "tools: Fix up
 BITS_PER_LONG setting"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 tools/include/asm-generic/bitsperlong.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/include/asm-generic/bitsperlong.h b/tools/include/asm-generic/bitsperlong.h
index cfd661c6fc17..cb047bd03b69 100644
--- a/tools/include/asm-generic/bitsperlong.h
+++ b/tools/include/asm-generic/bitsperlong.h
@@ -28,7 +28,11 @@
 #define BITS_PER_LONG 32
 #endif /* CONFIG_64BIT */
 
-#if BITS_PER_LONG != __BITS_PER_LONG
+/*
+ * FIXME: The check currently breaks x86-64 build, so it's
+ * temporarily disabled. Please fix x86-64 and reenable
+ */
+#if 0 && BITS_PER_LONG != __BITS_PER_LONG
 #error Inconsistent word size. Check asm/bitsperlong.h
 #endif
 
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | NextNext in thread | Find similar | Unroll thread


Thread

linux-next: build failure after merge of the luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-15 09:10 +0200
  Re: linux-next: build failure after merge of the luto-misc tree Peter Zijlstra <peterz@infradead.org> - 2016-07-15 09:30 +0200
    Re: linux-next: build failure after merge of the luto-misc tree Peter Zijlstra <peterz@infradead.org> - 2016-07-15 09:40 +0200
      Re: linux-next: build failure after merge of the luto-misc tree Arnaldo Carvalho de Melo <acme@redhat.com> - 2016-07-15 17:10 +0200
        Re: linux-next: build failure after merge of the luto-misc tree Arnaldo Carvalho de Melo <acme@redhat.com> - 2016-07-15 17:30 +0200
          Re: linux-next: build failure after merge of the luto-misc tree Peter Zijlstra <peterz@infradead.org> - 2016-07-15 17:30 +0200
            Re: linux-next: build failure after merge of the luto-misc tree Arnaldo Carvalho de Melo <acme@redhat.com> - 2016-07-15 18:00 +0200
          Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Peter Zijlstra <peterz@infradead.org> - 2016-07-15 17:50 +0200
            Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@redhat.com> - 2016-07-15 18:30 +0200
              Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree "H. Peter Anvin" <hpa@zytor.com> - 2016-07-15 22:30 +0200
          [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@redhat.com> - 2016-07-15 17:50 +0200
            Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-18 07:20 +0200
              Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Andy Lutomirski <luto@amacapital.net> - 2016-07-18 22:10 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-18 22:40 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-19 00:30 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-19 01:50 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-19 02:30 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-19 02:40 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-19 05:30 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-19 15:00 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-19 19:50 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-20 01:30 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-20 02:00 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Andy Lutomirski <luto@amacapital.net> - 2016-07-20 05:00 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@redhat.com> - 2016-07-20 05:10 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-20 05:20 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-20 05:00 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-21 01:40 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-21 15:20 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-22 01:30 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Josh Poimboeuf <jpoimboe@redhat.com> - 2016-07-22 05:50 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-22 16:40 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Josh Poimboeuf <jpoimboe@redhat.com> - 2016-07-22 21:20 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-22 21:40 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Josh Poimboeuf <jpoimboe@redhat.com> - 2016-07-22 21:50 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-22 22:00 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-23 07:10 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Andy Lutomirski <luto@amacapital.net> - 2016-07-24 20:50 +0200
                Re: [PATCH/RFC] Re: linux-next: build failure after merge of the  luto-misc tree Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-25 15:00 +0200
                [tip:perf/core] x86: Make the vdso2c compiler use the host  architecture headers tip-bot for Stephen Rothwell <tipbot@zytor.com> - 2016-07-25 20:20 +0200
                [tip:perf/core] tools build: Fix objtool build with ARCH=x86_64 tip-bot for Josh Poimboeuf <tipbot@zytor.com> - 2016-07-25 20:20 +0200
                [tip:perf/core] objtool: Always use host headers tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com> - 2016-07-25 20:20 +0200
    [tip:perf/core] tools: Simplify BITS_PER_LONG define tip-bot for Peter Zijlstra <tipbot@zytor.com> - 2016-07-16 22:50 +0200

csiph-web