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

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

[PATCH] uml: eliminate symlinks to host arch 



kills symlinks in arch/um/sys-*

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 f4c57a78

arch/um/Makefile-x86_64

+1 −1
Original line number Original line Diff line number Diff line 
# Copyright 2003 - 2004 Pathscale, Inc

# Copyright 2003 - 2004 Pathscale, Inc

# Released under the GPL

# Released under the GPL





libs-y += arch/um/sys-x86_64/

core-y += arch/um/sys-x86_64/

START := 0x60000000

START := 0x60000000





#We #undef __x86_64__ for kernelspace, not for userspace where

#We #undef __x86_64__ for kernelspace, not for userspace where

arch/um/scripts/Makefile.rules

+4 −22
Original line number Original line Diff line number Diff line
@@ -20,25 +20,7 @@ define unprofile 
	$(patsubst -pg,,$(patsubst -fprofile-arcs -ftest-coverage,,$(1)))

	$(patsubst -pg,,$(patsubst -fprofile-arcs -ftest-coverage,,$(1)))

endef

endef







ifdef subarch-obj-y

# cmd_make_link checks to see if the $(foo-dir) variable starts with a /.  If

obj-y += subarch.o

# so, it's considered to be a path relative to $(srcdir) rather than

subarch-y = $(addprefix ../../$(SUBARCH)/,$(subarch-obj-y))

# $(srcdir)/arch/$(SUBARCH).  This is because x86_64 wants to get ldt.c from

endif
 
# arch/um/sys-i386 rather than arch/i386 like the other borrowed files.  So,

# it sets $(ldt.c-dir) to /arch/um/sys-i386.

quiet_cmd_make_link = SYMLINK $@

cmd_make_link       = rm -f $@; ln -sf $(srctree)$(if $(filter-out /%,$($(notdir $@)-dir)),/arch/$(SUBARCH))/$($(notdir $@)-dir)/$(notdir $@) $@



# this needs to be before the foreach, because targets does not accept

# complete paths like $(obj)/$(f). To make sure this works, use a := assignment

# or we will get $(obj)/$(f) in the "targets" value.

# Also, this forces you to use the := syntax when assigning to targets.

# Otherwise the line below will cause an infinite loop (if you don't know why,

# just do it).



targets := $(targets) $(SYMLINKS)



SYMLINKS := $(foreach f,$(SYMLINKS),$(obj)/$(f))



$(SYMLINKS): FORCE

	$(call if_changed,make_link)

arch/um/sys-i386/Makefile

+5 −12
Original line number Original line Diff line number Diff line 
obj-y := bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \

obj-y = bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \

	ptrace_user.o semaphore.o signal.o sigcontext.o syscalls.o sysrq.o \

	ptrace_user.o signal.o sigcontext.o syscalls.o sysrq.o sys_call_table.o

	sys_call_table.o





obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o

obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o





obj-$(CONFIG_HIGHMEM) += highmem.o

subarch-obj-y = lib/bitops.o kernel/semaphore.o

obj-$(CONFIG_MODULES) += module.o

subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem.o

subarch-obj-$(CONFIG_MODULES) += kernel/module.o





USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o stub_segv.o

USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o stub_segv.o





SYMLINKS = bitops.c semaphore.c highmem.c module.c



include arch/um/scripts/Makefile.rules

include arch/um/scripts/Makefile.rules





bitops.c-dir = lib

semaphore.c-dir = kernel

highmem.c-dir = mm

module.c-dir = kernel



$(obj)/stub_segv.o : _c_flags = $(call unprofile,$(CFLAGS))

$(obj)/stub_segv.o : _c_flags = $(call unprofile,$(CFLAGS))





include arch/um/scripts/Makefile.unmap
 
include arch/um/scripts/Makefile.unmap

arch/um/sys-x86_64/Makefile

+9 −19
Original line number Original line Diff line number Diff line
@@ -4,30 +4,20 @@ 
# Licensed under the GPL

# Licensed under the GPL

#

#





#XXX: why into lib-y?

obj-y = bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \

lib-y = bitops.o bugs.o csum-partial.o delay.o fault.o ldt.o mem.o memcpy.o \

	sigcontext.o signal.o syscalls.o syscall_table.o sysrq.o ksyms.o

	ptrace.o ptrace_user.o sigcontext.o signal.o syscalls.o \

	syscall_table.o sysrq.o thunk.o

lib-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o





obj-y := ksyms.o

obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o

obj-$(CONFIG_MODULES) += module.o um_module.o

obj-$(CONFIG_MODULES) += um_module.o





USER_OBJS := ptrace_user.o sigcontext.o stub_segv.o

subarch-obj-y = lib/bitops.o lib/csum-partial.o lib/memcpy.o lib/thunk.o

subarch-obj-$(CONFIG_MODULES) += kernel/module.o





SYMLINKS = bitops.c csum-copy.S csum-partial.c csum-wrappers.c ldt.c memcpy.S \

ldt-y = ../sys-i386/ldt.o

	thunk.S module.c





include arch/um/scripts/Makefile.rules

USER_OBJS := ptrace_user.o sigcontext.o stub_segv.o





bitops.c-dir = lib

include arch/um/scripts/Makefile.rules

csum-copy.S-dir = lib

csum-partial.c-dir = lib

csum-wrappers.c-dir = lib

ldt.c-dir = /arch/um/sys-i386

memcpy.S-dir = lib

thunk.S-dir = lib

module.c-dir = kernel





$(obj)/stub_segv.o: _c_flags = $(call unprofile,$(CFLAGS))

$(obj)/stub_segv.o: _c_flags = $(call unprofile,$(CFLAGS))