diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 19:06:29 (GMT) |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2011-11-02 13:15:04 (GMT) |
commit | 7bbe7204e93734fe79d8aac3e08a7cb4624b5004 (patch) | |
tree | aef04472a8f1fa0e6cc43916b8f9165bceb753a0 /arch/um/Makefile | |
parent | a6e77d6c74fa82675b087a79c8a145cae7c58f36 (diff) | |
download | linux-7bbe7204e93734fe79d8aac3e08a7cb4624b5004.tar.xz |
um: merge Makefile-{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 | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index bd0587e..7492ee5 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -20,8 +20,18 @@ core-y += $(ARCH_DIR)/kernel/ \ MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas +HEADER_ARCH := $(SUBARCH) + +# Additional ARCH settings for x86 +ifeq ($(SUBARCH),i386) + HEADER_ARCH := x86 +endif +ifeq ($(SUBARCH),x86_64) + HEADER_ARCH := x86 +endif + include $(srctree)/$(ARCH_DIR)/Makefile-skas -include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH) +include $(srctree)/$(ARCH_DIR)/Makefile-$(HEADER_ARCH) SHARED_HEADERS := $(ARCH_DIR)/include/shared ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS) |