diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-07-11 23:18:57 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 21:55:55 +0400 |
| commit | 91a6c462b02d8dc02dbe95e5a407d78078a38d01 (patch) | |
| tree | 46ad95267332ca895b3af2d40def2e89e18aafd8 /arch/x86_64/boot/compressed | |
| parent | 4fd06960f120e02e9abc802a09f9511c400042a5 (diff) | |
| download | linux-91a6c462b02d8dc02dbe95e5a407d78078a38d01.tar.xz | |
Use the new x86 setup code for x86-64; unify with i386
This unifies arch/*/boot (except arch/*/boot/compressed) between
i386 and x86-64, and uses the new x86 setup code for x86-64 as well.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/boot/compressed')
| -rw-r--r-- | arch/x86_64/boot/compressed/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86_64/boot/compressed/Makefile b/arch/x86_64/boot/compressed/Makefile index 705a3e33d7e1..c9f2da7496c1 100644 --- a/arch/x86_64/boot/compressed/Makefile +++ b/arch/x86_64/boot/compressed/Makefile @@ -7,11 +7,12 @@ # targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o -EXTRA_AFLAGS := -traditional -# cannot use EXTRA_CFLAGS because base CFLAGS contains -mkernel which conflicts with -# -m32 -CFLAGS := -m64 -D__KERNEL__ -Iinclude -O2 -fno-strict-aliasing -fPIC -mcmodel=small -fno-builtin +CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2 \ + -fno-strict-aliasing -fPIC -mcmodel=small \ + $(call cc-option, -ffreestanding) \ + $(call cc-option, -fno-stack-protector) +AFLAGS := $(CFLAGS) -D__ASSEMBLY__ LDFLAGS := -m elf_x86_64 LDFLAGS_vmlinux := -T |