diff options
-rw-r--r-- | arch/um/Makefile | 4 | ||||
-rw-r--r-- | arch/um/sys-ppc/Makefile | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index fb8854a9a542..cb4af9bf2074 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
@@ -160,7 +160,7 @@ ifneq ($(KBUILD_SRC),) | |||
160 | $(Q)mkdir -p $(objtree)/include/asm-um | 160 | $(Q)mkdir -p $(objtree)/include/asm-um |
161 | $(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ | 161 | $(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ |
162 | else | 162 | else |
163 | $(Q)cd $(TOPDIR)/$(dir $@) ; \ | 163 | $(Q)cd $(srctree)/$(dir $@) ; \ |
164 | ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $(notdir $@) | 164 | ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $(notdir $@) |
165 | endif | 165 | endif |
166 | 166 | ||
@@ -170,7 +170,7 @@ ifneq ($(KBUILD_SRC),) | |||
170 | $(Q)mkdir -p $(objtree)/include/asm-um | 170 | $(Q)mkdir -p $(objtree)/include/asm-um |
171 | $(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) include/asm-um/arch | 171 | $(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) include/asm-um/arch |
172 | else | 172 | else |
173 | $(Q)cd $(TOPDIR)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch | 173 | $(Q)cd $(srctree)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch |
174 | endif | 174 | endif |
175 | 175 | ||
176 | $(objtree)/$(ARCH_DIR)/include: | 176 | $(objtree)/$(ARCH_DIR)/include: |
diff --git a/arch/um/sys-ppc/Makefile b/arch/um/sys-ppc/Makefile index a9814a7ae60e..08901526e893 100644 --- a/arch/um/sys-ppc/Makefile +++ b/arch/um/sys-ppc/Makefile | |||
@@ -6,7 +6,7 @@ OBJ = built-in.o | |||
6 | OBJS = ptrace.o sigcontext.o semaphore.o checksum.o miscthings.o misc.o \ | 6 | OBJS = ptrace.o sigcontext.o semaphore.o checksum.o miscthings.o misc.o \ |
7 | ptrace_user.o sysrq.o | 7 | ptrace_user.o sysrq.o |
8 | 8 | ||
9 | EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(TOPDIR)/arch/ppc/kernel | 9 | EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel |
10 | 10 | ||
11 | all: $(OBJ) | 11 | all: $(OBJ) |
12 | 12 | ||
@@ -22,25 +22,25 @@ sigcontext.o: sigcontext.c | |||
22 | 22 | ||
23 | semaphore.c: | 23 | semaphore.c: |
24 | rm -f $@ | 24 | rm -f $@ |
25 | ln -s $(TOPDIR)/arch/ppc/kernel/$@ $@ | 25 | ln -s $(srctree)/arch/ppc/kernel/$@ $@ |
26 | 26 | ||
27 | checksum.S: | 27 | checksum.S: |
28 | rm -f $@ | 28 | rm -f $@ |
29 | ln -s $(TOPDIR)/arch/ppc/lib/$@ $@ | 29 | ln -s $(srctree)/arch/ppc/lib/$@ $@ |
30 | 30 | ||
31 | mk_defs.c: | 31 | mk_defs.c: |
32 | rm -f $@ | 32 | rm -f $@ |
33 | ln -s $(TOPDIR)/arch/ppc/kernel/$@ $@ | 33 | ln -s $(srctree)/arch/ppc/kernel/$@ $@ |
34 | 34 | ||
35 | ppc_defs.head: | 35 | ppc_defs.head: |
36 | rm -f $@ | 36 | rm -f $@ |
37 | ln -s $(TOPDIR)/arch/ppc/kernel/$@ $@ | 37 | ln -s $(srctree)/arch/ppc/kernel/$@ $@ |
38 | 38 | ||
39 | ppc_defs.h: mk_defs.c ppc_defs.head \ | 39 | ppc_defs.h: mk_defs.c ppc_defs.head \ |
40 | $(TOPDIR)/include/asm-ppc/mmu.h \ | 40 | $(srctree)/include/asm-ppc/mmu.h \ |
41 | $(TOPDIR)/include/asm-ppc/processor.h \ | 41 | $(srctree)/include/asm-ppc/processor.h \ |
42 | $(TOPDIR)/include/asm-ppc/pgtable.h \ | 42 | $(srctree)/include/asm-ppc/pgtable.h \ |
43 | $(TOPDIR)/include/asm-ppc/ptrace.h | 43 | $(srctree)/include/asm-ppc/ptrace.h |
44 | # $(CC) $(CFLAGS) -S mk_defs.c | 44 | # $(CC) $(CFLAGS) -S mk_defs.c |
45 | cp ppc_defs.head ppc_defs.h | 45 | cp ppc_defs.head ppc_defs.h |
46 | # for bk, this way we can write to the file even if it's not checked out | 46 | # for bk, this way we can write to the file even if it's not checked out |
@@ -56,13 +56,13 @@ ppc_defs.h: mk_defs.c ppc_defs.head \ | |||
56 | 56 | ||
57 | checksum.o: checksum.S | 57 | checksum.o: checksum.S |
58 | rm -f asm | 58 | rm -f asm |
59 | ln -s $(TOPDIR)/include/asm-ppc asm | 59 | ln -s $(srctree)/include/asm-ppc asm |
60 | $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o | 60 | $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o |
61 | rm -f asm | 61 | rm -f asm |
62 | 62 | ||
63 | misc.o: misc.S ppc_defs.h | 63 | misc.o: misc.S ppc_defs.h |
64 | rm -f asm | 64 | rm -f asm |
65 | ln -s $(TOPDIR)/include/asm-ppc asm | 65 | ln -s $(srctree)/include/asm-ppc asm |
66 | $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o | 66 | $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o |
67 | rm -f asm | 67 | rm -f asm |
68 | 68 | ||