diff options
| author |   Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:06:29 +0100 |
|---|---|---|
| committer |   Richard Weinberger <richard@nod.at> | 2011-11-02 14:15:04 +0100 |
| commit | 7bbe7204e93734fe79d8aac3e08a7cb4624b5004 (patch) | |
| tree | aef04472a8f1fa0e6cc43916b8f9165bceb753a0 | |
| parent | um: trim detritus from Makefile-i386 (diff) | |
| download | linux-dev-7bbe7204e93734fe79d8aac3e08a7cb4624b5004.tar.xz linux-dev-7bbe7204e93734fe79d8aac3e08a7cb4624b5004.zip | |
um: merge Makefile-{i386,x86_64}
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
| -rw-r--r-- | arch/um/Makefile | 12 | ||||
| -rw-r--r-- | arch/um/Makefile-x86 (renamed from arch/um/Makefile-i386) | 25 | ||||
| -rw-r--r-- | arch/um/Makefile-x86_64 | 26 |
3 files changed, 35 insertions, 28 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index bd0587e5c466..7492ee5837c4 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -20,8 +20,18 @@ core-y += $(ARCH_DIR)/kernel/ \ MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas +HEADER_ARCH := $(SUBARCH) + +# Additional ARCH settings for x86 +ifeq ($(SUBARCH),i386) + HEADER_ARCH := x86 +endif +ifeq ($(SUBARCH),x86_64) + HEADER_ARCH := x86 +endif + include $(srctree)/$(ARCH_DIR)/Makefile-skas -include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH) +include $(srctree)/$(ARCH_DIR)/Makefile-$(HEADER_ARCH) SHARED_HEADERS := $(ARCH_DIR)/include/shared ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS) diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-x86 index 57acfd6522cd..68fbd1b7c9f2 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-x86 @@ -1,11 +1,11 @@ core-y += arch/um/sys-x86/ arch/x86/crypto/ +ifeq ($(CONFIG_X86_32),y) START := 0x8048000 LDFLAGS += -m elf_i386 ELF_ARCH := i386 ELF_FORMAT := elf32-i386 -HEADER_ARCH := x86 CHECKFLAGS += -D__i386__ ifeq ("$(origin SUBARCH)", "command line") @@ -36,3 +36,26 @@ KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \ else echo $(call cc-option,-funit-at-a-time); fi ;) KBUILD_CFLAGS += $(cflags-y) + +else + +START := 0x60000000 + +KBUILD_CFLAGS += -fno-builtin -m64 + +CHECKFLAGS += -m64 -D__x86_64__ +KBUILD_AFLAGS += -m64 +LDFLAGS += -m elf_x86_64 +KBUILD_CPPFLAGS += -m64 + +ELF_ARCH := i386:x86-64 +ELF_FORMAT := elf64-x86-64 + +# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example. + +LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64 +LINK-y += -m64 + +# Do unit-at-a-time unconditionally on x86_64, following the host +KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) +endif diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 deleted file mode 100644 index 92d8f8fb6b64..000000000000 --- a/arch/um/Makefile-x86_64 +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2003 - 2004 Pathscale, Inc -# Released under the GPL - -core-y += arch/um/sys-x86/ arch/x86/crypto/ -START := 0x60000000 - -_extra_flags_ = -fno-builtin -m64 - -KBUILD_CFLAGS += $(_extra_flags_) - -CHECKFLAGS += -m64 -D__x86_64__ -KBUILD_AFLAGS += -m64 -LDFLAGS += -m elf_x86_64 -KBUILD_CPPFLAGS += -m64 - -ELF_ARCH := i386:x86-64 -ELF_FORMAT := elf64-x86-64 -HEADER_ARCH := x86 - -# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example. - -LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64 -LINK-y += -m64 - -# Do unit-at-a-time unconditionally on x86_64, following the host -KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) |