aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 15:06:19 -0400
committerRichard Weinberger <richard@nod.at>2011-11-02 09:15:03 -0400
commita6e77d6c74fa82675b087a79c8a145cae7c58f36 (patch)
treeac27fe20ec02e50a0643ec54f690d511013093e7
parent9aecaa6a8a43965821fbc4373240ae338f7eaf14 (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>
-rw-r--r--arch/um/Makefile-i38610
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 @@
1core-y += arch/um/sys-x86/ arch/x86/crypto/ 1core-y += arch/um/sys-x86/ arch/x86/crypto/
2 2
3TOP_ADDR := $(CONFIG_TOP_ADDR)
4
5START := 0x8048000 3START := 0x8048000
6 4
7LDFLAGS += -m elf_i386 5LDFLAGS += -m elf_i386
8ELF_ARCH := $(SUBARCH) 6ELF_ARCH := i386
9ELF_FORMAT := elf32-$(SUBARCH) 7ELF_FORMAT := elf32-i386
10OBJCOPYFLAGS := -O binary -R .note -R .comment -S
11HEADER_ARCH := x86 8HEADER_ARCH := x86
12CHECKFLAGS += -D__i386__ 9CHECKFLAGS += -D__i386__
13 10
@@ -16,9 +13,8 @@ ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)")
16KBUILD_CFLAGS += $(call cc-option,-m32) 13KBUILD_CFLAGS += $(call cc-option,-m32)
17KBUILD_AFLAGS += $(call cc-option,-m32) 14KBUILD_AFLAGS += $(call cc-option,-m32)
18LINK-y += $(call cc-option,-m32) 15LINK-y += $(call cc-option,-m32)
19UML_OBJCOPYFLAGS += -F $(ELF_FORMAT)
20 16
21export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS 17export LDFLAGS
22endif 18endif
23endif 19endif
24 20