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

Commit 7b99edc7 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] uml: clean up remapping code build magic 



kills unmap magic

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent de2fe5e0

arch/um/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

arch/um/scripts/Makefile.unmap

deleted100644 → 0
+0 −22
Original line number Original line Diff line number Diff line 
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

arch/um/sys-i386/Makefile

+3 −2
Original line number Original line Diff line number Diff line
@@ -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))

arch/um/sys-x86_64/Makefile

+3 −2
Original line number Original line Diff line number Diff line
@@ -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))