diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:03:19 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:14:51 -0400 |
| commit | 6582b7f7743da6ce3e3714e9e8b18e0e073d4acd (patch) | |
| tree | 649346d2333865ccd4bb4d560ceb50c39139c5c2 /arch/um/Makefile | |
| parent | 858ba94499b4f48e9eb0be7cf0092f1ea9460fef (diff) | |
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 184494d890b6..bd0587e5c466 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
| @@ -121,8 +121,8 @@ archclean: | |||
| 121 | 121 | ||
| 122 | # Generated files | 122 | # Generated files |
| 123 | 123 | ||
| 124 | $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE | 124 | $(ARCH_DIR)/sys-$(HEADER_ARCH)/user-offsets.s: FORCE |
| 125 | $(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@ | 125 | $(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(HEADER_ARCH) $@ |
| 126 | 126 | ||
| 127 | define filechk_gen-asm-offsets | 127 | define filechk_gen-asm-offsets |
| 128 | (set -e; \ | 128 | (set -e; \ |
| @@ -137,7 +137,7 @@ define filechk_gen-asm-offsets | |||
| 137 | echo ""; ) | 137 | echo ""; ) |
| 138 | endef | 138 | endef |
| 139 | 139 | ||
| 140 | include/generated/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s | 140 | include/generated/user_constants.h: $(ARCH_DIR)/sys-$(HEADER_ARCH)/user-offsets.s |
| 141 | $(call filechk,gen-asm-offsets) | 141 | $(call filechk,gen-asm-offsets) |
| 142 | 142 | ||
| 143 | export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH | 143 | export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH |