summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 21:06:19 +0200
committerRichard Weinberger <richard@nod.at>2011-11-02 14:15:03 +0100
commita6e77d6c74fa82675b087a79c8a145cae7c58f36 (patch)
treeac27fe20ec02e50a0643ec54f690d511013093e7 /arch
parentum: arch_hweight.h is needed only on uml-x86 (diff)
downloadlinux-a6e77d6c74fa82675b087a79c8a145cae7c58f36.tar.xz
linux-a6e77d6c74fa82675b087a79c8a145cae7c58f36.zip
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-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 @@
core-y += arch/um/sys-x86/ arch/x86/crypto/
-TOP_ADDR := $(CONFIG_TOP_ADDR)
-
START := 0x8048000
LDFLAGS += -m elf_i386
-ELF_ARCH := $(SUBARCH)
-ELF_FORMAT := elf32-$(SUBARCH)
-OBJCOPYFLAGS := -O binary -R .note -R .comment -S
+ELF_ARCH := i386
+ELF_FORMAT := elf32-i386
HEADER_ARCH := x86
CHECKFLAGS += -D__i386__
@@ -16,9 +13,8 @@ ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)")
KBUILD_CFLAGS += $(call cc-option,-m32)
KBUILD_AFLAGS += $(call cc-option,-m32)
LINK-y += $(call cc-option,-m32)
-UML_OBJCOPYFLAGS += -F $(ELF_FORMAT)
-export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS
+export LDFLAGS
endif
endif