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

x86, um: get rid of sysdep symlink

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 17dcf75d
...@@ -27,7 +27,7 @@ SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$ ...@@ -27,7 +27,7 @@ SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$
# #
# 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)/include/shared/sysdep $(ARCH_DIR)/os \ ARCH_SYMLINKS = $(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
...@@ -39,7 +39,7 @@ ifneq ($(KBUILD_SRC),) ...@@ -39,7 +39,7 @@ 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 SYMLINK_HEADERS KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for SYMLINK_HEADERS
endif endif
SYS_DIR := $(ARCH_DIR)/include/shared/sysdep-$(SUBARCH) ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # for sysdep
# -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.
...@@ -157,14 +157,6 @@ $(objtree)/$(ARCH_DIR)/include/shared: ...@@ -157,14 +157,6 @@ $(objtree)/$(ARCH_DIR)/include/shared:
@echo ' MKDIR $@' @echo ' MKDIR $@'
$(Q)mkdir -p $@ $(Q)mkdir -p $@
$(ARCH_DIR)/include/shared/sysdep: $(objtree)/$(ARCH_DIR)/include/shared
@echo ' SYMLINK $@'
ifneq ($(KBUILD_SRC),)
$(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/shared/sysdep-$(SUBARCH) $@
else
$(Q)ln -fsn sysdep-$(SUBARCH) $@
endif
$(ARCH_DIR)/os: $(ARCH_DIR)/os:
@echo ' SYMLINK $@' @echo ' SYMLINK $@'
ifneq ($(KBUILD_SRC),) ifneq ($(KBUILD_SRC),)
......
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