[PATCH] x86/purgatory: Use approprate -m64/-32 build flag for arch/x86/purgatory

[Vivek Goyal]

Thomas reported that build of x86_64 kernel was failing for him. He is
using 32bit tool chain.

Problem is that while compiling purgatory, I have not specified -m64
flag. And 32bit tool chain must be assuming -m32 by default.

Following is error message.

(mini) [~/work/linux-2.6] make
scripts/kconfig/conf --silentoldconfig Kconfig
  CHK     include/config/kernel.release
  UPD     include/config/kernel.release
  CHK     include/generated/uapi/linux/version.h
  CHK     include/generated/utsrelease.h
  UPD     include/generated/utsrelease.h
  CC      arch/x86/purgatory/purgatory.o
arch/x86/purgatory/purgatory.c:1:0: error: code model 'large' not supported in
the 32 bit mode
make[1]: *** [arch/x86/purgatory/purgatory.o] Error 1
make: *** [archprepare] Error 2

Fix it by explicitly passing appropriate -m64/-m32 build flag for purgatory.

Reported-by: Thomas Glanzmann <thomas@xxxxxxxxxxxx>
Tested-by: Thomas Glanzmann <thomas@xxxxxxxxxxxx>
Suggested-by: H. Peter Anvin <hpa@xxxxxxxxx> 
Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
---
 arch/x86/purgatory/Makefile |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6/arch/x86/purgatory/Makefile
===================================================================
--- linux-2.6.orig/arch/x86/purgatory/Makefile	2014-08-20 11:32:21.723559119 -0400
+++ linux-2.6/arch/x86/purgatory/Makefile	2014-08-20 11:32:23.654570231 -0400
@@ -11,6 +11,7 @@ targets += purgatory.ro
 # sure how to relocate those. Like kexec-tools, use custom flags.
 
 KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -c -MD -Os -mcmodel=large
+KBUILD_CFLAGS += -m$(BITS)
 
 $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
 		$(call if_changed,ld)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/