Commit 9383a34c authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: small Makefile fixes

Tidied up some whitespace in arch/um/Makefile.  Added -DUM_FASTCALL to
Makefile-i386.  make clean descends into util in order to get rid of the
binaries there.
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b094263f
...@@ -67,7 +67,7 @@ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc ...@@ -67,7 +67,7 @@ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
# included; the values here are meaningless # included; the values here are meaningless
CONFIG_NEST_LEVEL ?= 0 CONFIG_NEST_LEVEL ?= 0
CONFIG_KERNEL_HALF_GIGS ?= 0 CONFIG_KERNEL_HALF_GIGS ?= 0
SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000) SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
......
...@@ -5,6 +5,11 @@ TOP_ADDR = 0xc0000000 ...@@ -5,6 +5,11 @@ TOP_ADDR = 0xc0000000
endif endif
CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH)
ifneq ($(CONFIG_GPROF),y)
ARCH_CFLAGS += -DUM_FASTCALL
endif
ELF_ARCH = $(SUBARCH) ELF_ARCH = $(SUBARCH)
ELF_FORMAT = elf32-$(SUBARCH) ELF_FORMAT = elf32-$(SUBARCH)
......
...@@ -5,6 +5,11 @@ ...@@ -5,6 +5,11 @@
extra-y := vmlinux.lds uml.lds dyn.lds extra-y := vmlinux.lds uml.lds dyn.lds
# Descend into ../util for make clean. This is here because it doesn't work
# in arch/um/Makefile.
subdir- = ../util
obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \ obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \
helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o mem_user.o \ helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o mem_user.o \
physmem.o process.o process_kern.o ptrace.o reboot.o resource.o \ physmem.o process.o process_kern.o ptrace.o reboot.o resource.o \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment