evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] x86_64: Allow compilation on a 32bit biarch toolchain

Browse source 
This might help on distributions that use a 32bit biarch compiler.

First pass -m64 by default.

Secondly add some more .code32s because at least the Ubuntu biarch
32bit as called by gcc doesn't seem to handle -m64 -m32 as generated
by the Makefile without such assistance.

And finally make sure the linker script can be preprocessed
with a 32bit cpp.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andi Kleen 2006-01-11 22:43:54 +01:00 • committed by Linus Torvalds
parent 79c62cf178
commit bb33421dde
5 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/x86_64/Makefile
View file

@ -31,6 +31,7 @@ cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona) cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
CFLAGS += $(cflags-y) CFLAGS += $(cflags-y)
CFLAGS += -m64
CFLAGS += -mno-red-zone CFLAGS += -mno-red-zone
CFLAGS += -mcmodel=kernel CFLAGS += -mcmodel=kernel
CFLAGS += -pipe CFLAGS += -pipe
@ -52,6 +53,8 @@ CFLAGS += $(call cc-option,-funit-at-a-time)
# prevent gcc from generating any FP code by mistake # prevent gcc from generating any FP code by mistake
CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
AFLAGS += -m64
head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o
libs-y += arch/x86_64/lib/ libs-y += arch/x86_64/lib/

1
arch/x86_64/ia32/vsyscall-sigreturn.S
View file

@ -7,6 +7,7 @@
* by doing ".balign 32" must match in both versions of the page. * by doing ".balign 32" must match in both versions of the page.
*/ */
.code32
.section .text.sigreturn,"ax" .section .text.sigreturn,"ax"
.balign 32 .balign 32
.globl __kernel_sigreturn .globl __kernel_sigreturn

1
arch/x86_64/ia32/vsyscall-syscall.S
View file

@ -6,6 +6,7 @@
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/segment.h> #include <asm/segment.h>
.code32
.text .text
.section .text.vsyscall,"ax" .section .text.vsyscall,"ax"
.globl __kernel_vsyscall .globl __kernel_vsyscall

1
arch/x86_64/ia32/vsyscall-sysenter.S
View file

@ -5,6 +5,7 @@
#include <asm/ia32_unistd.h> #include <asm/ia32_unistd.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
.code32
.text .text
.section .text.vsyscall,"ax" .section .text.vsyscall,"ax"
.globl __kernel_vsyscall .globl __kernel_vsyscall

2
arch/x86_64/kernel/vmlinux.lds.S
View file

@ -8,6 +8,8 @@
#include <asm/page.h> #include <asm/page.h>
#include <linux/config.h> #include <linux/config.h>
#undef i386 /* in case the preprocessor is a 32bit one */
OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
OUTPUT_ARCH(i386:x86-64) OUTPUT_ARCH(i386:x86-64)
ENTRY(phys_startup_64) ENTRY(phys_startup_64)