leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] uml: clean up remapping code build magic

Browse Source 
kills unmap magic

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2006-03-31 02:30:12 -08:00 committed by Linus Torvalds
parent de2fe5e07d
commit 7b99edc78d
4 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/Makefile
View File

@ -129,7 +129,7 @@ CPPFLAGS_vmlinux.lds = -U$(SUBARCH) \
-DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \ -DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \
-DELF_FORMAT="$(ELF_FORMAT)" $(CPP_MODE-y) \ -DELF_FORMAT="$(ELF_FORMAT)" $(CPP_MODE-y) \
-DKERNEL_STACK_SIZE=$(STACK_SIZE) \ -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. #The wrappers will select whether using "malloc" or the kernel allocator.
LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc

22
arch/um/scripts/Makefile.unmap
View File

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

5
arch/um/sys-i386/Makefile
View File

@ -11,6 +11,7 @@ USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o stub_segv.o
include arch/um/scripts/Makefile.rules 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))

5
arch/um/sys-x86_64/Makefile
View File

@ -19,6 +19,7 @@ USER_OBJS := ptrace_user.o sigcontext.o stub_segv.o
include arch/um/scripts/Makefile.rules 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))