linux-next: build failure after merge of the luto-misc tree
From: Stephen Rothwell
Date: Fri Jul 15 2016 - 03:07:03 EST
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@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
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