kbuild: drop support of ALTARCH for headers_*
ALTARCH is no longer used by any arch(*) so drop support for this from Makefile.headerinst Dropping ALTARCH support simplifies Makefile.headerinst (*) sparc64 uses it but work is ongoing to drop it and no furter usage is planned. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: David Woodhouse <dwmw2@infradead.org> Cc: David Miller <davem@davemloft.net>
This commit is contained in:
Sam Ravnborg
parent
4e420aa94c
commit
283039fb7d
|
|
@ -23,30 +23,17 @@ HDRSED := sed -e "s/ inline / __inline__ /g" \
|
|||
|
||||
_dst := $(if $(dst),$(dst),$(obj))
|
||||
|
||||
ifeq (,$(patsubst include/asm/%,,$(obj)/))
|
||||
# For producing the generated stuff in include/asm for biarch builds, include
|
||||
# both sets of Kbuild files; we'll generate anything which is mentioned in
|
||||
# _either_ arch, and recurse into subdirectories which are mentioned in either
|
||||
# arch. Since some directories may exist in one but not the other, we must
|
||||
# use $(wildcard...).
|
||||
GENASM := 1
|
||||
archasm := $(subst include/asm,asm-$(ARCH),$(obj))
|
||||
altarchasm := $(subst include/asm,asm-$(ALTARCH),$(obj))
|
||||
KBUILDFILES := $(wildcard $(srctree)/include/$(archasm)/Kbuild $(srctree)/include/$(altarchasm)/Kbuild)
|
||||
else
|
||||
KBUILDFILES := $(srctree)/$(obj)/Kbuild
|
||||
endif
|
||||
kbuild-file := $(srctree)/$(obj)/Kbuild
|
||||
include $(kbuild-file)
|
||||
|
||||
include $(KBUILDFILES)
|
||||
include scripts/Kbuild.include
|
||||
|
||||
include scripts/Kbuild.include
|
||||
|
||||
# If this is include/asm-$(ARCH) and there's no $(ALTARCH), then
|
||||
# override $(_dst) so that we install to include/asm directly.
|
||||
# If this is include/asm-$(ARCH) then override $(_dst) so that
|
||||
# we install to include/asm directly.
|
||||
# Unless $(BIASMDIR) is set, in which case we're probably doing
|
||||
# a 'headers_install_all' build and we should keep the -$(ARCH)
|
||||
# in the directory name.
|
||||
ifeq ($(obj)$(ALTARCH),include/asm-$(ARCH)$(BIASMDIR))
|
||||
ifeq ($(obj),include/asm-$(ARCH)$(BIASMDIR))
|
||||
_dst := include/asm
|
||||
endif
|
||||
|
||||
|
|
@ -69,18 +56,6 @@ header-y := $(patsubst %,$(INSTALL_HDR_PATH)/$(_dst)/%,$(header-y))
|
|||
objhdr-y := $(patsubst %,$(INSTALL_HDR_PATH)/$(_dst)/%,$(objhdr-y))
|
||||
check-y := $(patsubst %,$(INSTALL_HDR_PATH)/$(_dst)/%,$(check-y))
|
||||
|
||||
|
||||
ifdef ALTARCH
|
||||
ifeq ($(obj),include/asm-$(ARCH))
|
||||
altarch-y := altarch-dir
|
||||
endif
|
||||
endif
|
||||
|
||||
# Make the definitions visible for recursive make invocations
|
||||
export ALTARCH
|
||||
export ARCHDEF
|
||||
export ALTARCHDEF
|
||||
|
||||
quiet_cmd_o_hdr_install = INSTALL $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
|
||||
cmd_o_hdr_install = cp $(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,$(objtree)/$(obj)/%,$@) \
|
||||
$(INSTALL_HDR_PATH)/$(_dst)
|
||||
|
|
@ -99,34 +74,6 @@ quiet_cmd_remove = REMOVE $(_dst)/$@
|
|||
quiet_cmd_mkdir = MKDIR $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
|
||||
cmd_mkdir = mkdir -p $@
|
||||
|
||||
quiet_cmd_gen = GEN $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
|
||||
cmd_gen = \
|
||||
FNAME=$(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,%,$@); \
|
||||
STUBDEF=__ASM_STUB_`echo $$FNAME | tr a-z.- A-Z__`; \
|
||||
(echo "/* File autogenerated by 'make headers_install' */" ; \
|
||||
echo "\#ifndef $$STUBDEF" ; \
|
||||
echo "\#define $$STUBDEF" ; \
|
||||
echo "\# if $(ARCHDEF)" ; \
|
||||
if [ -r $(subst /$(_dst)/,/include/$(archasm)/,$@) ]; then \
|
||||
echo "\# include <$(archasm)/$$FNAME>" ; \
|
||||
else \
|
||||
echo "\# error $(archasm)/$$FNAME does not exist in" \
|
||||
"the $(ARCH) architecture" ; \
|
||||
fi ; \
|
||||
echo "\# elif $(ALTARCHDEF)" ; \
|
||||
if [ -r $(subst /$(_dst)/,/include/$(altarchasm)/,$@) ]; then \
|
||||
echo "\# include <$(altarchasm)/$$FNAME>" ; \
|
||||
else \
|
||||
echo "\# error $(altarchasm)/$$FNAME does not exist in" \
|
||||
"the $(ALTARCH) architecture" ; \
|
||||
fi ; \
|
||||
echo "\# else" ; \
|
||||
echo "\# warning This machine appears to be" \
|
||||
"neither $(ARCH) nor $(ALTARCH)." ; \
|
||||
echo "\# endif" ; \
|
||||
echo "\#endif /* $$STUBDEF */" ; \
|
||||
) > $@
|
||||
|
||||
.PHONY: __headersinst __headerscheck
|
||||
|
||||
ifdef HDRCHECK
|
||||
|
|
@ -144,7 +91,7 @@ include /dev/null $(wildcard $(check-y))
|
|||
|
||||
else
|
||||
# Rules for installing headers
|
||||
__headersinst: $(subdir-y) $(header-y) $(altarch-y) $(objhdr-y)
|
||||
__headersinst: $(subdir-y) $(header-y) $(objhdr-y)
|
||||
@true
|
||||
|
||||
$(objhdr-y) $(subdir-y) $(header-y): | $(INSTALL_HDR_PATH)/$(_dst) $(unwanted)
|
||||
|
|
@ -156,29 +103,16 @@ $(INSTALL_HDR_PATH)/$(_dst):
|
|||
$(unwanted):
|
||||
$(call cmd,remove)
|
||||
|
||||
ifdef GENASM
|
||||
$(objhdr-y) $(header-y): $(KBUILDFILES)
|
||||
$(call cmd,gen)
|
||||
|
||||
else
|
||||
$(objhdr-y): $(INSTALL_HDR_PATH)/$(_dst)/%.h: $(objtree)/$(obj)/%.h $(KBUILDFILES)
|
||||
$(objhdr-y): $(INSTALL_HDR_PATH)/$(_dst)/%.h: $(objtree)/$(obj)/%.h $(kbuild-file)
|
||||
$(call cmd,o_hdr_install)
|
||||
|
||||
$(header-y): $(INSTALL_HDR_PATH)/$(_dst)/%.h: $(srctree)/$(obj)/%.h $(KBUILDFILES)
|
||||
$(header-y): $(INSTALL_HDR_PATH)/$(_dst)/%.h: $(srctree)/$(obj)/%.h $(kbuild-file)
|
||||
$(call cmd,unifdef)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
|
||||
|
||||
.PHONY: altarch-dir
|
||||
# All the files in the normal arch dir must be created first, since we test
|
||||
# for their existence.
|
||||
altarch-dir: $(subdir-y) $(header-y) $(objhdr-y)
|
||||
$(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH)
|
||||
$(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm$(BIASMDIR)
|
||||
|
||||
# Recursion
|
||||
.PHONY: $(subdir-y)
|
||||
$(subdir-y):
|
||||
|
|
|
|||
Reference in New Issue