From: Peter Zijlstra <peterz@infradead•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andy Lutomirski <luto@amacapital•net>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Arnaldo Carvalho de Melo <acme@redhat•com>
Subject: Re: linux-next: build failure after merge of the luto-misc tree
Date: Fri, 15 Jul 2016 09:22:43 +0200 [thread overview]
Message-ID: <20160715072243.GP30154@twins.programming.kicks-ass.net> (raw)
In-Reply-To: <20160715170654.0b09a8bc@canb.auug.org.au>
On Fri, Jul 15, 2016 at 05:06:54PM +1000, Stephen Rothwell wrote:
> interacting with commit
>
> 2a00f026a15d ("tools: Fix up BITS_PER_LONG setting")
>
> from the tip tree.
Yuck.. that thing is horrid :/
What's wrong with so?
And if you really want to retain CONFIG_64BIT (because other headers
might want it, and they currently do not) then do something like:
#ifdef __LP64__
#define CONFIG_64BIT
#else
#define CONFIG_32BIT
#endif
All GCC versions I checked have __CHAR_BIT__ and __SIZEOF_LONG__.
(and I checked most everything from 4.4 - 6.1)
diff --git a/tools/include/asm-generic/bitsperlong.h b/tools/include/asm-generic/bitsperlong.h
index cfd661c6fc17..4b4c91b0f042 100644
--- a/tools/include/asm-generic/bitsperlong.h
+++ b/tools/include/asm-generic/bitsperlong.h
@@ -3,37 +3,6 @@
#include <uapi/asm-generic/bitsperlong.h>
-/*
- * In the kernel, where this file comes from, we can rely on CONFIG_64BIT,
- * here we have to make amends with what the various compilers provides us
- * to figure out if we're on a 64-bit machine...
- */
-#ifdef __SIZEOF_LONG__
-# if __SIZEOF_LONG__ == 8
-# define CONFIG_64BIT
-# endif
-#else
-# ifdef __WORDSIZE
-# if __WORDSIZE == 64
-# define CONFIG_64BIT
-# endif
-# else
-# error Failed to determine BITS_PER_LONG value
-# endif
-#endif
-
-#ifdef CONFIG_64BIT
-#define BITS_PER_LONG 64
-#else
-#define BITS_PER_LONG 32
-#endif /* CONFIG_64BIT */
-
-#if BITS_PER_LONG != __BITS_PER_LONG
-#error Inconsistent word size. Check asm/bitsperlong.h
-#endif
-
-#ifndef BITS_PER_LONG_LONG
-#define BITS_PER_LONG_LONG 64
-#endif
+#define BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__)
#endif /* __ASM_GENERIC_BITS_PER_LONG */
next prev parent reply other threads:[~2016-07-15 7:22 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 [this message]
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
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=20160715072243.GP30154@twins.programming.kicks-ass.net \
--to=peterz@infradead$(echo .)org \
--cc=acme@redhat$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luto@amacapital$(echo .)net \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
--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