diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:03:19 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 14:14:51 +0100 |
| commit | 6582b7f7743da6ce3e3714e9e8b18e0e073d4acd (patch) | |
| tree | 649346d2333865ccd4bb4d560ceb50c39139c5c2 /arch/um/Makefile | |
| parent | 858ba94499b4f48e9eb0be7cf0092f1ea9460fef (diff) | |
| download | linux-3.10-6582b7f7743da6ce3e3714e9e8b18e0e073d4acd.tar.gz linux-3.10-6582b7f7743da6ce3e3714e9e8b18e0e073d4acd.tar.bz2 linux-3.10-6582b7f7743da6ce3e3714e9e8b18e0e073d4acd.zip | |
um: merge arch/um/sys-{i386,x86_64}
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/Makefile')
| -rw-r--r-- | arch/um/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 184494d890b..bd0587e5c46 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -121,8 +121,8 @@ archclean: # Generated files -$(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE - $(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@ +$(ARCH_DIR)/sys-$(HEADER_ARCH)/user-offsets.s: FORCE + $(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(HEADER_ARCH) $@ define filechk_gen-asm-offsets (set -e; \ @@ -137,7 +137,7 @@ define filechk_gen-asm-offsets echo ""; ) endef -include/generated/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s +include/generated/user_constants.h: $(ARCH_DIR)/sys-$(HEADER_ARCH)/user-offsets.s $(call filechk,gen-asm-offsets) export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH |