2 files changed, 21 insertions, 0 deletions

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 5080fec34609..b817e6cefb77 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -1025,6 +1025,16 @@ When kbuild executes, the following steps are followed (roughly):
         i.e. compilable as standalone units. If CONFIG_HEADER_TEST is enabled,
         this builds them as part of extra-y.
 
+    header-test-pattern-y
+
+        This works as a weaker version of header-test-y, and accepts wildcard
+        patterns. The typical usage is:
+
+                  header-test-pattern-y += *.h
+
+        This specifies all the files that matches to '*.h' in the current
+        directory, but the files in 'header-test-' are excluded.
+
 --- 6.7 Commands useful for building a boot image
 
         Kbuild provides a few macros that are useful when building a
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 55ae1ec65342..281864fcf0fe 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -67,6 +67,17 @@ extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
 endif
 
 # Test self-contained headers
+
+# Wildcard searches in $(srctree)/$(src)/, but not in $(objtree)/$(obj)/.
+# Stale generated headers are often left over, so pattern matching should
+# be avoided. Please notice $(srctree)/$(src)/ and $(objtree)/$(obj) point
+# to the same location for in-tree building. So, header-test-pattern-y should
+# be used with care.
+header-test-y   += $(filter-out $(header-test-), \
+                $(patsubst $(srctree)/$(src)/%, %, \
+                $(wildcard $(addprefix $(srctree)/$(src)/, \
+                $(header-test-pattern-y)))))
+
 extra-$(CONFIG_HEADER_TEST) += $(addsuffix .s, $(header-test-y))
 
 # Add subdir path