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

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>
---

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 --git a/arch/um/Makefile b/arch/um/Makefile
index a508e7a..930e006 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -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 --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 98b20b7..82121ab 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -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 --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile
index b5fc22b..f739bea 100644
--- a/arch/um/sys-x86_64/Makefile
+++ b/arch/um/sys-x86_64/Makefile
@@ -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))
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Relevant Pages

  • Re: xxs in MKPortal M1.1
    ... Here is a Fix from me, delete the pmpopup.php, create a new one with this in there: ... unset; ... echo "Hacking Attempt logged \n"; ...
    (Bugtraq)
  • Re: Home brew Z80 CP/M computer
    ... My system was broken so badly, neither Dell nor Microsoft could fix it. ... I must have spent two weeks on the phone with tech support people, trying to fix the problem. ... A few years spent running big apps on a Linux box showed me that their apps fail at just about the same frequency as Windoze. ... Unfortunately, it seems that the complexity of both Unix and Linux has grown greatly since the "Good Old Days," As I mentioned, my experience with Linux has been that it's buggy, too. ...
    (comp.os.cpm)
  • Re: PATCH: cdrecord: avoiding scsi device numbering for ide devices
    ... I am able to decide myself what is a bug and what ... Looks like a typical answer from somebody who's thoughts are limited to a Linux ... >there's a Linux kernel bug, people should be pointed at linux-kernel and ... As it takes only 5 minutes to fix the include ...
    (Linux-Kernel)
  • Re: Home brew Z80 CP/M computer
    ... I must have spent two weeks on the phone with tech support people, trying to fix the problem. ... About a week later, some software app vendor sent down their own "Upgrade," which broke one of my major apps. ... A few years spent running big apps on a Linux box showed me that their apps fail at just about the same frequency as Windoze. ... Unfortunately, it seems that the complexity of both Unix and Linux has grown greatly since the "Good Old Days," As I mentioned, my experience with Linux has been that it's buggy, too. ...
    (comp.os.cpm)
  • RE: Patch management tool
    ... for any linux distro that uses rpm's, yum - Yellow dog Updater, Modified ... > Ethical Hacking at the InfoSec Institute. ... > Check out our Advanced Hacking course, ... learn to write exploits and attack security infrastructure. ...
    (Pen-Test)