When a header file is removed from generic-y (often accompanied by the addition of an arch specific header), the generated wrapper file will persist, and in some cases may still take precedence over the new arch header. For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended context") removed ucontext.h from generic-y in arch/mips/include/asm/, and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of the wrapper when reusing a dirty build tree resulted in build failures in arch/mips/kernel/signal.c: arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’: arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’ return &uc->uc_extcontext; ^ Fix by detecting and removing wrapper headers in generated header directories that do not correspond to a filename in generic-y, genhdr-y, or the newly introduced generated-y.
Showing the changes to scripts (1 of 1 file). Show all
Unified · Split
| @@ -13,11 +13,26 @@ include scripts/Kbuild.include · 12 unmodified lines | ||
| 13 | 13 | # Create output directory if not already present |
| 14 | 14 | _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj)) |
| 15 | 15 | |
| 16 | +# Stale wrappers when the corresponding files are removed from generic-y | |
| 17 | +# need removing. | |
| 18 | +generated-y := $(generic-y) $(genhdr-y) $(generated-y) | |
| 19 | +all-files := $(patsubst %, $(obj)/%, $(generated-y)) | |
| 20 | +old-headers := $(wildcard $(obj)/*.h) | |
| 21 | +unwanted := $(filter-out $(all-files),$(old-headers)) | |
| 22 | + | |
| 16 | 23 | quiet_cmd_wrap = WRAP $@ |
| 17 | 24 | cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@ |
| 18 | 25 | |
| 19 | −all: $(patsubst %, $(obj)/%, $(generic-y)) | |
| 26 | +quiet_cmd_remove = REMOVE $(unwanted) | |
| 27 | +cmd_remove = rm -f $(unwanted) | |
| 28 | + | |
| 29 | +all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE | |
| 30 | + $(if $(unwanted),$(call cmd,remove),) | |
| 20 | 31 | @: |
| 21 | 32 | |
| 22 | 33 | $(obj)/%.h: |
| 23 | 34 | $(call cmd,wrap) |
| 35 | + | |
| 36 | +PHONY += FORCE | |
| 37 | +.PHONY: $(PHONY) | |
| 38 | +FORCE: ; | |