aboutsummaryrefslogtreecommitdiffstats
path: root/Kbuild
diff options
context:
space:
mode:
authorThomas Gleixner2007-10-11 04:11:36 -0500
committerThomas Gleixner2007-10-11 04:11:36 -0500
commit6752ed90da032af72f2f1fa23d1abf0889b56db0 (patch)
tree4669080891000290c8ab2b3bfb1868b63fc26e36 /Kbuild
parentd7394fe57adbbd030c5a56f5f4579fe0478cdb9b (diff)
downloadkernel-omap-6752ed90da032af72f2f1fa23d1abf0889b56db0.tar.gz
kernel-omap-6752ed90da032af72f2f1fa23d1abf0889b56db0.tar.xz
kernel-omap-6752ed90da032af72f2f1fa23d1abf0889b56db0.zip
Kbuild: allow arch/xxx to use a different source path
Preparatory patch for the source merge of arch/i386 and arch/x86_64 into arch/x86. This allows to keep the original arch directories as stubs for the main Makefiles, Kconfigs et. al during the transition phase while having the code in the new arch/x86 directory. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Kbuild')
-rw-r--r--Kbuild6
1 files changed, 3 insertions, 3 deletions
diff --git a/Kbuild b/Kbuild
index 56b8edf6a3bc..2d403cfa4b16 100644
--- a/Kbuild
+++ b/Kbuild
@@ -12,7 +12,7 @@ offsets-file := include/asm-$(ARCH)/asm-offsets.h
12 12
13always := $(offsets-file) 13always := $(offsets-file)
14targets := $(offsets-file) 14targets := $(offsets-file)
15targets += arch/$(ARCH)/kernel/asm-offsets.s 15targets += arch/$(SRCARCH)/kernel/asm-offsets.s
16clean-files := $(addprefix $(objtree)/,$(targets)) 16clean-files := $(addprefix $(objtree)/,$(targets))
17 17
18# Default sed regexp - multiline due to syntax constraints 18# Default sed regexp - multiline due to syntax constraints
@@ -40,11 +40,11 @@ define cmd_offsets
40endef 40endef
41 41
42# We use internal kbuild rules to avoid the "is up to date" message from make 42# We use internal kbuild rules to avoid the "is up to date" message from make
43arch/$(ARCH)/kernel/asm-offsets.s: arch/$(ARCH)/kernel/asm-offsets.c FORCE 43arch/$(SRCARCH)/kernel/asm-offsets.s: arch/$(SRCARCH)/kernel/asm-offsets.c FORCE
44 $(Q)mkdir -p $(dir $@) 44 $(Q)mkdir -p $(dir $@)
45 $(call if_changed_dep,cc_s_c) 45 $(call if_changed_dep,cc_s_c)
46 46
47$(obj)/$(offsets-file): arch/$(ARCH)/kernel/asm-offsets.s Kbuild 47$(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s Kbuild
48 $(Q)mkdir -p $(dir $@) 48 $(Q)mkdir -p $(dir $@)
49 $(call cmd,offsets) 49 $(call cmd,offsets)
50 50