From: Andrew Pinski <andrew.pinski@oss.qualcomm.com>
Date: Wed, 17 Sep 2025 01:12:07 +0000 (-0700)
Subject: uninclude: Add lib/gcc/<anything>/include as an possible include dir
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2664206495418ab5d09d9f00a0cc9af94f29b871;p=thirdparty%2Fgcc.git

uninclude: Add lib/gcc/<anything>/include as an possible include dir

While running uninclude on PR99912's preprocessed source uninclude
didn't uninclude some of the x86_64 target headers. This was because
`lib/gcc/<anything>/include` was not noticed as an possible system
include dir. It supported `gcc-lib/<anything>/include` though.

contrib/ChangeLog:

	* uninclude: Add `lib/gcc/<anything>/include`.
---

diff --git a/contrib/uninclude b/contrib/uninclude
index 5612e655a98..f445bfeeb05 100755
--- a/contrib/uninclude
+++ b/contrib/uninclude
@@ -27,13 +27,14 @@
 
 # Header files whose pathnames contain any of the following patterns
 # are considered as standard headers: usr/include, g++-include,
-# include/g++, include/c++/<version>, gcc-lib/<anything>/include.
+# include/g++, include/c++/<version>, gcc-lib/<anything>/include,
+# lib/gcc/<anything>/include.
 
 gawk ${EXCLUDEPATT+-vexclude="$EXCLUDEPATT"} \
      ${INCLUDEPATT+-vinclude="$INCLUDEPATT"} '
 BEGIN { 
   skipping = 0; 
-  cppline = "^# [0-9]+ \"[^\"]*/(usr/include|g\\+\\+-include|include/g\\+\\+|include/c\\+\\+/[^/]+|gcc-lib/[^\"]+/include|gcc/include)/([^\"]+)\"( [1-4])*$"
+  cppline = "^# [0-9]+ \"[^\"]*/(usr/include|g\\+\\+-include|include/g\\+\\+|include/c\\+\\+/[^/]+|gcc-lib/[^\"]+/include|lib/gcc/[^\"]+/include|gcc/include)/([^\"]+)\"( [1-4])*$"
 }
 !skipping && $0 ~ cppline && 
 (exclude == "" || $3 !~ exclude) && (include == "" || $3 ~ include) {