fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / um / sys-i386 / Makefile

diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 7525859..098720b 100644 (file)
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -1,42 +1,23 @@
-obj-y = bugs.o checksum.o extable.o fault.o ksyms.o ldt.o module.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_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 = semaphore.c highmem.c module.c
-SYMLINKS := $(foreach f,$(SYMLINKS),$(src)/$f)
-
-semaphore.c-dir = kernel
-highmem.c-dir = mm
-module.c-dir = kernel
-
-define make_link
-       -rm -f $1
-       ln -sf $(TOPDIR)/arch/i386/$($(notdir $1)-dir)/$(notdir $1) $1
-endef
-
-$(USER_OBJS) : %.o: %.c
-       $(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+subarch-obj-y = lib/bitops.o lib/semaphore.o
+subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem.o
+subarch-obj-$(CONFIG_MODULES) += kernel/module.o
 
-$(SYMLINKS): 
-       $(call make_link,$@)
-
-clean:
-       $(MAKE) -C util clean
-
-fastdep:
-
-dep:
+USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
 
-archmrproper:
-       rm -f $(SYMLINKS)
+USER_OBJS += user-offsets.s
+extra-y += user-offsets.s
 
-archclean:
+extra-$(CONFIG_MODE_TT) += unmap.o
 
-archdep:
+UNPROFILE_OBJS := stub_segv.o
+CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING)
 
-modules:
+include arch/um/scripts/Makefile.rules
 
+$(obj)/unmap.%: _c_flags = $(call unprofile,$(CFLAGS))