Loading arch/um/Makefile +5 −19 Original line number Original line Diff line number Diff line Loading @@ -18,28 +18,23 @@ core-y += $(ARCH_DIR)/kernel/ \ $(ARCH_DIR)/drivers/ \ $(ARCH_DIR)/drivers/ \ $(ARCH_DIR)/os-$(OS)/ $(ARCH_DIR)/os-$(OS)/ # Have to precede the include because the included Makefiles reference them. SYMLINK_HEADERS := archparam.h processor.h ptrace.h module.h elf.h 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 = $(ARCH_DIR)/os \ ARCH_SYMLINKS = $(ARCH_DIR)/os $(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 include $(srctree)/$(ARCH_DIR)/Makefile-skas include $(srctree)/$(ARCH_DIR)/Makefile-skas ARCH_INCLUDE := -I$(ARCH_DIR)/include/shared ARCH_INCLUDE := -I$(srctree)/$(ARCH_DIR)/include/shared ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared ifneq ($(KBUILD_SRC),) ifneq ($(KBUILD_SRC),) ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared ARCH_INCLUDE += -I$(ARCH_DIR)/include/shared # for three generated files KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for SYMLINK_HEADERS endif endif ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # for sysdep KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so # named - it's a common symbol in libpcap, so we get a binary which crashes. # named - it's a common symbol in libpcap, so we get a binary which crashes. Loading Loading @@ -144,15 +139,6 @@ archclean: @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ -o -name '*.gcov' \) -type f -print | xargs rm -f -o -name '*.gcov' \) -type f -print | xargs rm -f $(SYMLINK_HEADERS): @echo ' SYMLINK $@' ifneq ($(KBUILD_SRC),) $(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/asm/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ else $(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ endif $(objtree)/$(ARCH_DIR)/include/shared: $(objtree)/$(ARCH_DIR)/include/shared: @echo ' MKDIR $@' @echo ' MKDIR $@' $(Q)mkdir -p $@ $(Q)mkdir -p $@ Loading arch/um/include/asm/archparam-i386.h→arch/um/sys-i386/asm/archparam.h +0 −0 File moved. View file arch/um/include/asm/elf-i386.h→arch/um/sys-i386/asm/elf.h +0 −0 File moved. View file arch/um/include/asm/module-i386.h→arch/um/sys-i386/asm/module.h +0 −0 File moved. View file arch/um/include/asm/processor-i386.h→arch/um/sys-i386/asm/processor.h +0 −0 File moved. View file Loading
arch/um/Makefile +5 −19 Original line number Original line Diff line number Diff line Loading @@ -18,28 +18,23 @@ core-y += $(ARCH_DIR)/kernel/ \ $(ARCH_DIR)/drivers/ \ $(ARCH_DIR)/drivers/ \ $(ARCH_DIR)/os-$(OS)/ $(ARCH_DIR)/os-$(OS)/ # Have to precede the include because the included Makefiles reference them. SYMLINK_HEADERS := archparam.h processor.h ptrace.h module.h elf.h 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 = $(ARCH_DIR)/os \ ARCH_SYMLINKS = $(ARCH_DIR)/os $(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 include $(srctree)/$(ARCH_DIR)/Makefile-skas include $(srctree)/$(ARCH_DIR)/Makefile-skas ARCH_INCLUDE := -I$(ARCH_DIR)/include/shared ARCH_INCLUDE := -I$(srctree)/$(ARCH_DIR)/include/shared ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared ifneq ($(KBUILD_SRC),) ifneq ($(KBUILD_SRC),) ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared ARCH_INCLUDE += -I$(ARCH_DIR)/include/shared # for three generated files KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for SYMLINK_HEADERS endif endif ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # for sysdep KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so # named - it's a common symbol in libpcap, so we get a binary which crashes. # named - it's a common symbol in libpcap, so we get a binary which crashes. Loading Loading @@ -144,15 +139,6 @@ archclean: @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ -o -name '*.gcov' \) -type f -print | xargs rm -f -o -name '*.gcov' \) -type f -print | xargs rm -f $(SYMLINK_HEADERS): @echo ' SYMLINK $@' ifneq ($(KBUILD_SRC),) $(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/asm/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ else $(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ endif $(objtree)/$(ARCH_DIR)/include/shared: $(objtree)/$(ARCH_DIR)/include/shared: @echo ' MKDIR $@' @echo ' MKDIR $@' $(Q)mkdir -p $@ $(Q)mkdir -p $@ Loading
Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: