lkml.org 
[lkml]   [2007]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] x86: introduce ARCH=i386,ARCH=x86_64 to select 32/64 bit
    Date
    Using the newly added infrastructure is is now simple
    to add addition ARCH= symbols to select between 32 and 64 bit.
    Do this for x86.

    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    ---
    Makefile | 16 +++++++++++++---
    arch/x86/Makefile | 10 +++++++---
    scripts/kconfig/Makefile | 2 +-
    3 files changed, 21 insertions(+), 7 deletions(-)

    diff --git a/Makefile b/Makefile
    index 902082b..5efee80 100644
    --- a/Makefile
    +++ b/Makefile
    @@ -165,8 +165,7 @@ export srctree objtree VPATH TOPDIR
    # then ARCH is assigned, getting whatever value it gets normally, and
    # SUBARCH is subsequently ignored.

    -SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
    - -e s/sun4u/sparc64/ \
    +SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
    -e s/arm.*/arm/ -e s/sa110/arm/ \
    -e s/s390x/s390/ -e s/parisc64/parisc/ \
    -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
    @@ -198,8 +197,19 @@ CROSS_COMPILE ?=
    UTS_MACHINE := $(ARCH)
    SRCARCH := $(ARCH)

    +ifeq ($(ARCH),i386)
    + K64BIT := n
    + SRCARCH := x86
    +endif
    +ifeq ($(ARCH),x86_64)
    + K64BIT := y
    + SRCARCH := x86
    +endif
    +export K64BIT
    +
    +
    # Sanity check the specified ARCH
    -ifeq ($(wildcard $(srctree)/arch/$(ARCH)/Kconfig),)
    +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/Kconfig),)
    $(error "ERROR: ARCH ($(ARCH)) does not exist (for i386 and x86_64 use ARCH=x86)")
    endif

    diff --git a/arch/x86/Makefile b/arch/x86/Makefile
    index ee94224..feba761 100644
    --- a/arch/x86/Makefile
    +++ b/arch/x86/Makefile
    @@ -1,9 +1,13 @@
    # Unified Makefile for i386 and x86_64

    # select i386 defconfig file as default config
    -KBUILD_DEFCONFIG := i386_defconfig
    -
    -# # No need to remake these files
    +ifeq ($(ARCH),x86)
    + KBUILD_DEFCONFIG := i386_defconfig
    +else
    + KBUILD_DEFCONFIG := $(ARCH)_defconfig
    +endif
    +
    +# No need to remake these files
    $(srctree)/arch/x86/Makefile%: ;

    ifeq ($(CONFIG_X86_32),y)
    diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
    index 3c9db07..1ad6f7f 100644
    --- a/scripts/kconfig/Makefile
    +++ b/scripts/kconfig/Makefile
    @@ -4,7 +4,7 @@

    PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config

    -Kconfig := arch/$(ARCH)/Kconfig
    +Kconfig := arch/$(SRCARCH)/Kconfig

    xconfig: $(obj)/qconf
    $< $(Kconfig)
    --
    1.5.3.4.1157.g0e74-dirty
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-11-10 21:45    [W:0.021 / U:90.264 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site