diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:06:19 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:15:03 -0400 |
commit | a6e77d6c74fa82675b087a79c8a145cae7c58f36 (patch) | |
tree | ac27fe20ec02e50a0643ec54f690d511013093e7 /arch | |
parent | 9aecaa6a8a43965821fbc4373240ae338f7eaf14 (diff) |
um: trim detritus from Makefile-i386
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/um/Makefile-i386 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 7e5f1baf7c93..57acfd6522cd 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386 | |||
@@ -1,13 +1,10 @@ | |||
1 | core-y += arch/um/sys-x86/ arch/x86/crypto/ | 1 | core-y += arch/um/sys-x86/ arch/x86/crypto/ |
2 | 2 | ||
3 | TOP_ADDR := $(CONFIG_TOP_ADDR) | ||
4 | |||
5 | START := 0x8048000 | 3 | START := 0x8048000 |
6 | 4 | ||
7 | LDFLAGS += -m elf_i386 | 5 | LDFLAGS += -m elf_i386 |
8 | ELF_ARCH := $(SUBARCH) | 6 | ELF_ARCH := i386 |
9 | ELF_FORMAT := elf32-$(SUBARCH) | 7 | ELF_FORMAT := elf32-i386 |
10 | OBJCOPYFLAGS := -O binary -R .note -R .comment -S | ||
11 | HEADER_ARCH := x86 | 8 | HEADER_ARCH := x86 |
12 | CHECKFLAGS += -D__i386__ | 9 | CHECKFLAGS += -D__i386__ |
13 | 10 | ||
@@ -16,9 +13,8 @@ ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)") | |||
16 | KBUILD_CFLAGS += $(call cc-option,-m32) | 13 | KBUILD_CFLAGS += $(call cc-option,-m32) |
17 | KBUILD_AFLAGS += $(call cc-option,-m32) | 14 | KBUILD_AFLAGS += $(call cc-option,-m32) |
18 | LINK-y += $(call cc-option,-m32) | 15 | LINK-y += $(call cc-option,-m32) |
19 | UML_OBJCOPYFLAGS += -F $(ELF_FORMAT) | ||
20 | 16 | ||
21 | export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS | 17 | export LDFLAGS |
22 | endif | 18 | endif |
23 | endif | 19 | endif |
24 | 20 | ||