Commit 2eb4c950 authored by Thomas Gleixner's avatar Thomas Gleixner

Kbuild: prepare scope and tags for arch/x86

Preparatory patch for the source merge of arch/i386 and arch/x86_64
into arch/x86. Make scope and tags aware of SRCARCH
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6752ed90
...@@ -1293,18 +1293,23 @@ ifeq ($(ALLSOURCE_ARCHS),) ...@@ -1293,18 +1293,23 @@ ifeq ($(ALLSOURCE_ARCHS),)
ifeq ($(ARCH),um) ifeq ($(ARCH),um)
ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH) ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH)
else else
ALLINCLUDE_ARCHS := $(ARCH) ALLINCLUDE_ARCHS := $(SRCARCH)
endif endif
else else
#Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behavour. #Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behavour.
ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS) ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
endif endif
# Take care of arch/x86
ifeq ($(ARCH), $(SRCARCH))
ALLSOURCE_ARCHS := $(ARCH) ALLSOURCE_ARCHS := $(ARCH)
else
ALLSOURCE_ARCHS := $(ARCH) $(SRCARCH)
endif
define find-sources define find-sources
( for ARCH in $(ALLSOURCE_ARCHS) ; do \ ( for ARCH in $(ALLSOURCE_ARCHS) ; do \
find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \ find $(__srctree)arch/$${SRCARCH} $(RCS_FIND_IGNORE) \
-name $1 -print; \ -name $1 -print; \
done ; \ done ; \
find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \ find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \
...@@ -1313,7 +1318,7 @@ define find-sources ...@@ -1313,7 +1318,7 @@ define find-sources
\( -name config -o -name 'asm-*' \) -prune \ \( -name config -o -name 'asm-*' \) -prune \
-o -name $1 -print; \ -o -name $1 -print; \
for ARCH in $(ALLINCLUDE_ARCHS) ; do \ for ARCH in $(ALLINCLUDE_ARCHS) ; do \
find $(__srctree)include/asm-$${ARCH} $(RCS_FIND_IGNORE) \ find $(__srctree)include/asm-$${SRCARCH} $(RCS_FIND_IGNORE) \
-name $1 -print; \ -name $1 -print; \
done ; \ done ; \
find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \ find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment