The patch titled
uml: use Kbuild tracking for all files and fix compilation output
has been removed from the -mm tree. Its filename is
uml-use-kbuild-tracking-for-all-files-and-fix-compilation-output.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
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: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Acked-by: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/Makefile | 13 ++++++-------
arch/um/sys-i386/Makefile | 5 ++++-
arch/um/sys-x86_64/Makefile | 5 ++++-
3 files changed, 14 insertions(+), 9 deletions(-)
diff -puN arch/um/Makefile~uml-use-kbuild-tracking-for-all-files-and-fix-compilation-output arch/um/Makefile
--- devel/arch/um/Makefile~uml-use-kbuild-tracking-for-all-files-and-fix-compilation-output 2006-05-01 12:15:31.000000000 -0700
+++ devel-akpm/arch/um/Makefile 2006-05-01 12:15:31.000000000 -0700
@@ -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,13 +220,11 @@ 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 $@
+ $(Q)ln -sf ../../../include/asm-um/asm-offsets.h $@
export SUBARCH USER_CFLAGS OS
diff -puN arch/um/sys-i386/Makefile~uml-use-kbuild-tracking-for-all-files-and-fix-compilation-output arch/um/sys-i386/Makefile
--- devel/arch/um/sys-i386/Makefile~uml-use-kbuild-tracking-for-all-files-and-fix-compilation-output 2006-05-01 12:15:31.000000000 -0700
+++ devel-akpm/arch/um/sys-i386/Makefile 2006-05-01 12:15:31.000000000 -0700
@@ -10,9 +10,12 @@ subarch-obj-$(CONFIG_MODULES) += kernel/
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))
diff -puN arch/um/sys-x86_64/Makefile~uml-use-kbuild-tracking-for-all-files-and-fix-compilation-output arch/um/sys-x86_64/Makefile
--- devel/arch/um/sys-x86_64/Makefile~uml-use-kbuild-tracking-for-all-files-and-fix-compilation-output 2006-05-01 12:15:31.000000000 -0700
+++ devel-akpm/arch/um/sys-x86_64/Makefile 2006-05-01 12:15:31.000000000 -0700
@@ -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))
_
Patches currently in -mm which might be from blaisorblade@xxxxxxxx are
origin.patch
uml-make-copy__user-atomic.patch
uml-fix-not_dead_yet-when-directory-is-in-bad-state.patch
uml-rename-and-improve-actually_do_remove.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
