X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fum%2Fsys-i386%2FMakefile;h=098720be019a09d25fba077207a5e80ad3da3ab6;hb=refs%2Fheads%2Fvserver;hp=0f65a9259b0d70ce95bf262f7c97036f0c84c447;hpb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;p=linux-2.6.git

diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 0f65a9259..098720be0 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -1,34 +1,23 @@
-obj-y = bitops.o bugs.o checksum.o fault.o ksyms.o ldt.o ptrace.o \
-	ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o
+obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
+	ptrace_user.o setjmp.o signal.o sigcontext.o syscalls.o sysrq.o \
+	sys_call_table.o tls.o
 
-obj-$(CONFIG_HIGHMEM) += highmem.o
-obj-$(CONFIG_MODULES) += module.o
+obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o
 
-USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
-USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
-
-SYMLINKS = bitops.c semaphore.c highmem.c module.c
+subarch-obj-y = lib/bitops.o lib/semaphore.o
+subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem.o
+subarch-obj-$(CONFIG_MODULES) += kernel/module.o
 
-# this needs to be before the foreach, because clean-files does not accept
-# complete paths like $(src)/$f.
-clean-files := $(SYMLINKS)
-
-SYMLINKS := $(foreach f,$(SYMLINKS),$(src)/$f)
+USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
 
-bitops.c-dir = lib
-semaphore.c-dir = kernel
-highmem.c-dir = mm
-module.c-dir = kernel
+USER_OBJS += user-offsets.s
+extra-y += user-offsets.s
 
-define make_link
-	-rm -f $1
-	ln -sf $(TOPDIR)/arch/i386/$($(notdir $1)-dir)/$(notdir $1) $1
-endef
+extra-$(CONFIG_MODE_TT) += unmap.o
 
-$(USER_OBJS) : %.o: %.c
-	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+UNPROFILE_OBJS := stub_segv.o
+CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING)
 
-$(SYMLINKS): 
-	$(call make_link,$@)
+include arch/um/scripts/Makefile.rules
 
-subdir- := util
+$(obj)/unmap.%: _c_flags = $(call unprofile,$(CFLAGS))