diff options
| author | Richard Weinberger <richard@nod.at> | 2013-11-29 15:39:41 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2013-12-01 13:06:51 +0100 |
| commit | fff6540cbcb56a6ae92d4fd4b0864c8d13a8f932 (patch) | |
| tree | 3c763c97ef687d10a289410e96894c46930d9477 | |
| parent | 8ed12fcc194d93c6a17714120a7027ee4d76a881 (diff) | |
um: Build always with -mcmodel=large on 64bit
On UML SUBARCH can be x86, x86_64 and i386 and if it is x86
we use uname -m to select a defconfig.
Therefore we can no longer use -mcmodel=large only if SUBARCH
is x86_64.
Reported-and-tested-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
| -rw-r--r-- | arch/um/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 48d92bbe62e9..36e658a4291c 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -33,12 +33,11 @@ MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas HEADER_ARCH := $(SUBARCH) -# Additional ARCH settings for x86 -ifeq ($(SUBARCH),i386) - HEADER_ARCH := x86 +ifneq ($(filter $(SUBARCH),x86 x86_64 i386),) + HEADER_ARCH := x86 endif -ifeq ($(SUBARCH),x86_64) - HEADER_ARCH := x86 + +ifdef CONFIG_64BIT KBUILD_CFLAGS += -mcmodel=large endif |