Add CONFIG_BITS to remove the test in arch/x86/Makefile

I propose the following patch to arch/x86/Makefile and Kconfig.

Actions:

- Add a BITS variable to Kconfig which takes value 32 or 64 according to 64BIT.
- Modify arch/x86/Makefile to use CONFIG_BITS instead of testing ARCH.

How this could be expanded:

- Either remove BITS from arch/x86/Makefile_?? or change its definition (I expect to do one of those if my patch is accepted).
- Add it to other arhitectures ? Maybe CONFIG_BITS could be useful somewhere in the code ?

Kindly,

Lo�c Greni�

---
 arch/x86/Kconfig  |    5 +++++
 arch/x86/Makefile |    9 ++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

index 368864d..c0935fd 100644
@@ -15,6 +15,11 @@ config X86_32
 config X86_64
 	def_bool 64BIT
 
+config BITS
+	int
+	default "64" if 64BIT
+	default "32"
+
 ### Arch settings
 config X86
 	bool

index 116b03a..035adba 100644
@@ -10,11 +10,6 @@ endif
 # No need to remake these files
 $(srctree)/arch/x86/Makefile%: ;
 
-ifeq ($(CONFIG_X86_32),y)
-        include $(srctree)/arch/x86/Makefile_32
-else
-        include $(srctree)/arch/x86/Makefile_64
-endif
-
-
+CONFIG_BITS ?= 32
 
+include $(srctree)/arch/x86/Makefile_$(CONFIG_BITS)

1.5.3.4

Linus' suggestion was WORD_SIZE and that is what we have already used in powerpc.

Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/