Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb8aa3d2 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: use Kbuild tracking for all files and fix compilation output 



Move the build of user-offsets to arch/um/sys-$(SUBARCH), where it's located.
So we can also build it via Kbuild with its dependency tracking rather than by
hand.  While hacking here, fix also a lot of little cosmetic things.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-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 cb98cdcd

arch/um/Makefile

+6 −7
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ PHONY += linux 
all: linux



linux: vmlinux

	ln -f $< $@

	@echo '  SYMLINK $@'

	$(Q)ln -f $< $@



define archhelp

  echo '* linux		- Binary kernel image (./linux) - for backward'
@@ -203,8 +204,8 @@ endef 
$(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h

	$(call filechk,umlconfig)



$(ARCH_DIR)/user-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.c

	$(CC) $(USER_CFLAGS) -S -o $@ $<

$(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE

	$(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@



define filechk_gen-asm-offsets

        (set -e; \
@@ -219,11 +220,9 @@ define filechk_gen-asm-offsets 
         echo ""; )

endef



$(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/user-offsets.s

$(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s

	$(call filechk,gen-asm-offsets)



CLEAN_FILES += $(ARCH_DIR)/user-offsets.s



$(ARCH_DIR)/include/kern_constants.h: $(objtree)/$(ARCH_DIR)/include

	@echo '  SYMLINK $@'

	$(Q)ln -sf ../../../include/asm-um/asm-offsets.h $@

arch/um/sys-i386/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -10,9 +10,12 @@ subarch-obj-$(CONFIG_MODULES) += kernel/module.o 


USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o stub_segv.o



include arch/um/scripts/Makefile.rules

USER_OBJS += user-offsets.s

extra-y += user-offsets.s



extra-$(CONFIG_MODE_TT) += unmap.o



include arch/um/scripts/Makefile.rules



$(obj)/stub_segv.o $(obj)/unmap.o: \

	_c_flags = $(call unprofile,$(CFLAGS))

arch/um/sys-x86_64/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -18,9 +18,12 @@ ldt-y = ../sys-i386/ldt.o 


USER_OBJS := ptrace_user.o sigcontext.o stub_segv.o



include arch/um/scripts/Makefile.rules

USER_OBJS += user-offsets.s

extra-y += user-offsets.s



extra-$(CONFIG_MODE_TT) += unmap.o



include arch/um/scripts/Makefile.rules



$(obj)/stub_segv.o $(obj)/unmap.o: \

	_c_flags = $(call unprofile,$(CFLAGS))