Commit 8ede0bdb authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin

x86, um: initial part of asm-um move

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 8569c914
...@@ -21,14 +21,14 @@ core-y += $(ARCH_DIR)/kernel/ \ ...@@ -21,14 +21,14 @@ core-y += $(ARCH_DIR)/kernel/ \
# Have to precede the include because the included Makefiles reference them. # Have to precede the include because the included Makefiles reference them.
SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \ SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \
module.h vm-flags.h elf.h host_ldt.h module.h vm-flags.h elf.h host_ldt.h
SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header)) SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header))
# XXX: The "os" symlink is only used by arch/um/include/os.h, which includes # XXX: The "os" symlink is only used by arch/um/include/os.h, which includes
# ../os/include/file.h # ../os/include/file.h
# #
# These are cleaned up during mrproper. Please DO NOT fix it again, this is # These are cleaned up during mrproper. Please DO NOT fix it again, this is
# the Correct Thing(tm) to do! # the Correct Thing(tm) to do!
ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \ ARCH_SYMLINKS = $(ARCH_DIR)/include/asm/arch $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \
$(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h $(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h
MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas
...@@ -38,6 +38,7 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas ...@@ -38,6 +38,7 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas
ARCH_INCLUDE := -I$(ARCH_DIR)/include/shared ARCH_INCLUDE := -I$(ARCH_DIR)/include/shared
ifneq ($(KBUILD_SRC),) ifneq ($(KBUILD_SRC),)
ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared
KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for arch symlink
endif endif
SYS_DIR := $(ARCH_DIR)/include/shared/sysdep-$(SUBARCH) SYS_DIR := $(ARCH_DIR)/include/shared/sysdep-$(SUBARCH)
...@@ -145,19 +146,19 @@ archclean: ...@@ -145,19 +146,19 @@ archclean:
$(SYMLINK_HEADERS): $(SYMLINK_HEADERS):
@echo ' SYMLINK $@' @echo ' SYMLINK $@'
ifneq ($(KBUILD_SRC),) ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p $(objtree)/include/asm-um $(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
$(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/asm/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
else else
$(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ $(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
endif endif
include/asm-um/arch: $(ARCH_DIR)/include/asm/arch:
@echo ' SYMLINK $@' @echo ' SYMLINK $@'
ifneq ($(KBUILD_SRC),) ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p $(objtree)/include/asm-um $(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
$(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) $@ $(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) $@
else else
$(Q)ln -fsn ../asm-$(HEADER_ARCH) $@ $(Q)ln -fsn ../../../../include/asm-$(HEADER_ARCH) $@
endif endif
$(objtree)/$(ARCH_DIR)/include/shared: $(objtree)/$(ARCH_DIR)/include/shared:
...@@ -209,6 +210,6 @@ $(ARCH_DIR)/include/shared/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-off ...@@ -209,6 +210,6 @@ $(ARCH_DIR)/include/shared/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-off
$(ARCH_DIR)/include/shared/kern_constants.h: $(objtree)/$(ARCH_DIR)/include/shared $(ARCH_DIR)/include/shared/kern_constants.h: $(objtree)/$(ARCH_DIR)/include/shared
@echo ' SYMLINK $@' @echo ' SYMLINK $@'
$(Q)ln -sf ../../../../include/asm-um/asm-offsets.h $@ $(Q)ln -sf ../../../../include/asm/asm-offsets.h $@
export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH
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