x86, um: sanitize uml sigcontext.h uses

[linux-2.6-omap-h63xx.git] / arch / um / Makefile

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 88c5b0a5277797dac37bf57a7b1ccbb73f1c62c9..33d59f1ff57fb52a938fed7d8c2a46d4d82543ef 100644 (file)
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -19,16 +19,16 @@ core-y                      += $(ARCH_DIR)/kernel/          \
                           $(ARCH_DIR)/os-$(OS)/
 
 # 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 processor.h ptrace.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
 # ../os/include/file.h
 #
 # These are cleaned up during mrproper. Please DO NOT fix it again, this is
 # 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
 
 MODE_INCLUDE   += -I$(srctree)/$(ARCH_DIR)/include/shared/skas
@@ -38,6 +38,7 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas
 ARCH_INCLUDE   := -I$(ARCH_DIR)/include/shared
 ifneq ($(KBUILD_SRC),)
 ARCH_INCLUDE   += -I$(srctree)/$(ARCH_DIR)/include/shared
+KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for arch symlink
 endif
 SYS_DIR                := $(ARCH_DIR)/include/shared/sysdep-$(SUBARCH)
 
@@ -65,6 +66,8 @@ include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
 #This will adjust *FLAGS accordingly to the platform.
 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
 
+KBUILD_CPPFLAGS += -I$(srctree)/arch/$(HEADER_ARCH)/include
+
 # -Derrno=kernel_errno - This turns all kernel references to errno into
 # kernel_errno to separate them from the libc errno.  This allows -fno-common
 # in KBUILD_CFLAGS.  Otherwise, it would cause ld to complain about the two different
@@ -145,19 +148,19 @@ archclean:
 $(SYMLINK_HEADERS):
        @echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
-       $(Q)mkdir -p $(objtree)/include/asm-um
-       $(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
+       $(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
 
-include/asm-um/arch:
+$(ARCH_DIR)/include/asm/arch:
        @echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
-       $(Q)mkdir -p $(objtree)/include/asm-um
-       $(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) $@
+       $(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
+       $(Q)ln -fsn $(srctree)/arch/$(HEADER_ARCH)/include/asm $@
 else
-       $(Q)ln -fsn ../asm-$(HEADER_ARCH) $@
+       $(Q)ln -fsn ../../../$(HEADER_ARCH)/include/asm $@
 endif
 
 $(objtree)/$(ARCH_DIR)/include/shared:
@@ -209,6 +212,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
        @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