From: Al Viro <viro@ftp.linux.org.uk>
To: Blaisorblade <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>,
user-mode-linux-devel@lists.sourceforge.net,
Alexander Viro <viro@zeniv.linux.org.uk>,
sam@ravnborg.org
Subject: [uml-devel] Re: UML/2.6.14-rc3 doesn't work fixes
Date: Tue, 4 Oct 2005 18:18:45 +0100 [thread overview]
Message-ID: <20051004171845.GK7992@ftp.linux.org.uk> (raw)
In-Reply-To: <20051004171419.GJ7992@ftp.linux.org.uk>
Killing unmap magic
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
----
diff -urN RC14-rc3-git4-base/arch/um/Makefile RC14-rc3-git4-foo/arch/um/Makefile
--- RC14-rc3-git4-base/arch/um/Makefile 2005-09-25 23:28:27.000000000 -0400
+++ RC14-rc3-git4-foo/arch/um/Makefile 2005-10-04 13:16:14.000000000 -0400
@@ -121,7 +121,7 @@
-DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \
-DELF_FORMAT="$(ELF_FORMAT)" $(CPP_MODE-y) \
-DKERNEL_STACK_SIZE=$(STACK_SIZE) \
- -DUNMAP_PATH=arch/um/sys-$(SUBARCH)/unmap_fin.o
+ -DUNMAP_PATH=arch/um/sys-$(SUBARCH)/unmap.o
#The wrappers will select whether using "malloc" or the kernel allocator.
LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
diff -urN RC14-rc3-git4-base/arch/um/scripts/Makefile.unmap RC14-rc3-git4-foo/arch/um/scripts/Makefile.unmap
--- RC14-rc3-git4-base/arch/um/scripts/Makefile.unmap 2005-09-05 07:05:14.000000000 -0400
+++ RC14-rc3-git4-foo/arch/um/scripts/Makefile.unmap 1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-clean-files += unmap_tmp.o unmap_fin.o unmap.o
-
-ifdef CONFIG_MODE_TT
-
-#Always build unmap_fin.o
-extra-y += unmap_fin.o
-#Do dependency tracking for unmap.o (it will be always built, but won't get the tracking unless we use this).
-targets += unmap.o
-
-#XXX: partially copied from arch/um/scripts/Makefile.rules
-$(obj)/unmap.o: _c_flags = $(call unprofile,$(CFLAGS))
-
-quiet_cmd_wrapld = LD $@
-define cmd_wrapld
- $(LD) $(LDFLAGS) -r -o $(obj)/unmap_tmp.o $< ; \
- $(OBJCOPY) $(UML_OBJCOPYFLAGS) $(obj)/unmap_tmp.o $@ -G switcheroo
-endef
-
-$(obj)/unmap_fin.o : $(obj)/unmap.o FORCE
- $(call if_changed,wrapld)
-
-endif
diff -urN RC14-rc3-git4-base/arch/um/sys-i386/Makefile RC14-rc3-git4-foo/arch/um/sys-i386/Makefile
--- RC14-rc3-git4-base/arch/um/sys-i386/Makefile 2005-10-04 13:15:51.000000000 -0400
+++ RC14-rc3-git4-foo/arch/um/sys-i386/Makefile 2005-10-04 13:16:14.000000000 -0400
@@ -11,6 +11,7 @@
include arch/um/scripts/Makefile.rules
-$(obj)/stub_segv.o : _c_flags = $(call unprofile,$(CFLAGS))
+extra-$(CONFIG_MODE_TT) += unmap.o
-include arch/um/scripts/Makefile.unmap
+$(obj)/stub_segv.o $(obj)/unmap.o: \
+ _c_flags = $(call unprofile,$(CFLAGS))
diff -urN RC14-rc3-git4-base/arch/um/sys-x86_64/Makefile RC14-rc3-git4-foo/arch/um/sys-x86_64/Makefile
--- RC14-rc3-git4-base/arch/um/sys-x86_64/Makefile 2005-10-04 13:15:51.000000000 -0400
+++ RC14-rc3-git4-foo/arch/um/sys-x86_64/Makefile 2005-10-04 13:16:14.000000000 -0400
@@ -16,6 +16,7 @@
include arch/um/scripts/Makefile.rules
-$(obj)/stub_segv.o: _c_flags = $(call unprofile,$(CFLAGS))
+extra-$(CONFIG_MODE_TT) += unmap.o
-include arch/um/scripts/Makefile.unmap
+$(obj)/stub_segv.o $(obj)/unmap.o: \
+ _c_flags = $(call unprofile,$(CFLAGS))
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
next prev parent reply other threads:[~2005-10-04 17:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-02 10:13 [uml-devel] UML/2.6.14-rc3 doesn't work fixes Blaisorblade
2005-10-02 11:38 ` [uml-devel] " Al Viro
2005-10-02 11:50 ` Blaisorblade
2005-10-02 17:32 ` Al Viro
2005-10-02 17:45 ` Blaisorblade
2005-10-02 15:51 ` Jeff Dike
2005-10-02 16:55 ` Al Viro
2005-10-02 18:01 ` Blaisorblade
2005-10-02 18:37 ` Al Viro
2005-10-02 20:54 ` Al Viro
2005-10-03 18:30 ` Blaisorblade
2005-10-03 23:38 ` Al Viro
2005-10-04 10:26 ` Blaisorblade
2005-10-04 11:09 ` Al Viro
2005-10-04 11:19 ` Blaisorblade
2005-10-04 11:55 ` Al Viro
2005-10-04 12:09 ` Blaisorblade
2005-10-04 17:09 ` Al Viro
2005-10-04 17:14 ` Al Viro
2005-10-04 17:18 ` Al Viro [this message]
2005-10-04 17:24 ` Al Viro
2005-10-04 17:28 ` Al Viro
2005-10-09 19:16 ` Blaisorblade
2005-10-03 18:56 ` Blaisorblade
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051004171845.GK7992@ftp.linux.org.uk \
--to=viro@ftp.linux.org.uk \
--cc=blaisorblade@yahoo.it \
--cc=jdike@addtoit.com \
--cc=sam@ravnborg.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox