adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] Fix 'make headers_check' on biarch architectures

Browse source 
We generate an <asm/foo.h> which includes either <asm-$ARCH/foo.h> or
<asm-$ALTARCH/foo.h> as appropriate.  But we were doing this dependent on
whether the file in question existed in the _unexported_ tree, not the
exported tree.  So if a file was exported to userspace in one asm- directory
but not the other, the generated file in asm/ was incorrect.

This only changed the failure mode if it _was_ included from a nice #error to
a less explicable #include failure -- but it also gave false errors in 'make
headers_check' output.  Fix it by looking in the right place instead.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
David Woodhouse 2006-09-16 12:15:45 -07:00 committed by Linus Torvalds
parent ac3b719cc3
commit b512217736
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/Makefile.headersinst
View file

@ -93,14 +93,14 @@ STUBDEF=__ASM_STUB_`echo $@ | tr a-z. A-Z_`; \
echo "\#ifndef $$STUBDEF" ; \ echo "\#ifndef $$STUBDEF" ; \
echo "\#define $$STUBDEF" ; \ echo "\#define $$STUBDEF" ; \
echo "\# if $(ARCHDEF)" ; \ echo "\# if $(ARCHDEF)" ; \
if [ -r $(srctree)/include/$(archasm)/$@ ]; then \ if [ -r $(INSTALL_HDR_PATH)/include/$(archasm)/$@ ]; then \
echo "\# include <$(archasm)/$@>" ; \ echo "\# include <$(archasm)/$@>" ; \
else \ else \
echo "\# error $(archasm)/$@ does not exist in" \ echo "\# error $(archasm)/$@ does not exist in" \
"the $(ARCH) architecture" ; \ "the $(ARCH) architecture" ; \
fi ; \ fi ; \
echo "\# elif $(ALTARCHDEF)" ; \ echo "\# elif $(ALTARCHDEF)" ; \
if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then \ if [ -r $(INSTALL_HDR_PATH)/include/$(altarchasm)/$@ ]; then \
echo "\# include <$(altarchasm)/$@>" ; \ echo "\# include <$(altarchasm)/$@>" ; \
else \ else \
echo "\# error $(altarchasm)/$@ does not exist in" \ echo "\# error $(altarchasm)/$@ does not exist in" \
@ -149,7 +149,9 @@ endif
hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
.PHONY: altarch-dir .PHONY: altarch-dir
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) $(unifdef-y) $(objhdr-y)
$(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH) $(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH)
$(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm $(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm