diff options
-rw-r--r-- | Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -1293,18 +1293,23 @@ ifeq ($(ALLSOURCE_ARCHS),) | |||
1293 | ifeq ($(ARCH),um) | 1293 | ifeq ($(ARCH),um) |
1294 | ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH) | 1294 | ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH) |
1295 | else | 1295 | else |
1296 | ALLINCLUDE_ARCHS := $(ARCH) | 1296 | ALLINCLUDE_ARCHS := $(SRCARCH) |
1297 | endif | 1297 | endif |
1298 | else | 1298 | else |
1299 | #Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behavour. | 1299 | #Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behavour. |
1300 | ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS) | 1300 | ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS) |
1301 | endif | 1301 | endif |
1302 | 1302 | ||
1303 | # Take care of arch/x86 | ||
1304 | ifeq ($(ARCH), $(SRCARCH)) | ||
1303 | ALLSOURCE_ARCHS := $(ARCH) | 1305 | ALLSOURCE_ARCHS := $(ARCH) |
1306 | else | ||
1307 | ALLSOURCE_ARCHS := $(ARCH) $(SRCARCH) | ||
1308 | endif | ||
1304 | 1309 | ||
1305 | define find-sources | 1310 | define find-sources |
1306 | ( for ARCH in $(ALLSOURCE_ARCHS) ; do \ | 1311 | ( for ARCH in $(ALLSOURCE_ARCHS) ; do \ |
1307 | find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \ | 1312 | find $(__srctree)arch/$${SRCARCH} $(RCS_FIND_IGNORE) \ |
1308 | -name $1 -print; \ | 1313 | -name $1 -print; \ |
1309 | done ; \ | 1314 | done ; \ |
1310 | find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \ | 1315 | find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \ |
@@ -1313,7 +1318,7 @@ define find-sources | |||
1313 | \( -name config -o -name 'asm-*' \) -prune \ | 1318 | \( -name config -o -name 'asm-*' \) -prune \ |
1314 | -o -name $1 -print; \ | 1319 | -o -name $1 -print; \ |
1315 | for ARCH in $(ALLINCLUDE_ARCHS) ; do \ | 1320 | for ARCH in $(ALLINCLUDE_ARCHS) ; do \ |
1316 | find $(__srctree)include/asm-$${ARCH} $(RCS_FIND_IGNORE) \ | 1321 | find $(__srctree)include/asm-$${SRCARCH} $(RCS_FIND_IGNORE) \ |
1317 | -name $1 -print; \ | 1322 | -name $1 -print; \ |
1318 | done ; \ | 1323 | done ; \ |
1319 | find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \ | 1324 | find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \ |