x86, um: take arch/um/include/* out of the way
We can't just plop asm/* into it - userland helpers are built with it in search path and seeing asm/* show up there suddenly would be a bad idea. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
parent
2515ddc6db
commit
8569c9140b
|
@ -28,18 +28,18 @@ SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header))
|
||||||
#
|
#
|
||||||
# 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/sysdep $(ARCH_DIR)/os \
|
ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \
|
||||||
$(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h
|
$(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h
|
||||||
|
|
||||||
MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/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
|
ARCH_INCLUDE := -I$(ARCH_DIR)/include/shared
|
||||||
ifneq ($(KBUILD_SRC),)
|
ifneq ($(KBUILD_SRC),)
|
||||||
ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include
|
ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared
|
||||||
endif
|
endif
|
||||||
SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH)
|
SYS_DIR := $(ARCH_DIR)/include/shared/sysdep-$(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.
|
||||||
|
@ -96,11 +96,11 @@ endef
|
||||||
ifneq ($(KBUILD_SRC),)
|
ifneq ($(KBUILD_SRC),)
|
||||||
$(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch)
|
$(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch)
|
||||||
else
|
else
|
||||||
$(shell cd $(ARCH_DIR) && ln -sf Kconfig.$(SUBARCH) Kconfig.arch)
|
$(shell ln -fsn Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/user_constants.h
|
archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/shared/user_constants.h
|
||||||
prepare: $(ARCH_DIR)/include/kern_constants.h
|
prepare: $(ARCH_DIR)/include/shared/kern_constants.h
|
||||||
|
|
||||||
LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
|
LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
|
||||||
LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
|
LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
|
||||||
|
@ -132,9 +132,9 @@ endef
|
||||||
|
|
||||||
# When cleaning we don't include .config, so we don't include
|
# When cleaning we don't include .config, so we don't include
|
||||||
# TT or skas makefiles and don't clean skas_ptregs.h.
|
# TT or skas makefiles and don't clean skas_ptregs.h.
|
||||||
CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/uml-config.h \
|
CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/shared/uml-config.h \
|
||||||
$(ARCH_DIR)/include/user_constants.h \
|
$(ARCH_DIR)/include/shared/user_constants.h \
|
||||||
$(ARCH_DIR)/include/kern_constants.h $(ARCH_DIR)/Kconfig.arch
|
$(ARCH_DIR)/include/shared/kern_constants.h $(ARCH_DIR)/Kconfig.arch
|
||||||
|
|
||||||
MRPROPER_FILES += $(ARCH_SYMLINKS)
|
MRPROPER_FILES += $(ARCH_SYMLINKS)
|
||||||
|
|
||||||
|
@ -148,37 +148,36 @@ ifneq ($(KBUILD_SRC),)
|
||||||
$(Q)mkdir -p $(objtree)/include/asm-um
|
$(Q)mkdir -p $(objtree)/include/asm-um
|
||||||
$(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
|
$(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
|
||||||
else
|
else
|
||||||
$(Q)cd $(srctree)/$(dir $@) ; \
|
$(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
|
||||||
ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $(notdir $@)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include/asm-um/arch:
|
include/asm-um/arch:
|
||||||
@echo ' SYMLINK $@'
|
@echo ' SYMLINK $@'
|
||||||
ifneq ($(KBUILD_SRC),)
|
ifneq ($(KBUILD_SRC),)
|
||||||
$(Q)mkdir -p $(objtree)/include/asm-um
|
$(Q)mkdir -p $(objtree)/include/asm-um
|
||||||
$(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) include/asm-um/arch
|
$(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) $@
|
||||||
else
|
else
|
||||||
$(Q)cd $(srctree)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch
|
$(Q)ln -fsn ../asm-$(HEADER_ARCH) $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(objtree)/$(ARCH_DIR)/include:
|
$(objtree)/$(ARCH_DIR)/include/shared:
|
||||||
@echo ' MKDIR $@'
|
@echo ' MKDIR $@'
|
||||||
$(Q)mkdir -p $@
|
$(Q)mkdir -p $@
|
||||||
|
|
||||||
$(ARCH_DIR)/include/sysdep: $(objtree)/$(ARCH_DIR)/include
|
$(ARCH_DIR)/include/shared/sysdep: $(objtree)/$(ARCH_DIR)/include/shared
|
||||||
@echo ' SYMLINK $@'
|
@echo ' SYMLINK $@'
|
||||||
ifneq ($(KBUILD_SRC),)
|
ifneq ($(KBUILD_SRC),)
|
||||||
$(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/sysdep-$(SUBARCH) $(ARCH_DIR)/include/sysdep
|
$(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/shared/sysdep-$(SUBARCH) $@
|
||||||
else
|
else
|
||||||
$(Q)cd $(ARCH_DIR)/include && ln -fsn sysdep-$(SUBARCH) sysdep
|
$(Q)ln -fsn sysdep-$(SUBARCH) $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(ARCH_DIR)/os:
|
$(ARCH_DIR)/os:
|
||||||
@echo ' SYMLINK $@'
|
@echo ' SYMLINK $@'
|
||||||
ifneq ($(KBUILD_SRC),)
|
ifneq ($(KBUILD_SRC),)
|
||||||
$(Q)ln -fsn $(srctree)/$(ARCH_DIR)/os-$(OS) $(ARCH_DIR)/os
|
$(Q)ln -fsn $(srctree)/$(ARCH_DIR)/os-$(OS) $@
|
||||||
else
|
else
|
||||||
$(Q)cd $(ARCH_DIR) && ln -fsn os-$(OS) os
|
$(Q)ln -fsn os-$(OS) $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Generated files
|
# Generated files
|
||||||
|
@ -186,7 +185,7 @@ define filechk_umlconfig
|
||||||
sed 's/ CONFIG/ UML_CONFIG/'
|
sed 's/ CONFIG/ UML_CONFIG/'
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h
|
$(ARCH_DIR)/include/shared/uml-config.h : include/linux/autoconf.h
|
||||||
$(call filechk,umlconfig)
|
$(call filechk,umlconfig)
|
||||||
|
|
||||||
$(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE
|
$(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE
|
||||||
|
@ -205,11 +204,11 @@ define filechk_gen-asm-offsets
|
||||||
echo ""; )
|
echo ""; )
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s
|
$(ARCH_DIR)/include/shared/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s
|
||||||
$(call filechk,gen-asm-offsets)
|
$(call filechk,gen-asm-offsets)
|
||||||
|
|
||||||
$(ARCH_DIR)/include/kern_constants.h: $(objtree)/$(ARCH_DIR)/include
|
$(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-um/asm-offsets.h $@
|
||||||
|
|
||||||
export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH
|
export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#include "longjmp.h"
|
#include "longjmp.h"
|
||||||
#include "mm_id.h"
|
#include "mm_id.h"
|
||||||
#include "sysdep/tls.h"
|
#include "sysdep/tls.h"
|
||||||
#include "../os/include/file.h"
|
#include "../../os/include/file.h"
|
||||||
|
|
||||||
#define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR))
|
#define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR))
|
||||||
|
|
Loading…
Reference in a new issue