vserver 1.9.5.x5

[linux-2.6.git] / arch / um / kernel / tt / Makefile

diff --git a/arch/um/kernel/tt/Makefile b/arch/um/kernel/tt/Makefile
index 33416e8..7c9eec5 100644 (file)
--- a/arch/um/kernel/tt/Makefile
+++ b/arch/um/kernel/tt/Makefile
@@ -4,10 +4,11 @@
 #
 
 extra-y := unmap_fin.o
+clean-files := unmap_tmp.o
 
 obj-y = exec_kern.o exec_user.o gdb.o ksyms.o mem.o mem_user.o process_kern.o \
        syscall_kern.o syscall_user.o time.o tlb.o tracer.o trap_user.o \
-       uaccess.o uaccess_user.o sys-$(SUBARCH)/
+       uaccess.o uaccess_user.o
 
 obj-$(CONFIG_PT_PROXY) += gdb_kern.o ptproxy/
 
@@ -20,10 +21,12 @@ UNMAP_CFLAGS := $(patsubst -fprofile-arcs -ftest-coverage,,$(UNMAP_CFLAGS))
 $(USER_OBJS) : %.o: %.c
        $(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
 
-$(O_TARGET) : $(obj)/unmap_fin.o
-
 $(obj)/unmap.o: $(src)/unmap.c
        $(CC) $(UNMAP_CFLAGS) -c -o $@ $<
 
-$(obj)/unmap_fin.o : $(src)/unmap.o
-       ld -r -o $@ $< -lc -L/usr/lib
+LIBC_DIR ?= /usr/lib
+
+$(obj)/unmap_fin.o : $(obj)/unmap.o
+       ld -r -o $(obj)/unmap_tmp.o  $< -lc -L$(LIBC_DIR)
+       objcopy $(obj)/unmap_tmp.o $@ -G switcheroo
+